From 30ed55ded53a21e0ca9ccb0645273a3da2573b60 Mon Sep 17 00:00:00 2001 From: Ehsan Akhgari Date: Thu, 28 Nov 2013 09:09:57 -0500 Subject: [PATCH] Follow-up to bug 941693 - Fix mac builds --- tools/profiler/platform-macos.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/profiler/platform-macos.cc b/tools/profiler/platform-macos.cc index 072018d4a7a..b72e143447f 100644 --- a/tools/profiler/platform-macos.cc +++ b/tools/profiler/platform-macos.cc @@ -56,7 +56,7 @@ Sampler *SamplerRegistry::sampler = NULL; // a pointer. static const pthread_t kNoThread = (pthread_t) 0; -class MacOSMutex : public Mutex { +class MacOSMutex : public ::Mutex { public: MacOSMutex() { pthread_mutexattr_t attr; @@ -85,7 +85,7 @@ class MacOSMutex : public Mutex { }; -Mutex* OS::CreateMutex() { +::Mutex* OS::CreateMutex() { return new MacOSMutex(); } @@ -298,7 +298,7 @@ class SamplerThread : public Thread { //RuntimeProfilerRateLimiter rate_limiter_; // Protects the process wide state below. - static Mutex* mutex_; + static ::Mutex* mutex_; static SamplerThread* instance_; DISALLOW_COPY_AND_ASSIGN(SamplerThread);