Changeset 52e311a

Timestamp:

Oct 28, 2021, 11:33:27 AM (3 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

eb9c2dc

Parents:

441d11c

Message:

fixed merge conflict

File:

• libcfa/src/fstream.cfa (modified) (1 diff)

libcfa/src/fstream.cfa

@@ -177 +177 @@
 } // fmt
 
-<<<<<<< HEAD
-inline void acquire( ofstream & os ) with(os) {
-        lock( lock$ );                                                                          // may increase recursive lock
-        if ( ! acquired$ ) acquired$ = true;                            // not locked ?
-        else unlock( lock$ );                                                           // unwind recursive lock at start
-} // acquire
-
-inline void release( ofstream & os ) {
-        unlock( os.lock$ );
-} // release
-
-void lock( ofstream & os ) { acquire( os ); }
-void unlock( ofstream & os ) { release( os ); }
-
-void ?{}( osacquire & acq, ofstream & os ) { lock( os.lock$ ); &acq.os = &os; }
-void ^?{}( osacquire & acq ) { release( acq.os ); }
-
-=======
->>>>>>> 15885de998d9500373efda8e609b893c87e6363a
 static ofstream soutFile = { (FILE *)stdout };
 ofstream & sout = soutFile, & stdout = soutFile;