Ignore:
Timestamp:
Dec 3, 2020, 7:46:34 PM (12 months ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
arm-eh, jacob/cs343-translation, master, new-ast-unique-expr
Children:
6855d14
Parents:
4011b98 (diff), 0797198 (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/locks.cfa

    r4011b98 r55da258  
    207207        void ^?{}( condition_variable(L) & this ){ }
    208208
    209         void ?{}( alarm_node_wrap(L) & this, $thread * thrd, Time alarm, Duration period, Alarm_Callback callback ) {
    210                 this.alarm_node{ thrd, alarm, period, callback };
     209        void ?{}( alarm_node_wrap(L) & this, Time alarm, Duration period, Alarm_Callback callback ) {
     210                this.alarm_node{ callback, alarm, period };
    211211        }
    212212
     
    277277                lock( lock __cfaabi_dbg_ctx2 );
    278278                size_t recursion_count = queue_and_get_recursion(this, &info);
    279                 alarm_node_wrap(L) node_wrap = { info.t, t, 0`s, alarm_node_wrap_cast };
     279                alarm_node_wrap(L) node_wrap = { t, 0`s, alarm_node_wrap_cast };
    280280                node_wrap.cond = &this;
    281281                node_wrap.i = &info;
Note: See TracChangeset for help on using the changeset viewer.