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

libcfa/src/rational.hfa

@@ -12 +12 @@
 // Created On       : Wed Apr  6 17:56:25 2016
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jun  5 22:49:05 2023
-// Update Count     : 119
+// Last Modified On : Tue Jul 18 11:08:24 2023
+// Update Count     : 121
 //
 
@@ -78 +78 @@
         forall( ostype & | ostream( ostype ) | { ostype & ?|?( ostype &, T ); } ) {
                 ostype & ?|?( ostype &, rational(T) );
-                void ?|?( ostype &, rational(T) );
+                OSTYPE_VOID( rational(T) );
         } // distribution
 } // distribution