Changeset 7b84d3e for libcfa/src/collections

Timestamp:

Oct 23, 2023, 11:58:10 AM (2 years ago)

Author:

caparson <caparson@…>

Branches:

master, stuck-waitfor-destruct

Children:

edc4813

Parents:

2ad5e1d5 (diff), abb04a4 (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:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

libcfa/src/collections

Files:

• string.cfa (modified) (2 diffs)
• string_res.cfa (modified) (3 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 : Sat Sep  2 12:05:57 2023
-// Update Count     : 206
+// Last Modified On : Wed Oct 18 21:52:09 2023
+// Update Count     : 208
 //
 
@@ -138 +138 @@
 
 void ?|?( ifstream & in, _Istream_Sstr f ) {
-    (ifstream &)(in | f); ends( in );
+    (ifstream &)(in | f);
 }
 

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 : Mon Aug 14 18:06:01 2023
-// Update Count     : 12
+// Last Modified On : Wed Oct 18 21:54:54 2023
+// Update Count     : 15
 //
 
@@ -253 +253 @@
 
 void ?|?( ifstream & in, string_res & this ) {
-    (ifstream &)(in | this); ends( in );
+    (ifstream &)(in | this);
 }
 
@@ -297 +297 @@
 
 void ?|?( ifstream & in, _Istream_Rstr f ) {
-    (ifstream &)(in | f); ends( in );
+    (ifstream &)(in | f);
 }