diff options
| author | pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-05-15 13:56:56 +0000 |
|---|---|---|
| committer | pbos@webrtc.org <pbos@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2014-05-15 13:56:56 +0000 |
| commit | da7c539c377367da25fc913d4399c5f0f69764ad (patch) | |
| tree | 425950f87136f54adae25e54725c95d668b59a4c /overrides/webrtc | |
| parent | e9b43402e00fc048cf93d7bb9a2cdbf97c1fed2c (diff) | |
| download | webrtc-da7c539c377367da25fc913d4399c5f0f69764ad.tar.gz | |
Fix Windows debug compile of overrides/ logging.
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/webrtc@6173 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'overrides/webrtc')
| -rw-r--r-- | overrides/webrtc/base/logging.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/overrides/webrtc/base/logging.cc b/overrides/webrtc/base/logging.cc index 2e43c501..f0c79106 100644 --- a/overrides/webrtc/base/logging.cc +++ b/overrides/webrtc/base/logging.cc @@ -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 |