Changeset a4da45e for libcfa/src/fstream.hfa

Timestamp:

Feb 26, 2024, 3:53:42 AM (20 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/fstream.hfa (modified) (6 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 : Wed Oct 18 20:30:12 2023
-// Update Count     : 261
+// Last Modified On : Sun Feb 11 20:35:00 2024
+// Update Count     : 274
 //
 
@@ -139 +139 @@
 
 
-exception open_failure {
+ExceptionDecl( open_failure,
         union {
                 ofstream * ostream;
@@ -146 +146 @@
         // TEMPORARY: need polymorphic exceptions
         int tag;                                                                                        // 1 => ostream; 0 => istream
-};
+);
 
 void ?{}( open_failure & this, ofstream & );
 void ?{}( open_failure & this, ifstream & );
 
-exception close_failure {
+ExceptionDecl( close_failure,
         union {
                 ofstream * ostream;
@@ -158 +158 @@
         // TEMPORARY: need polymorphic exceptions
         int tag;                                                                                        // 1 => ostream; 0 => istream
-};
+);
 
 void ?{}( close_failure & this, ofstream & );
 void ?{}( close_failure & this, ifstream & );
 
-exception write_failure {
+ExceptionDecl( write_failure,
         union {
                 ofstream * ostream;
@@ -170 +170 @@
         // TEMPORARY: need polymorphic exceptions
         int tag;                                                                                        // 1 => ostream; 0 => istream
-};
+);
 
 void ?{}( write_failure & this, ofstream & );
 void ?{}( write_failure & this, ifstream & );
 
-exception read_failure {
+ExceptionDecl( read_failure,
         union {
                 ofstream * ostream;
@@ -182 +182 @@
         // TEMPORARY: need polymorphic exceptions
         int tag;                                                                                        // 1 => ostream; 0 => istream
-};
+);
 
 void ?{}( read_failure & this, ofstream & );