Changeset a539fc3

Timestamp:

Sep 11, 2019, 1:40:38 PM (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:

6716d78

Parents:

8209e70 (diff), fd8f88f (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 distcc

Files:

• driver/cfa.cc (modified) (2 diffs)
• libcfa/src/fstream.cfa (modified) (3 diffs)

driver/cfa.cc

@@ -10 +10 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Sep  9 17:57:40 2019
-// Update Count     : 417
+// Last Modified On : Tue Sep 10 17:00:15 2019
+// Update Count     : 420
 //
 
@@ -278 +278 @@
         // -E flag stops at cc1 stage 1, so cfa-cpp in cc1 stage 2 is never executed.
         if ( cpp_flag && CFA_flag ) {
-                cerr << argv[0] << " error, cannot use -E and -CFA flags together." << endl;
-                exit( EXIT_FAILURE );
+                CFA_flag = false;
+                cerr << argv[0] << " warning, both -E and -CFA flags specified, using -E and ignoring -CFA." << endl;
         } // if
 

libcfa/src/fstream.cfa

@@ -10 +10 @@
 // Created On       : Wed May 27 17:56:53 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jul 15 18:11:26 2019
-// Update Count     : 349
+// Last Modified On : Tue Sep 10 22:19:56 2019
+// Update Count     : 354
 //
 
@@ -164 +164 @@
 } // fmt
 
-static ofstream soutFile = { (FILE *)(&_IO_2_1_stdout_) };
+static ofstream soutFile = { (FILE *)stdout };
 ofstream & sout = soutFile, & stdout = soutFile;
-static ofstream serrFile = { (FILE *)(&_IO_2_1_stderr_) };
+static ofstream serrFile = { (FILE *)stderr };
 ofstream & serr = serrFile, & stderr = serrFile;
 
-static ofstream exitFile = { (FILE *)(&_IO_2_1_stdout_) };
+static ofstream exitFile = { (FILE *)stdout };
 ofstream & exit = exitFile;
-static ofstream abortFile = { (FILE *)(&_IO_2_1_stderr_) };
+static ofstream abortFile = { (FILE *)stderr };
 ofstream & abort = abortFile;
 
@@ -265 +265 @@
 } // fmt
 
-
-static ifstream sinFile = { (FILE *)(&_IO_2_1_stdin_) };
+static ifstream sinFile = { (FILE *)stdin };
 ifstream & sin = sinFile, & stdin = sinFile;