Changeset e3bc51c


Ignore:
Timestamp:
May 8, 2020, 4:43:49 PM (17 months ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
arm-eh, jacob/cs343-translation, master, new-ast, new-ast-unique-expr
Children:
bcd74f3
Parents:
7030dab
Message:

Fixed bad merge

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/AST/Decl.hpp

    r7030dab re3bc51c  
    191191        TypeDecl(
    192192                const CodeLocation & loc, const std::string & name, Storage::Classes storage,
    193                 const Type * b, TypeVar::Kind k, bool s, const Type * i = nullptr )
    194         : NamedTypeDecl( loc, name, storage, b ), kind( k ), sized( k == TypeVar::Ttype || s ),
     193                const Type * b, TypeDecl::Kind k, bool s, const Type * i = nullptr )
     194        : NamedTypeDecl( loc, name, storage, b ), kind( k ), sized( k == TypeDecl::Ttype || s ),
    195195          init( i ) {}
    196196
Note: See TracChangeset for help on using the changeset viewer.