Changeset 3d5701e for src/ResolvExpr/PtrsCastable.cc

Timestamp:

Feb 25, 2020, 1:17:33 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

7dc2e015

Parents:

9fb8f01 (diff), dd9e1ca (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:

resolve conflict

File:

• src/ResolvExpr/PtrsCastable.cc (modified) (2 diffs)

src/ResolvExpr/PtrsCastable.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 11:48:00 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  2 17:36:18 2016
-// Update Count     : 8
+// Last Modified On : Wed Dec 11 21:48:33 2019
+// Update Count     : 9
 //
 
@@ -176 +176 @@
                         if ( const ast::NamedTypeDecl * named = symtab.lookupType( inst->name ) ) {
                                 if ( auto tyDecl = dynamic_cast< const ast::TypeDecl * >( named ) ) {
-                                        if ( tyDecl->kind == ast::TypeVar::Ftype ) {
+                                        if ( tyDecl->kind == ast::TypeDecl::Ftype ) {
                                                 return -1;
                                         }
                                 }
                         } else if ( const ast::EqvClass * eqvClass = env.lookup( inst->name ) ) {
-                                if ( eqvClass->data.kind == ast::TypeVar::Ftype ) {
+                                if ( eqvClass->data.kind == ast::TypeDecl::Ftype ) {
                                         return -1;
                                 }