| Index: webrtc/system_wrappers/source/condition_variable_event_win.cc
|
| diff --git a/webrtc/system_wrappers/source/condition_variable_event_win.cc b/webrtc/system_wrappers/source/condition_variable_event_win.cc
|
| index 41b019dad3aa02092391503ed0f8724af414afd6..f61e085384ffa19f300d2a7c79b3f91adb6de2f4 100644
|
| --- a/webrtc/system_wrappers/source/condition_variable_event_win.cc
|
| +++ b/webrtc/system_wrappers/source/condition_variable_event_win.cc
|
| @@ -84,7 +84,8 @@ Vanderbilt University to appear in their names.
|
| */
|
|
|
| #include "webrtc/system_wrappers/source/condition_variable_event_win.h"
|
| -#include "webrtc/system_wrappers/source/critical_section_win.h"
|
| +
|
| +#include "webrtc/system_wrappers/include/critical_section_wrapper.h"
|
|
|
| namespace webrtc {
|
|
|
| @@ -133,9 +134,7 @@ bool ConditionVariableEventWin::SleepCS(CriticalSectionWrapper& crit_sect,
|
| ++(num_waiters_[eventID]);
|
| LeaveCriticalSection(&num_waiters_crit_sect_);
|
|
|
| - CriticalSectionWindows* cs =
|
| - static_cast<CriticalSectionWindows*>(&crit_sect);
|
| - LeaveCriticalSection(&cs->crit);
|
| + LeaveCriticalSection(&crit_sect.crit_);
|
| HANDLE events[2];
|
| events[0] = events_[WAKE];
|
| events[1] = events_[eventID];
|
| @@ -161,7 +160,7 @@ bool ConditionVariableEventWin::SleepCS(CriticalSectionWrapper& crit_sect,
|
| ResetEvent(events_[eventID]);
|
| }
|
|
|
| - EnterCriticalSection(&cs->crit);
|
| + EnterCriticalSection(&crit_sect.crit_);
|
| return ret_val;
|
| }
|
|
|
|
|