Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-19 00:41:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use wpi::mutex instead of std::mutex. (#105)

Browse Source 
This uses a priority-aware mutex on Linux platforms.
This commit is contained in:
Peter Johnson
2017-11-13 09:51:26 -08:00
committed by GitHub
parent 55fa1e5e76
commit e301adb22b
17 changed files with 123 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/native/cpp/HttpCameraImpl.h
View File

@@ -9,7 +9,6 @@
#define CSCORE_HTTPCAMERAIMPL_H_
#include <atomic>
#include <condition_variable>
#include <functional>
#include <initializer_list>
#include <memory>
@@ -20,6 +19,7 @@
#include <llvm/SmallString.h>
#include <llvm/StringMap.h>
#include <support/HttpUtil.h>
#include <support/condition_variable.h>
#include <support/raw_istream.h>
#include "SourceImpl.h"
@@ -128,10 +128,10 @@ class HttpCameraImpl : public SourceImpl {
size_t m_nextLocation{0};
int m_prefLocation{-1}; // preferred location
std::condition_variable m_sinkEnabledCond;
wpi::condition_variable m_sinkEnabledCond;
llvm::StringMap<llvm::SmallString<16>> m_settings;
std::condition_variable m_settingsCond;
wpi::condition_variable m_settingsCond;
llvm::StringMap<llvm::SmallString<16>> m_streamSettings;
std::atomic_bool m_streamSettingsUpdated{false};