Ignore:
Timestamp:
Jul 12, 2017, 10:14:15 AM (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:
3268a58, 76f2bdcb
Parents:
f2b12406 (diff), 7812f1d1 (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/Parser/parser.yy

    rf2b12406 rf73f5f4  
    1010// Created On       : Sat Sep  1 20:22:55 2001
    1111// Last Modified By : Andrew Beach
    12 // Last Modified On : Fri Jun 30 15:38:00 2017
    13 // Update Count     : 2415
     12// Last Modified On : Tus Jul 11 13:39:00 2017
     13// Update Count     : 2416
    1414//
    1515
     
    21762176                {
    21772177                        linkageStack.push( linkage );                           // handle nested extern "C"/"Cforall"
    2178                         linkage = LinkageSpec::linkageCheck( $2 );
     2178                        linkage = LinkageSpec::linkageUpdate( linkage, $2 );
    21792179                }
    21802180          '{' external_definition_list_opt '}'
Note: See TracChangeset for help on using the changeset viewer.