Changeset e07b589

Timestamp:

Apr 6, 2021, 9:17:52 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

7530049d, 857a1c6, 88ac8672, ecfd758

Parents:

8483c39a (diff), cd59d28 (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:software/cfa/cfa-cc

File:

• src/AST/Type.cpp (modified) (3 diffs)

src/AST/Type.cpp

@@ -105 +105 @@
 }
 
+// --- BaseInstType
+
 std::vector<readonly<Decl>> BaseInstType::lookup( const std::string& name ) const {
         assertf( aggr(), "Must have aggregate to perform lookup" );
@@ -119 +121 @@
 template<typename decl_t>
 SueInstType<decl_t>::SueInstType(
-        const decl_t * b, CV::Qualifiers q, std::vector<ptr<Attribute>>&& as )
-: BaseInstType( b->name, q, move(as) ), base( b ) {}
+        const base_type * b, CV::Qualifiers q, std::vector<ptr<Attribute>>&& as )
+: BaseInstType( b->name, q, std::move(as) ), base( b ) {}
 
 template<typename decl_t>
@@ -142 +144 @@
         const TraitDecl * b, CV::Qualifiers q, std::vector<ptr<Attribute>>&& as )
 : BaseInstType( b->name, q, move(as) ), base( b ) {}
+
+// --- TypeInstType
 
 void TypeInstType::set_base( const TypeDecl * b ) {