Ignore:
Timestamp:
Jul 16, 2020, 2:59:56 PM (4 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
c82af9f
Parents:
519f11c (diff), 3f06c05 (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

    r519f11c r463cb33  
    1010// Created On       : Wed May 27 17:56:53 2015
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Mon Jul 13 22:11:41 2020
    13 // Update Count     : 344
     12// Last Modified On : Thu Jul 16 07:43:32 2020
     13// Update Count     : 348
    1414//
    1515
     
    315315        istype & ?|?( istype &, unsigned int & );
    316316        istype & ?|?( istype &, long int & );
     317        istype & ?|?( istype &, unsigned long int & );
    317318        istype & ?|?( istype &, long long int & );
    318         istype & ?|?( istype &, unsigned long int & );
    319319        istype & ?|?( istype &, unsigned long long int & );
     320#if defined( __SIZEOF_INT128__ )
     321        istype & ?|?( istype &, int128 & );
     322        istype & ?|?( istype &, unsigned int128 & );
     323#endif // __SIZEOF_INT128__
    320324
    321325        istype & ?|?( istype &, float & );
Note: See TracChangeset for help on using the changeset viewer.