Changeset 04273e9 for src/Parser/DeclarationNode.cc

Timestamp:

Aug 8, 2016, 5:29:03 PM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, 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:

03da511

Parents:

0853178 (diff), 7bf7fb9 (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 ctor

Conflicts:

src/SymTab/Autogen.cc

File:

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

src/Parser/DeclarationNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 12:34:05 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 12 20:49:31 2016
-// Update Count     : 164
+// Last Modified On : Sun Aug  7 08:01:55 2016
+// Update Count     : 165
 //
 
@@ -49 +49 @@
         newnode->name = name;
         newnode->storageClasses = storageClasses;
-        newnode->bitfieldWidth = maybeClone( bitfieldWidth );
+//PAB   newnode->bitfieldWidth = maybeClone( bitfieldWidth );
+        newnode->bitfieldWidth = bitfieldWidth;
         newnode->hasEllipsis = hasEllipsis;
         newnode->initializer = initializer;