Changeset 2a301ff for libcfa/src/collections/string_res.hfa

Timestamp:

Aug 31, 2023, 11:31:15 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

950c58e

Parents:

92355883 (diff), 686912c (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:

• libcfa/src/collections/string_res.hfa (moved) (moved from libcfa/src/containers/string_res.hfa ) (3 diffs)

libcfa/src/collections/string_res.hfa

@@ -9 +9 @@
 // Author           : Michael L. Brooks
 // Created On       : Fri Sep 03 11:00:00 2021
-// Last Modified By : Michael L. Brooks
-// Last Modified On : Fri Sep 03 11:00:00 2021
-// Update Count     : 1
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Aug 12 15:45:47 2023
+// Update Count     : 2
 //
 
@@ -30 +30 @@
     VbyteHeap *ulink;                   // upward link
 
-    char *s;                                            // pointer to byte string
+    char *s;                                                    // pointer to byte string
     unsigned int lnth;                                  // length of byte string
 }; // HandleNode
@@ -101 +101 @@
 ofstream & ?|?(ofstream &out, const string_res &s);
 void ?|?(ofstream &out, const string_res &s);
+ifstream & ?|?(ifstream &in, string_res &s);
 
 // Concatenation