Changeset e67a82d for libcfa/src/iostream.cfa

Timestamp:

Aug 20, 2020, 11:48:15 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

d685cb0

Parents:

67ca73e (diff), 013b028 (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:

fix conflicts

File:

• libcfa/src/iostream.cfa (modified) (2 diffs)

libcfa/src/iostream.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Aug 10 09:32:14 2020
-// Update Count     : 1126
+// Last Modified On : Tue Aug 11 22:16:33 2020
+// Update Count     : 1128
 //
 
@@ -37 +37 @@
 
 forall( dtype ostype | ostream( ostype ) ) {
-        ostype & ?|?( ostype & os, zero_t ) {
-                if ( $sepPrt( os ) ) fmt( os, "%s", $sepGetCur( os ) );
-                fmt( os, "%d", 0n );
-                return os;
-        } // ?|?
-        void ?|?( ostype & os, zero_t z ) {
-                (ostype &)(os | z); ends( os );
-        } // ?|?
-
-        ostype & ?|?( ostype & os, one_t ) {
-                if ( $sepPrt( os ) ) fmt( os, "%s", $sepGetCur( os ) );
-                fmt( os, "%d", 1n );
-                return os;
-        } // ?|?
-        void ?|?( ostype & os, one_t o ) {
-                (ostype &)(os | o); ends( os );
-        } // ?|?
-
         ostype & ?|?( ostype & os, bool b ) {
                 if ( $sepPrt( os ) ) fmt( os, "%s", $sepGetCur( os ) );