Changeset a4da45e for tests/io/manipulatorsInput.cfa

Timestamp:

Feb 26, 2024, 3:53:42 AM (19 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

3f9a8d0

Parents:

0522ebe (diff), 022bce0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Resolve conflict

File:

• tests/io/manipulatorsInput.cfa (modified) (3 diffs)

tests/io/manipulatorsInput.cfa

@@ -7 +7 @@
 // Created On       : Sat Jun  8 17:58:54 2019
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jan 28 11:59:55 2024
-// Update Count     : 133
+// Last Modified On : Mon Feb  5 21:54:49 2024
+// Update Count     : 134
 // 
 
@@ -114 +114 @@
                 sin | wdi( sizeof(s), s );                                              sout | "2" | s;
                 sin | ignore( s );                                                              sout | "3" | s;
-                sin | wdi( sizeof(s), 8, s );                                   sout | "4" | s;
+                sin | wdi( sizeof(s), 8, s );                                   sout | "4" | s;
                 sin | ignore( wdi( sizeof(s), 8, s ) );                 sout | "5" | s;
 
@@ -131 +131 @@
                 s[0] = 'q'; s[1] = '\0';
                 sin | excl( "u", wdi( sizeof(s), s ) );                 sout | "15" | s;
-                sin | skip( "u" ) | "\n";
+                sin | skip( "u" ) | nl;
                 sin | getline( wdi( sizeof(s), s ) );                   sout | "16" | s;
-                sin | getline( wdi( sizeof(s), s ), '%' ) | "\n"; sout | "17" | s;
-                sin | ignore( getline( wdi( sizeof(s), s ), '%' ) ) | "\n"; sout | "18" | s;
+                sin | getline( wdi( sizeof(s), s ), '%' ) | nl; sout | "17" | s;
+                sin | ignore( getline( wdi( sizeof(s), s ), '%' ) ) | nl; sout | "18" | s;
 
                 sin | quoted( wdi( sizeof(s), s ) );                    sout | "19" | s;