Ignore:
Timestamp:
Sep 22, 2025, 2:33:42 PM (5 months ago)
Author:
Michael Brooks <mlbrooks@…>
Branches:
master
Children:
bb5b866
Parents:
7ca6bf1 (diff), 295ed2d1 (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 remote-tracking branch 'refs/remotes/origin/master'

File:
1 edited

Legend:

Unmodified
Added
Removed
  • tests/concurrency/unified_locking/locks.cfa

    r7ca6bf1 r1dec8f3  
    77
    88multiple_acquisition_lock m;
    9 condition_variable( multiple_acquisition_lock ) c_m;
     9cond_lock( multiple_acquisition_lock ) c_m;
    1010
    1111single_acquisition_lock s;
    12 condition_variable( single_acquisition_lock ) c_s;
     12cond_lock( single_acquisition_lock ) c_s;
    1313
    1414owner_lock o;
    15 condition_variable( owner_lock ) c_o;
     15cond_lock( owner_lock ) c_o;
    1616
    1717exp_backoff_then_block_lock l;
    18 condition_variable( exp_backoff_then_block_lock ) c_l;
     18cond_lock( exp_backoff_then_block_lock ) c_l;
    1919
    2020fast_block_lock f;
Note: See TracChangeset for help on using the changeset viewer.