diff options
| -rw-r--r-- | cpp/include/IceUtil/Thread.h | 2 | ||||
| -rw-r--r-- | cpp/src/IceUtil/Thread.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/cpp/include/IceUtil/Thread.h b/cpp/include/IceUtil/Thread.h index 61ff62f6e6a..e1043183412 100644 --- a/cpp/include/IceUtil/Thread.h +++ b/cpp/include/IceUtil/Thread.h @@ -102,7 +102,7 @@ public: // This function is an implementation detail; // do not call it. // - void done(); + void _done(); protected: Mutex _stateMutex; diff --git a/cpp/src/IceUtil/Thread.cpp b/cpp/src/IceUtil/Thread.cpp index 224dcfa3632..2fded2e8aa5 100644 --- a/cpp/src/IceUtil/Thread.cpp +++ b/cpp/src/IceUtil/Thread.cpp @@ -190,7 +190,7 @@ WINAPI startHook(void* arg) cerr << "IceUtil::Thread::run(): uncaught exception: "; cerr << e << endl; } - thread->done(); + thread->_done(); return 0; } @@ -281,7 +281,7 @@ IceUtil::Thread::isAlive() const } void -IceUtil::Thread::done() +IceUtil::Thread::_done() { IceUtil::Mutex::Lock lock(_stateMutex); _running = false; @@ -411,7 +411,7 @@ startHook(void* arg) { cerr << "IceUtil::Thread::run(): uncaught exception" << endl; } - thread->done(); + thread->_done(); return 0; } @@ -518,7 +518,7 @@ IceUtil::Thread::isAlive() const } void -IceUtil::Thread::done() +IceUtil::Thread::_done() { IceUtil::Mutex::Lock lock(_stateMutex); _running = false; |