Ignore:
Timestamp:
Nov 13, 2020, 6:41:17 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:
7232fe2
Parents:
26ceca1 (diff), 1e208ea (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
  • libcfa/src/concurrency/invoke.h

    r26ceca1 r6e09a41e  
    195195
    196196                #if defined( __CFA_WITH_VERIFY__ )
    197                         unsigned long long canary;
     197                        void * canary;
    198198                #endif
    199199        };
Note: See TracChangeset for help on using the changeset viewer.