Changeset 7ff30d07 for src/driver

Timestamp:

Jun 14, 2016, 1:23:18 PM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

545ef59, c738ca4, ee51534

Parents:

6cbc25a (diff), c8c03683 (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

Conflicts:

Makefile.in
aclocal.m4
configure
src/Makefile.in
src/Tests/Context.c
src/driver/Makefile.in
src/examples/Makefile.in
src/examples/ctxts.c
src/examples/esskaykay.c
src/libcfa/Makefile.in

Location:

src/driver

Files:

• cc1.cc (modified) (2 diffs)
• cfa.cc (modified) (3 diffs)

src/driver/cc1.cc

@@ -10 +10 @@
 // Created On       : Fri Aug 26 14:23:51 2005
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jun  2 17:24:26 2016
-// Update Count     : 79
+// Last Modified On : Fri Jun 10 09:27:37 2016
+// Update Count     : 80
 //
 
@@ -151 +151 @@
                                 i += 1;                                                                 // and the argument
                                 cpp_flag = true;
-                        } else if ( arg == "-D__CFA__" ) {
+                        } else if ( arg == "-D__CFA_PREPROCESS__" ) {
                                 CFA_flag = true;
-                        } else if ( arg == "-D" && string( argv[i + 1] ) == "__CFA__" ) {
+                        } else if ( arg == "-D" && string( argv[i + 1] ) == "__CFA_PREPROCESS__" ) {
                                 i += 1;                                                                 // and the argument
                                 CFA_flag = true;

src/driver/cfa.cc

@@ -10 +10 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jun  2 17:24:25 2016
-// Update Count     : 137
+// Last Modified On : Fri Jun 10 09:26:19 2016
+// Update Count     : 138
 //
 
@@ -263 +263 @@
         args[nargs] = ( *new string( string("-D__CFA_PATCHLEVEL__=") + Patch ) ).c_str();
         nargs += 1;
-        args[nargs] = "-D__CFORALL__=1";
+        args[nargs] = "-D__CFA__";
+        nargs += 1;
+        args[nargs] = "-D__CFORALL__";
         nargs += 1;
 
@@ -272 +274 @@
 
         if ( CFA_flag ) {
-                args[nargs] = "-D__CFA__";
+                args[nargs] = "-D__CFA_PREPROCESS_";
                 nargs += 1;
         } // if