Follow-up to bug 941693 - Fix mac builds

This commit is contained in:
Ehsan Akhgari 2013-11-28 09:09:57 -05:00
parent 6bc767889b
commit 30ed55ded5

View File

@ -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);