Ignore:
Timestamp:
Nov 28, 2017, 3:04:37 PM (6 years ago)
Author:
Rob Schluntz <rschlunt@…>
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:
4e7a4e6
Parents:
1393df07 (diff), 8a0a64d9 (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:/u/cforall/software/cfa/cfa-cc

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/libcfa/stdhdr/assert.h

    r1393df07 rd5a52cc  
    44// The contents of this file are covered under the licence agreement in the
    55// file "LICENCE" distributed with Cforall.
    6 // 
    7 // assert.h -- 
    8 // 
     6//
     7// assert.h --
     8//
    99// Author           : Peter A. Buhr
    1010// Created On       : Mon Jul  4 23:25:26 2016
     
    1212// Last Modified On : Mon Jul 31 23:09:32 2017
    1313// Update Count     : 13
    14 // 
     14//
    1515
    16 #ifdef __CFORALL__
     16#ifdef __cforall
    1717extern "C" {
    18 #endif //__CFORALL__
     18#endif //__cforall
    1919
    2020#include_next <assert.h>
     
    3030#endif
    3131
    32 #ifdef __CFORALL__
     32#ifdef __cforall
    3333} // extern "C"
    34 #endif //__CFORALL__
     34#endif //__cforall
    3535
    3636// Local Variables: //
Note: See TracChangeset for help on using the changeset viewer.