Ignore:
Timestamp:
Nov 10, 2020, 6:03:04 PM (3 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
4a36b344, 654d5a47
Parents:
1b5c3d60 (diff), 1d379b5 (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/AST/Pass.proto.hpp

    r1b5c3d60 r2b18848  
    270270
    271271        template< typename core_t >
    272         static bool onError (core_t &, ptr<Decl> &, long) { return true; }
    273 
    274         template< typename core_t >
    275         static auto onError (core_t & core, ptr<Decl> & decl, int) -> decltype(core.onError(decl)) {
    276                 return core.onError(decl);
     272        static bool on_error (core_t &, ptr<Decl> &, long) { return true; }
     273
     274        template< typename core_t >
     275        static auto on_error (core_t & core, ptr<Decl> & decl, int) -> decltype(core.on_error(decl)) {
     276                return core.on_error(decl);
    277277        }
    278278
Note: See TracChangeset for help on using the changeset viewer.