Changeset 0720e049 for src/main.cc

Timestamp:

Aug 11, 2017, 10:33:37 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

54cd58b0

Parents:

3d4b23fa (diff), 59a75cb (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:/u/cforall/software/cfa/cfa-cc

File:

• src/main.cc (modified) (3 diffs)

src/main.cc

@@ -11 +11 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Jul  7 11:13:00 2017
-// Update Count     : 442
+// Last Modified On : Wed Jul 26 14:38:00 2017
+// Update Count     : 443
 //
 
@@ -58 +58 @@
 #include "SynTree/Visitor.h"                // for acceptAll
 #include "Tuples/Tuples.h"                  // for expandMemberTuples, expan...
+#include "Virtual/ExpandCasts.h"            // for expandCasts
 
 using namespace std;
@@ -313 +314 @@
                 }
 
+                OPTPRINT( "virtual expandCasts" ) // Must come after translateEHM
+                Virtual::expandCasts( translationUnit );
+
                 OPTPRINT("instantiateGenerics")
                 GenPoly::instantiateGeneric( translationUnit );