Changeset d60ccbf for src/driver/cfa.cc

Timestamp:

Aug 12, 2015, 2:27:31 PM (10 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, string, with_gc

Children:

f32c7f4

Parents:

e45215c (diff), e869d663 (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 designate

Conflicts:

src/CodeGen/CodeGenerator.h

File:

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

src/driver/cfa.cc

@@ -10 +10 @@
 // Created On       : Tue Aug 20 13:44:49 2002
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jun 23 17:47:03 2015
-// Update Count     : 119
+// Last Modified On : Thu Jul 16 17:09:23 2015
+// Update Count     : 124
 //
 
@@ -52 +52 @@
         string Version( VERSION );                                                      // current version number from CONFIG
         string Major( "0" ), Minor( "0" ), Patch( "0" );        // default version numbers
+
         int posn1 = Version.find( "." );                                        // find the divider between major and minor version numbers
         if ( posn1 == -1 ) {                                                            // not there ?
@@ -256 +257 @@
         // add the correct set of flags based on the type of compile this is
 
-        args[nargs] = ( *new string( string("-D__CFA_MAJOR__=") + Major ) ).c_str();
+        args[nargs] = ( *new string( string("-D__CFA__=") + Major ) ).c_str();
         nargs += 1;
         args[nargs] = ( *new string( string("-D__CFA_MINOR__=") + Minor ) ).c_str();
+        nargs += 1;
+        args[nargs] = ( *new string( string("-D__CFA_PATCHLEVEL__=") + Patch ) ).c_str();
         nargs += 1;