From f9c50c822a9a12bcd3952dda58876d1fc2afa2a9 Mon Sep 17 00:00:00 2001 From: Sacha Date: Thu, 2 May 2013 17:34:06 +1000 Subject: [PATCH] Fix name collision by prefixing '::'. --- thread/threadpool.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/thread/threadpool.h b/thread/threadpool.h index 2dc412dd75..e89c93e8cd 100644 --- a/thread/threadpool.h +++ b/thread/threadpool.h @@ -56,9 +56,9 @@ public: private: std::thread *thread; // the worker thread - condition_variable signal; // used to signal new work - condition_variable done; // used to signal work completion - recursive_mutex mutex, doneMutex; // associated with each respective condition variable + ::condition_variable signal; // used to signal new work + ::condition_variable done; // used to signal work completion + ::recursive_mutex mutex, doneMutex; // associated with each respective condition variable volatile bool active, started; function work_; // the work to be done by this thread @@ -82,7 +82,7 @@ public: private: const int numThreads; std::vector> workers; - recursive_mutex mutex; // used to sequentialize loop execution + ::recursive_mutex mutex; // used to sequentialize loop execution bool workersStarted; void StartWorkers();