diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-11-09 00:41:58 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-11-09 00:41:58 +0200 |
| commit | 290406294891cba3e3f1496ff952d4b485d0fc49 (patch) | |
| tree | e02c02f130b4e00054028b400e7974252cde8495 /indra/llcommon | |
| parent | 67ce0e77d786b21c40e12b242e4646cfe6915e26 (diff) | |
| parent | 94cb1ba16c5b301779e437f73af9e06558f15760 (diff) | |
Merge remote-tracking branch 'ZiRee/viewer/master' into DRTVWR-570-maint-Q
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/threadsafeschedule.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/threadsafeschedule.h b/indra/llcommon/threadsafeschedule.h index 3e0da94c02..0c3a541196 100644 --- a/indra/llcommon/threadsafeschedule.h +++ b/indra/llcommon/threadsafeschedule.h @@ -248,7 +248,7 @@ namespace LL TimePoint until = TimePoint::clock::now() + std::chrono::hours(24); pop_result popped = tryPopUntil_(lock, until, tt); if (popped == POPPED) - return std::move(tt); + return tt; // DONE: throw, just as super::pop() does if (popped == DONE) |