Changeset 2a301ff for libcfa/src/fstream.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/fstream.hfa (modified) (7 diffs)

libcfa/src/fstream.hfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jun  5 22:00:20 2023
-// Update Count     : 246
+// Last Modified On : Fri Aug 18 10:41:15 2023
+// Update Count     : 258
 //
 
@@ -34 +34 @@
         char separator$[ofstream_sepSize];
         char tupleSeparator$[ofstream_sepSize];
-        multiple_acquisition_lock lock$;
+        multiple_acquisition_lock lock$;                                        // used by trait is_lock for mutex statement
 }; // ofstream
 
@@ -40 +40 @@
 
 // private
+bool getNL$( ofstream & );
+bool setNL$( ofstream &, bool );
+bool getANL$( ofstream & );
+bool setANL$( ofstream &, bool );
+
 bool sepPrt$( ofstream & );
 void sepReset$( ofstream & );
@@ -45 +50 @@
 const char * sepGetCur$( ofstream & );
 void sepSetCur$( ofstream &, const char [] );
-bool getNL$( ofstream & );
-void setNL$( ofstream &, bool );
-bool getANL$( ofstream & );
+
 bool getPrt$( ofstream & );
-void setPrt$( ofstream &, bool );
+bool setPrt$( ofstream &, bool );
 
 void lock( ofstream & );
@@ -55 +58 @@
 
 // public
-void sepOn( ofstream & );
-void sepOff( ofstream & );
-bool sepDisable( ofstream & );
-bool sepEnable( ofstream & );
 void nlOn( ofstream & );
 void nlOff( ofstream & );
 
+void sep( ofstream & );
+void nosep( ofstream & );
+bool sepOn( ofstream & );
+bool sepOff( ofstream & );
 const char * sepGet( ofstream & );
 void sepSet( ofstream &, const char [] );
@@ -99 +102 @@
         void * file$;
         bool nlOnOff$;
-        multiple_acquisition_lock lock$;
+        multiple_acquisition_lock lock$;                                        // used by trait is_lock for mutex statement
 }; // ifstream
 
@@ -106 +109 @@
 // private
 bool getANL$( ifstream & );
+bool setANL$( ifstream &, bool );
 
 void lock( ifstream & );