Changeset add7117 for src/Parser/TypeData.h

Timestamp:

Sep 10, 2016, 11:08:47 AM (9 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:

5af62f1

Parents:

f5e81d1 (diff), 03e3117 (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 tuples

Conflicts:

src/ResolvExpr/AlternativeFinder.cc
src/ResolvExpr/AlternativeFinder.h

File:

• src/Parser/TypeData.h (modified) (2 diffs)

src/Parser/TypeData.h ¶

@@ -10 +10 @@
 // Created On       : Sat May 16 15:18:36 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Aug 29 22:31:52 2016
-// Update Count     : 110
+// Last Modified On : Fri Sep  9 23:20:55 2016
+// Update Count     : 117
 //
 
@@ -96 +96 @@
                 Array_t array;
                 Enumeration_t enumeration;
+                // Variable_t variable;
                 Function_t function;
                 Symbolic_t symbolic;
                 DeclarationNode * tuple;
                 ExpressionNode * typeexpr;
-                //Attr_t attr;
+                // Attr_t attr;
                 // DeclarationNode::BuiltinType builtin;