Ignore:
Timestamp:
Jun 30, 2016, 4:32:56 PM (10 years ago)
Author:
Thierry Delisle <tdelisle@…>
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, with_gc
Children:
ea29e73
Parents:
1b5c81ed (diff), 84d4d6f (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' into gc_noraii

Conflicts:

Jenkinsfile
src/SymTab/Validate.cc

File:
1 moved

Legend:

Unmodified
Added
Removed

  • src/tests/.expect/declarationSpecifier.txt

    r1b5c81ed rf80e0218  
     1CFA Version 1.0.0 (debug)
    12Error: invalid combination of storage classes in declaration of x9: static static volatile const short int
    23
    … …  
    1314Error: invalid combination of storage classes in declaration of x28: static static volatile const instance of type Int
    1415
     16make: *** [declarationSpecifier] Error 1
Note: See TracChangeset for help on using the changeset viewer.