Ignore:
Timestamp:
Jul 19, 2019, 2:16:01 PM (5 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:
4eb43fa
Parents:
1f1c102 (diff), 8ac3b0e (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' into new-ast

File:
1 edited

Legend:

Unmodified
Added
Removed
  • libcfa/src/iostream.hfa

    r1f1c102 rf53acdf8  
    1010// Created On       : Wed May 27 17:56:53 2015
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Thu Jun 13 17:20:21 2019
    13 // Update Count     : 325
     12// Last Modified On : Fri Jul 12 12:08:38 2019
     13// Update Count     : 334
    1414//
    1515
     
    1919
    2020
    21 //*********************************** Ostream ***********************************
     21//*********************************** ostream ***********************************
    2222
    2323
     
    4747        void sepSetTuple( ostype &, const char * );                     // set tuple separator to string (15 character maximum)
    4848
     49        void ends( ostype & os );                                                       // end of output statement
    4950        int fail( ostype & );
    5051        int flush( ostype & );
     
    9899        void ?|?( ostype &, unsigned long long int );
    99100
    100         ostype & ?|?( ostype &, float ); // FIX ME: should not be required
    101         void ?|?( ostype &, float ); // FIX ME: should not be required
     101        ostype & ?|?( ostype &, float );
     102        void ?|?( ostype &, float );
    102103        ostype & ?|?( ostype &, double );
    103104        void ?|?( ostype &, double );
     
    126127        void ?|?( ostype &, ostype & (*)( ostype & ) );
    127128        ostype & nl( ostype & );
    128         void nl( ostype & );
    129129        ostype & nonl( ostype & );
    130130        ostype & sep( ostype & );
     
    150150} // distribution
    151151
    152 //*********************************** Manipulators ***********************************
     152//*********************************** manipulators ***********************************
    153153
    154154forall( otype T )
     
    169169}; // _Ostream_Manip
    170170
    171 //*********************************** Integral ***********************************
     171//*********************************** integral ***********************************
    172172
    173173// See 6.7.9. 19) The initialization shall occur in initializer list order, each initializer provided for a particular
     
    207207IntegralFMTDecl( unsigned long long int, 'u' )
    208208
    209 //*********************************** Floating Point ***********************************
     209//*********************************** floating point ***********************************
    210210
    211211// Default suffix for values with no fraction is "."
     
    236236FloatingPointFMTDecl( long double )
    237237
    238 //*********************************** Character ***********************************
     238//*********************************** character ***********************************
    239239
    240240static inline {
     
    253253} // ?|?
    254254
    255 //*********************************** C String ***********************************
     255//*********************************** C string ***********************************
    256256
    257257static inline {
     
    272272
    273273
    274 //*********************************** Istream ***********************************
     274//*********************************** istream ***********************************
    275275
    276276
     
    326326} // distribution
    327327
    328 //*********************************** Manipulators ***********************************
     328//*********************************** manipulators ***********************************
    329329
    330330struct _Istream_Cstr {
     
    403403
    404404
    405 //*********************************** Time ***********************************
     405//*********************************** time ***********************************
    406406
    407407
Note: See TracChangeset for help on using the changeset viewer.