Changeset b7d6a36 for src/Tuples/TupleExpansion.cc

Timestamp:

Feb 20, 2020, 4:15:51 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

6a490b2

Parents:

dca5802 (diff), 2cbfe92 (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 relaxed_ready

File:

• src/Tuples/TupleExpansion.cc (modified) (3 diffs)

src/Tuples/TupleExpansion.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Fri Jul 19 14:39:00 2019
-// Update Count     : 22
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Dec 13 23:45:51 2019
+// Update Count     : 24
 //
 
@@ -27 +27 @@
 #include "Common/utility.h"       // for CodeLocation
 #include "InitTweak/InitTweak.h"  // for getFunction
-#include "Parser/LinkageSpec.h"   // for Spec, C, Intrinsic
+#include "SynTree/LinkageSpec.h"  // for Spec, C, Intrinsic
 #include "SynTree/Constant.h"     // for Constant
 #include "SynTree/Declaration.h"  // for StructDecl, DeclarationWithType
@@ -361 +361 @@
         const ast::TypeInstType * isTtype( const ast::Type * type ) {
                 if ( const ast::TypeInstType * inst = dynamic_cast< const ast::TypeInstType * >( type ) ) {
-                        if ( inst->base && inst->base->kind == ast::TypeVar::Ttype ) {
+                        if ( inst->base && inst->base->kind == ast::TypeDecl::Ttype ) {
                                 return inst;
                         }