Ignore:
Timestamp:
Nov 20, 2015, 10:32:05 AM (9 years ago)
Author:
Rob Schluntz <rschlunt@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc
Children:
66a2a61
Parents:
f066321 (diff), 258eb5c9 (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 /u/cforall/software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/SynTree/ReferenceToType.cc

    rf066321 r63afee0  
    5959std::string StructInstType::typeString() const { return "struct"; }
    6060
     61std::list<TypeDecl*>& StructInstType::get_baseParameters() { return baseStruct->get_parameters(); }
     62
    6163void StructInstType::lookup( const std::string &name, std::list< Declaration* > &foundDecls ) const {
    6264        assert( baseStruct );
     
    6567
    6668std::string UnionInstType::typeString() const { return "union"; }
     69
     70std::list<TypeDecl*>& UnionInstType::get_baseParameters() { return baseUnion->get_parameters(); }
    6771
    6872void UnionInstType::lookup( const std::string &name, std::list< Declaration* > &foundDecls ) const {
Note: See TracChangeset for help on using the changeset viewer.