Changeset 6f15121

Timestamp:

Jul 16, 2019, 10:39:11 AM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

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:

• fstream.cfa (modified) (3 diffs)
• fstream.hfa (modified) (3 diffs)

libcfa/src/fstream.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jul 14 11:51:10 2019
-// Update Count     : 347
+// Last Modified On : Mon Jul 15 18:11:26 2019
+// Update Count     : 349
 //
 
@@ -165 +165 @@
 
 static ofstream soutFile = { (FILE *)(&_IO_2_1_stdout_) };
-ofstream & sout = soutFile;
+ofstream & sout = soutFile, & stdout = soutFile;
 static ofstream serrFile = { (FILE *)(&_IO_2_1_stderr_) };
-ofstream & serr = serrFile;
+ofstream & serr = serrFile, & stderr = serrFile;
 
 static ofstream exitFile = { (FILE *)(&_IO_2_1_stdout_) };
@@ -267 +267 @@
 
 static ifstream sinFile = { (FILE *)(&_IO_2_1_stdin_) };
-ifstream & sin = sinFile;
+ifstream & sin = sinFile, & stdin = sinFile;
 
 // Local Variables: //

libcfa/src/fstream.hfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul 12 12:03:54 2019
-// Update Count     : 165
+// Last Modified On : Mon Jul 15 18:10:23 2019
+// Update Count     : 167
 //
 
@@ -73 +73 @@
 void ?{}( ofstream & os, const char * name );
 
-extern ofstream & sout, & serr;
+extern ofstream & sout, & stdout, & serr, & stderr;             // aliases
 extern ofstream & exit, & abort;
 
@@ -102 +102 @@
 void ?{}( ifstream & is, const char * name );
 
-extern ifstream & sin;
+extern ifstream & sin, & stdin;                                                 // aliases
 
 // Local Variables: //