Changeset a4da45e for libcfa/src/collections/string.cfa

Timestamp:

Feb 26, 2024, 3:53:42 AM (22 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:

• libcfa/src/collections/string.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 : Sun Jan 14 12:03:47 2024
-// Update Count     : 240
+// Last Modified On : Wed Feb  7 21:17:06 2024
+// Update Count     : 259
 //
 
@@ -210 +210 @@
 }
 
-void ?|?( ifstream & in, string & s ) {
-    in | (*s.inner);
-}
+ifstream & ?|?( ifstream & is, _Istream_Squoted f ) {
+        _Istream_Rquoted f2 = { { f.sstr.s.inner, (_Istream_str_base)f.sstr } };
+    return is | f2;
+} // ?|?
 
 ifstream & ?|?( ifstream & is, _Istream_Sstr f ) {
+//      _Istream_Rstr f2 = {f.sstr.s.inner, (_Istream_str_base)f.sstr};
         _Istream_Rstr f2 = {f.s.inner, (_Istream_str_base)f};
     return is | f2;
 } // ?|?
-
-void ?|?( ifstream & in, _Istream_Sstr f ) {
-    (ifstream &)(in | f);
-}
 
 ////////////////////////////////////////////////////////