mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-24 01:31:46 +00:00
Remove priority_condition_variable (#1337)
Make wpi::condition_variable typedef to std::condition_variable_any if wpi::mutex typedefs to priority_mutex. priority_condition_variable was originally intended as a copy of std::condition_variable_any that also returned the internal handle like std::condition_variable. This was needed because NetComm required a pthread_cond_t. We no longer use it anywhere. Its args were specialized for priority_mutex, but std::condition_variable_any supports this and more through templatization.
This commit is contained in:
committed by
Peter Johnson
parent
5fad2b1056
commit
26c33a9a56
@@ -9,12 +9,12 @@
|
||||
|
||||
#include <condition_variable>
|
||||
|
||||
#include "priority_condition_variable.h"
|
||||
#include "wpi/priority_mutex.h"
|
||||
|
||||
namespace wpi {
|
||||
|
||||
#ifdef WPI_HAVE_PRIORITY_CONDITION_VARIABLE
|
||||
using condition_variable = priority_condition_variable;
|
||||
#if defined(__linux__) && defined(WPI_HAVE_PRIORITY_MUTEX)
|
||||
using condition_variable = ::std::condition_variable_any;
|
||||
#else
|
||||
using condition_variable = ::std::condition_variable;
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user