diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2006-04-20 06:42:48 +0000 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2006-04-20 06:42:48 +0000 |
| commit | 97087d952ff8bc47e92a12e2ddd836e2c3d31354 (patch) | |
| tree | d3abe875287d973b52ff33d938301f3d4275c98b /cpp | |
| parent | Fixed project dependencies. Added missing sessionControl tests. (diff) | |
| download | ice-97087d952ff8bc47e92a12e2ddd836e2c3d31354.tar.bz2 ice-97087d952ff8bc47e92a12e2ddd836e2c3d31354.tar.xz ice-97087d952ff8bc47e92a12e2ddd836e2c3d31354.zip | |
Use EDEADLK, not EDEADLOCK.
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/include/IceUtil/Mutex.h | 2 | ||||
| -rw-r--r-- | cpp/include/IceUtil/StaticMutex.h | 2 | ||||
| -rw-r--r-- | cpp/include/IceUtil/Thread.h | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/cpp/include/IceUtil/Mutex.h b/cpp/include/IceUtil/Mutex.h index 9a33a147445..13f643f7e29 100644 --- a/cpp/include/IceUtil/Mutex.h +++ b/cpp/include/IceUtil/Mutex.h @@ -315,7 +315,7 @@ Mutex::tryLock() const int rc = pthread_mutex_trylock(&_mutex); if(rc != 0 && rc != EBUSY) { - if(rc == EDEADLOCK) + if(rc == EDEADLK) { throw ThreadLockedException(__FILE__, __LINE__); } diff --git a/cpp/include/IceUtil/StaticMutex.h b/cpp/include/IceUtil/StaticMutex.h index f499f6f1674..d0e6878893e 100644 --- a/cpp/include/IceUtil/StaticMutex.h +++ b/cpp/include/IceUtil/StaticMutex.h @@ -295,7 +295,7 @@ StaticMutex::tryLock() const int rc = pthread_mutex_trylock(&_mutex); if(rc != 0 && rc != EBUSY) { - if(rc == EDEADLOCK) + if(rc == EDEADLK) { throw ThreadLockedException(__FILE__, __LINE__); } diff --git a/cpp/include/IceUtil/Thread.h b/cpp/include/IceUtil/Thread.h index 7c9ffd16fdf..f2b14936158 100644 --- a/cpp/include/IceUtil/Thread.h +++ b/cpp/include/IceUtil/Thread.h @@ -139,7 +139,6 @@ protected: pthread_t _thread; #endif -private: Thread(const Thread&); // Copying is forbidden void operator=(const Thread&); // Assignment is forbidden }; |