Changeset 50eac1b for src/Parser/InitializerNode.cc

Timestamp:

Nov 18, 2015, 12:50:35 PM (8 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:

84b08d4, ba407ce

Parents:

f28a53a (diff), 9909842 (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 override-autogen

File:

• src/Parser/InitializerNode.cc (modified) (2 diffs)

src/Parser/InitializerNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 13:20:24 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jun  6 15:49:42 2015
-// Update Count     : 3
+// Last Modified On : Thu Oct  8 17:18:55 2015
+// Update Count     : 4
 // 
 
@@ -80 +80 @@
 
         if ( aggregate ) {
-                assert( next_init() != 0 );
+                //assert( next_init() != 0 );
 
                 std::list< Initializer *> initlist;