Changeset fe26fbf for src/SynTree/AttrType.cc

Timestamp:

Feb 7, 2017, 1:01:34 PM (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:

35b1bf4

Parents:

dbe8f244 (diff), b4d65c7 (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/SynTree/AttrType.cc (modified) (2 diffs)

src/SynTree/AttrType.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue May 19 16:41:51 2015
-// Update Count     : 2
+// Last Modified On : Wed Feb  1 17:17:59 2017
+// Update Count     : 3
 //
 
@@ -19 +19 @@
 
 
-AttrType::AttrType( const Type::Qualifiers &tq, const std::string &name, Expression *expr )
-        : Type( tq ), name( name ), expr( expr ), type( 0 ), isType( false ) {
+AttrType::AttrType( const Type::Qualifiers &tq, const std::string &name, Expression *expr, const std::list< Attribute * > & attributes )
+        : Type( tq, attributes ), name( name ), expr( expr ), type( 0 ), isType( false ) {
 }
 
-AttrType::AttrType( const Type::Qualifiers &tq, const std::string &name, Type *type )
-        : Type( tq ), name( name ), expr( 0 ), type( type ), isType( true ) {
+AttrType::AttrType( const Type::Qualifiers &tq, const std::string &name, Type *type, const std::list< Attribute * > & attributes )
+        : Type( tq, attributes ), name( name ), expr( 0 ), type( type ), isType( true ) {
 }