Changes in / [15885de9:a2e4b0c]

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;