diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2005-09-06 07:03:16 +0000 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2005-09-06 07:03:16 +0000 |
| commit | de0c9bfb3b22efb3f531d698bda85bf36dfe63ec (patch) | |
| tree | 8aa4dab0060706bcf22da0706eac1d777b5613ce /cpp/src | |
| parent | setDefaultContext/getDefaultContext is now thread safe, and checks whether (diff) | |
| download | ice-de0c9bfb3b22efb3f531d698bda85bf36dfe63ec.tar.bz2 ice-de0c9bfb3b22efb3f531d698bda85bf36dfe63ec.tar.xz ice-de0c9bfb3b22efb3f531d698bda85bf36dfe63ec.zip | |
fix.
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/CommunicatorI.h | 2 | ||||
| -rw-r--r-- | cpp/src/Ice/Instance.cpp | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/cpp/src/Ice/CommunicatorI.h b/cpp/src/Ice/CommunicatorI.h index 483e98ab4fd..2865f1b449e 100644 --- a/cpp/src/Ice/CommunicatorI.h +++ b/cpp/src/Ice/CommunicatorI.h @@ -20,7 +20,7 @@ namespace Ice { -class CommunicatorI : public Communicator, public ::IceUtil::RecMutex +class CommunicatorI : public Communicator { public: diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp index 4a2c668c51f..38837e462cf 100644 --- a/cpp/src/Ice/Instance.cpp +++ b/cpp/src/Ice/Instance.cpp @@ -96,12 +96,10 @@ IceInternal::Instance::properties() const LoggerPtr IceInternal::Instance::logger() const { - // // No check for destruction. It must be possible to access the // logger after destruction. // - IceUtil::RecMutex::Lock sync(*this); return _logger; } @@ -114,7 +112,6 @@ IceInternal::Instance::logger(const LoggerPtr& logger) // after destruction (needed by logger plugins for example to // unset the logger). // - IceUtil::RecMutex::Lock sync(*this); _logger = logger; } |