Ignore:
Timestamp:
Jan 12, 2017, 2:05:49 PM (7 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc
Children:
f3b0a07
Parents:
2298a7b8 (diff), 3fe34ae (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:/u/cforall/software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/libcfa/iostream

    r2298a7b8 r981bdc6  
    55// file "LICENCE" distributed with Cforall.
    66//
    7 // iostream -- 
     7// iostream --
    88//
    99// Author           : Peter A. Buhr
     
    1313// Update Count     : 93
    1414//
    15 
    16 #ifdef __CFORALL__
    1715
    1816#ifndef __IOSTREAM_H__
     
    2826        void sepReset( ostype *, _Bool );                                       // set separator and default state
    2927        void sepSet( ostype *, const char * );                          // set separator to string (15 character maximum)
    30         const char * sepGet( ostype * );                                        // get separator string 
     28        const char * sepGet( ostype * );                                        // get separator string
    3129        _Bool sepDisable( ostype * );                                           // set default state to off, and return previous state
    3230        _Bool sepEnable( ostype * );                                            // set default state to on, and return previous state
     
    128126#endif // __IOSTREAM_H
    129127
    130 #else
    131 #include_next <iostream>
    132 #endif //__CFORALL__
    133 
    134128// Local Variables: //
    135129// mode: c //
Note: See TracChangeset for help on using the changeset viewer.