Changeset e3bc51c

Timestamp:

May 8, 2020, 4:43:49 PM (5 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:

bcd74f3

Parents:

7030dab

Message:

Fixed bad merge

File:

• src/AST/Decl.hpp (modified) (1 diff)

src/AST/Decl.hpp

@@ -191 +191 @@
         TypeDecl(
                 const CodeLocation & loc, const std::string & name, Storage::Classes storage,
-                const Type * b, TypeVar::Kind k, bool s, const Type * i = nullptr )
-        : NamedTypeDecl( loc, name, storage, b ), kind( k ), sized( k == TypeVar::Ttype || s ),
+                const Type * b, TypeDecl::Kind k, bool s, const Type * i = nullptr )
+        : NamedTypeDecl( loc, name, storage, b ), kind( k ), sized( k == TypeDecl::Ttype || s ),
           init( i ) {}