Changeset d93d980 for src/driver/cfa.cc

Timestamp:

Oct 27, 2016, 4:15:45 PM (9 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

62e5546

Parents:

25f49f4 (diff), 24eb51ed (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

File:

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

src/driver/cfa.cc

@@ -25 +25 @@
 using std::endl;
 using std::string;
+using std::to_string;
 
 
@@ -50 +51 @@
 
 int main( int argc, char *argv[] ) {
-        string Version( VERSION );                                                      // current version number from CONFIG
-        string Major( CFA_VERSION_MAJOR ), Minor( CFA_VERSION_MINOR ), Patch( CFA_VERSION_MINOR );
+        string Version( CFA_VERSION_LONG );                                                     // current version number from CONFIG
+        string Major( to_string( CFA_VERSION_MAJOR ) ), Minor( to_string( CFA_VERSION_MINOR ) ), Patch( to_string( CFA_VERSION_PATCH ) );
 
         string installincdir( CFA_INCDIR );                                     // fixed location of include files