livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-16024: Don't use a lambda as default arg for universal reference. 

Instead, break out a separate pop_() method that explicitly provides the
lambda to the real pop_() implementation.
master
Nat Goodspeed 2021-10-04 17:21:39 -04:00
parent ca60fbe72c
commit a35e266547
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/llcommon/llthreadsafequeue.h
View File

@ -191,9 +191,11 @@ protected:
template <typename T>
bool push_(lock_t& lock, T&& element);
// while lock is locked, really pop the head element, if we can
bool pop_(lock_t& lock, ElementT& element);
// pop_() with an explicit predicate indicating whether the head element
// is ready to be popped
template <typename PRED>
bool pop_(lock_t& lock, ElementT& element,
PRED&& pred=[](const ElementT&){ return true; });
bool pop_(lock_t& lock, ElementT& element, PRED&& pred);
};
/*****************************************************************************
@ -385,6 +387,16 @@ bool LLThreadSafeQueue<ElementT, QueueT>::tryPushUntil(
// while lock is locked, really pop the head element, if we can
template <typename ElementT, typename QueueT>
bool LLThreadSafeQueue<ElementT, QueueT>::pop_(lock_t& lock, ElementT& element)
{
// default predicate: head element, if present, is always ready to pop
return pop_(lock, element, [](const ElementT&){ return true; });
}
// pop_() with an explicit predicate indicating whether the head element
// is ready to be popped
template <typename ElementT, typename QueueT>
template <typename PRED>
bool LLThreadSafeQueue<ElementT, QueueT>::pop_(
lock_t& lock, ElementT& element, PRED&& pred)