diff options
Diffstat (limited to 'indra/llcommon/llthreadsafequeue.h')
| -rw-r--r-- | indra/llcommon/llthreadsafequeue.h | 2 | 
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llthreadsafequeue.h b/indra/llcommon/llthreadsafequeue.h index 1a1d06a6fd..6532439dd9 100644 --- a/indra/llcommon/llthreadsafequeue.h +++ b/indra/llcommon/llthreadsafequeue.h @@ -452,9 +452,9 @@ ElementT LLThreadSafeQueue<ElementT, QueueT>::pop(void)          // so we can finish draining the queue.          pop_result popped = pop_(lock1, value);          if (popped == POPPED) +            return value;              // don't use std::move when returning local value because              // it prevents the compiler from optimizing with copy elision -            return value;          // Once the queue is DONE, there will never be any more coming.          if (popped == DONE)  | 
