Changeset ae144af


Ignore:
Timestamp:
Jul 13, 2018, 5:53:31 PM (3 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, no_list, persistent-indexer
Children:
0a73148
Parents:
ad64520 (diff), b1672e1 (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/libcfa
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • src/libcfa/bits/defs.h

    rad64520 rae144af  
    2828
    2929#ifdef __cforall
    30 #define __cfa_anonymous_object
     30#define __cfa_anonymous_object(x) inline struct x
    3131#else
    32 #define __cfa_anonymous_object __cfa_anonymous_object
     32#define __cfa_anonymous_object(x) x __cfa_anonymous_object
    3333#endif
    3434
  • src/libcfa/concurrency/invoke.h

    rad64520 rae144af  
    9393
    9494                // list of acceptable functions, null if any
    95                 __small_array_t(struct __acceptable_t) __cfa_anonymous_object;
     95                __cfa_anonymous_object( __small_array_t(struct __acceptable_t) );
    9696        };
    9797
     
    121121        struct __monitor_group_t {
    122122                // currently held monitors
    123                 __small_array_t(monitor_desc*) __cfa_anonymous_object;
     123                __cfa_anonymous_object( __small_array_t(monitor_desc*) );
    124124
    125125                // last function that acquired monitors
  • src/libcfa/concurrency/monitor

    rad64520 rae144af  
    138138
    139139struct __acceptable_t {
    140         __monitor_group_t;
     140        inline struct __monitor_group_t;
    141141        bool is_dtor;
    142142};
  • src/libcfa/containers/result

    rad64520 rae144af  
    2828struct result {
    2929        bool has_value;
    30         inner_result(T, E);
     30        inline union inner_result(T, E);
    3131};
    3232
Note: See TracChangeset for help on using the changeset viewer.