Changeset 6f15121


Ignore:
Timestamp:
Jul 16, 2019, 10:39:11 AM (2 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
arm-eh, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr
Children:
2026bb6, 8e87f37
Parents:
e67991f (diff), a87d40b (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

Location:
libcfa/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • libcfa/src/fstream.cfa

    re67991f r6f15121  
    1010// Created On       : Wed May 27 17:56:53 2015
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Sun Jul 14 11:51:10 2019
    13 // Update Count     : 347
     12// Last Modified On : Mon Jul 15 18:11:26 2019
     13// Update Count     : 349
    1414//
    1515
     
    165165
    166166static ofstream soutFile = { (FILE *)(&_IO_2_1_stdout_) };
    167 ofstream & sout = soutFile;
     167ofstream & sout = soutFile, & stdout = soutFile;
    168168static ofstream serrFile = { (FILE *)(&_IO_2_1_stderr_) };
    169 ofstream & serr = serrFile;
     169ofstream & serr = serrFile, & stderr = serrFile;
    170170
    171171static ofstream exitFile = { (FILE *)(&_IO_2_1_stdout_) };
     
    267267
    268268static ifstream sinFile = { (FILE *)(&_IO_2_1_stdin_) };
    269 ifstream & sin = sinFile;
     269ifstream & sin = sinFile, & stdin = sinFile;
    270270
    271271// Local Variables: //
  • libcfa/src/fstream.hfa

    re67991f r6f15121  
    1010// Created On       : Wed May 27 17:56:53 2015
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Fri Jul 12 12:03:54 2019
    13 // Update Count     : 165
     12// Last Modified On : Mon Jul 15 18:10:23 2019
     13// Update Count     : 167
    1414//
    1515
     
    7373void ?{}( ofstream & os, const char * name );
    7474
    75 extern ofstream & sout, & serr;
     75extern ofstream & sout, & stdout, & serr, & stderr;             // aliases
    7676extern ofstream & exit, & abort;
    7777
     
    102102void ?{}( ifstream & is, const char * name );
    103103
    104 extern ifstream & sin;
     104extern ifstream & sin, & stdin;                                                 // aliases
    105105
    106106// Local Variables: //
Note: See TracChangeset for help on using the changeset viewer.