diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-09-04 17:00:08 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-09-04 17:00:08 +0300 |
commit | 206bdc90de1cbb68f78df74c1b6cf6426522ef79 (patch) | |
tree | 27f2d17c397bbebc1a1071248b63dc6d33a43cb7 /indra/llcommon/tests/threadsafeschedule_test.cpp | |
parent | a65bc46b138b89200586b29fe729cbc7b0f0c8c4 (diff) | |
parent | e5bcd6f50a8247dde1121210150835d968dc214d (diff) |
Merge pull request #2494 from secondlife/marchcat/b-develop
Maint B sync
Diffstat (limited to 'indra/llcommon/tests/threadsafeschedule_test.cpp')
-rw-r--r-- | indra/llcommon/tests/threadsafeschedule_test.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/tests/threadsafeschedule_test.cpp b/indra/llcommon/tests/threadsafeschedule_test.cpp index f2f17dd2e6..5e5d6e1259 100644 --- a/indra/llcommon/tests/threadsafeschedule_test.cpp +++ b/indra/llcommon/tests/threadsafeschedule_test.cpp @@ -47,11 +47,11 @@ namespace tut // the timestamp for each one -- but since we're passing explicit // timestamps, make the queue reorder them. auto now{ Queue::Clock::now() }; - queue.push(Queue::TimeTuple(now + 200ms, "ghi")); + queue.push(Queue::TimeTuple(now + 200ms, "ghi"s)); // Given the various push() overloads, you have to match the type // exactly: conversions are ambiguous. - queue.push("abc"s); - queue.push(now + 100ms, "def"); + queue.push(now, "abc"s); + queue.push(now + 100ms, "def"s); queue.close(); auto entry = queue.pop(); ensure_equals("failed to pop first", std::get<0>(entry), "abc"s); |