Changeset 52e311a


Ignore:
Timestamp:
Oct 28, 2021, 11:33:27 AM (6 weeks ago)
Author:
caparsons <caparson@…>
Branches:
master
Children:
eb9c2dc
Parents:
441d11c
Message:

fixed merge conflict

File:
1 edited

Legend:

Unmodified
Added
Removed
  • libcfa/src/fstream.cfa

    r441d11c r52e311a  
    177177} // fmt
    178178
    179 <<<<<<< HEAD
    180 inline void acquire( ofstream & os ) with(os) {
    181         lock( lock$ );                                                                          // may increase recursive lock
    182         if ( ! acquired$ ) acquired$ = true;                            // not locked ?
    183         else unlock( lock$ );                                                           // unwind recursive lock at start
    184 } // acquire
    185 
    186 inline void release( ofstream & os ) {
    187         unlock( os.lock$ );
    188 } // release
    189 
    190 void lock( ofstream & os ) { acquire( os ); }
    191 void unlock( ofstream & os ) { release( os ); }
    192 
    193 void ?{}( osacquire & acq, ofstream & os ) { lock( os.lock$ ); &acq.os = &os; }
    194 void ^?{}( osacquire & acq ) { release( acq.os ); }
    195 
    196 =======
    197 >>>>>>> 15885de998d9500373efda8e609b893c87e6363a
    198179static ofstream soutFile = { (FILE *)stdout };
    199180ofstream & sout = soutFile, & stdout = soutFile;
Note: See TracChangeset for help on using the changeset viewer.