Changeset 38093ae for libcfa/src/collections

Timestamp:

Apr 18, 2024, 8:44:24 PM (23 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master, stuck-waitfor-destruct

Children:

19313be5, cf191ac

Parents:

748c751 (diff), 7a780ad (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

Location:

libcfa/src/collections

Files:

• string.cfa (modified) (2 diffs)
• string_res.cfa (modified) (2 diffs)

libcfa/src/collections/string.cfa

@@ -10 +10 @@
 // Created On       : Fri Sep 03 11:00:00 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Feb  7 21:17:06 2024
-// Update Count     : 259
+// Last Modified On : Mon Apr 15 21:56:28 2024
+// Update Count     : 260
 //
 
@@ -198 +198 @@
         cstr[len] = '\0';                                                                       // terminate
         _Ostream_Manip(const char *) cf @= { cstr, f.wd, f.pc, f.base, {f.all} };
-        os | cf | nonl;
-        return os;
+        return os | cf | nonl;
 } // ?|?
 

libcfa/src/collections/string_res.cfa

@@ -10 +10 @@
 // Created On       : Fri Sep 03 11:00:00 2021
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Feb 10 17:47:22 2024
-// Update Count     : 83
+// Last Modified On : Mon Apr 15 21:56:27 2024
+// Update Count     : 85
 //
 
@@ -200 +200 @@
 ofstream & ?|?(ofstream & out, const string_res & s) {
         // CFA string is NOT null terminated, so print exactly lnth characters in a minimum width of 0.
-        out | wd( 0, s.Handle.lnth, s.Handle.s ) | nonl;
-        return out;
+        return out | wd( 0, s.Handle.lnth, s.Handle.s ) | nonl;
 }