Ignore:
Timestamp:
May 16, 2019, 10:59:00 AM (5 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
3d8d7a7, aa00626
Parents:
8a5530c (diff), 7a54d67 (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:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • libcfa/src/iostream.hfa

    r8a5530c rf2e482cb  
    1010// Created On       : Wed May 27 17:56:53 2015
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Fri May  3 22:55:04 2019
    13 // Update Count     : 230
     12// Last Modified On : Sat May 11 10:31:27 2019
     13// Update Count     : 232
    1414//
    1515
     
    190190
    191191        // manipulators
     192        istype & ?|?( istype &, istype & (*)( istype & ) );
     193        istype & nl( istype & is );
    192194        istype & nlOn( istype & );
    193195        istype & nlOff( istype & );
    194         istype & ?|?( istype &, istype & (*)( istype & ) );
    195         istype & nl( istype & is );
    196196} // distribution
    197197
     
    215215
    216216// Local Variables: //
    217 // mode: c //
    218217// tab-width: 4 //
    219218// End: //
Note: See TracChangeset for help on using the changeset viewer.