Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1611)

Unified Diff: webrtc/system_wrappers/source/condition_variable.cc

Issue 1602203003: Remove unused ConditionVariableWrapper on POSIX platforms (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/system_wrappers/source/condition_variable.cc
diff --git a/webrtc/system_wrappers/source/condition_variable.cc b/webrtc/system_wrappers/source/condition_variable.cc
index f5ae93adc65573cbfcb383b79fbb73d0c128c0fa..3b2c37483a93d60a003c1c7d69c9250a20024e50 100644
--- a/webrtc/system_wrappers/source/condition_variable.cc
+++ b/webrtc/system_wrappers/source/condition_variable.cc
@@ -10,19 +10,17 @@
#include "webrtc/system_wrappers/include/condition_variable_wrapper.h"
-#if defined(_WIN32)
+// TODO(tommi): Remove completely. As is there is still some code for Windows
+// that relies on ConditionVariableWrapper, but code has been removed on other
+// platforms.
+#if defined(WEBRTC_WIN)
+
#include <windows.h>
#include "webrtc/system_wrappers/source/condition_variable_event_win.h"
#include "webrtc/system_wrappers/source/condition_variable_native_win.h"
-#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC)
-#include <pthread.h>
-#include "webrtc/system_wrappers/source/condition_variable_posix.h"
-#endif
namespace webrtc {
-
ConditionVariableWrapper* ConditionVariableWrapper::CreateConditionVariable() {
-#if defined(_WIN32)
// Try to create native condition variable implementation.
ConditionVariableWrapper* ret_val = ConditionVariableNativeWin::Create();
if (!ret_val) {
@@ -31,11 +29,7 @@ ConditionVariableWrapper* ConditionVariableWrapper::CreateConditionVariable() {
ret_val = new ConditionVariableEventWin();
}
return ret_val;
-#elif defined(WEBRTC_LINUX) || defined(WEBRTC_MAC)
- return ConditionVariablePosix::Create();
-#else
- return NULL;
-#endif
}
-
} // namespace webrtc
+
+#endif // defined(WEBRTC_WIN)
« no previous file with comments | « webrtc/system_wrappers/include/critical_section_wrapper.h ('k') | webrtc/system_wrappers/source/condition_variable_posix.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698