diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2024-09-05 11:08:26 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2024-09-05 11:08:26 -0400 |
commit | 866f900a3be8bbbf8fb10e6ccb87bb80882b4a6e (patch) | |
tree | 216c3ff8470556e3e797dc5b6d10285bc46dbdd7 /indra | |
parent | 000a23ba0534fdf9bfc4a1b051b7cee0adceef3e (diff) |
Fix a merge glitch in llcoros.h.
Diffstat (limited to 'indra')
-rw-r--r-- | indra/llcommon/llcoros.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llcoros.h b/indra/llcommon/llcoros.h index 2272237fa3..0291d7f1d9 100644 --- a/indra/llcommon/llcoros.h +++ b/indra/llcommon/llcoros.h @@ -324,7 +324,7 @@ public: // LockType is deprecated; see llcoromutex.h using LockType = llcoro::LockType; using cv_status = llcoro::cv_status; - using ConditionVariable = llcoro::condition_variable; + using ConditionVariable = llcoro::ConditionVariable; /// for data local to each running coroutine template <typename T> |