From 6aeeac95cad7c8010d1ff7c5fca4b49fe3318025 Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Thu, 15 May 2014 13:56:56 +0000 Subject: [PATCH] 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@6173 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/overrides/webrtc/base/logging.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/webrtc/overrides/webrtc/base/logging.cc b/webrtc/overrides/webrtc/base/logging.cc index 2e43c5016a..f0c79106d6 100644 --- a/webrtc/overrides/webrtc/base/logging.cc +++ b/webrtc/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::PlatformThread::CurrentId())); - DCHECK_EQ(g_init_logging_delegate_thread_id, - base::PlatformThread::CurrentId()); + DCHECK_EQ( + g_init_logging_delegate_thread_id, + static_cast(base::PlatformThread::CurrentId())); #endif CHECK(delegate); // This function may be called with the same argument several times if the