Ignore:
Timestamp:
Jan 26, 2017, 12:03:57 PM (7 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc
Children:
0157ca7
Parents:
e15df4c (diff), ad6343e (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 plg.uwaterloo.ca:software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/SynTree/AggregateDecl.cc

    re15df4c rad56482  
    6969std::string EnumDecl::typeString() const { return "enum"; }
    7070
    71 std::string TraitDecl::typeString() const { return "context"; }
     71std::string TraitDecl::typeString() const { return "trait"; }
    7272
    7373// Local Variables: //
Note: See TracChangeset for help on using the changeset viewer.