generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix Windows debug compile of overrides/ logging.

Browse Source 
Compile error detected when trying to roll to chromium. Adding a cast
of base::PlatformThread::CurrentId() to base::subtle::Atomic32 to match
types in DCHECK_EQ().

See logging.cc error in:
http://build.chromium.org/p/tryserver.chromium/builders/win_chromium_compile_dbg/builds/19944/steps/compile%20%28with%20patch%29/logs/stdio

R=mflodman@webrtc.org, perkj@webrtc.org
TBR=henrike@webrtc.org
BUG=

Review URL: https://webrtc-codereview.appspot.com/17529004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6173 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org 2014-05-15 13:56:56 +00:00
parent d5da25063c
commit 6aeeac95ca
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
webrtc/overrides/webrtc/base/logging.cc
View File

@ -288,8 +288,9 @@ void InitDiagnosticLoggingDelegateFunction(
// Ensure that this function is always called from the same thread.
base::subtle::NoBarrier_CompareAndSwap(&g_init_logging_delegate_thread_id, 0,
static_cast<base::subtle::Atomic32>(base::PlatformThread::CurrentId()));
DCHECK_EQ(g_init_logging_delegate_thread_id,
base::PlatformThread::CurrentId());
DCHECK_EQ(
g_init_logging_delegate_thread_id,
static_cast<base::subtle::Atomic32>(base::PlatformThread::CurrentId()));
#endif
CHECK(delegate);
// This function may be called with the same argument several times if the