Changeset fcab269


Ignore:
Timestamp:
Jul 11, 2017, 3:06:46 PM (4 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
aaron-thesis, arm-eh, cleanup-dtors, deferred_resn, demangler, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, resolv-new, with_gc
Children:
38ac6ec
Parents:
bf2438c (diff), 0fc9756 (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

Location:
src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/Parser/parser.yy

    rbf2438c rfcab269  
    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 '}'
  • src/libcfa/exception.h

    rbf2438c rfcab269  
    1010// Created On       : Mon Jun 26 15:11:00 2017
    1111// Last Modified By : Andrew Beach
    12 // Last Modified On : Mon Nov 26 15:11:00 2017
    13 // Update Count     : 0
     12// Last Modified On : Tus Jul 11 13:40:00 2017
     13// Update Count     : 1
    1414//
    1515
     
    2222
    2323#ifdef __CFORALL__
    24 extern "BuiltinC" {
     24extern "C" {
    2525#endif
    2626
Note: See TracChangeset for help on using the changeset viewer.