diff options
| author | Bernard Normier <bernard@zeroc.com> | 2012-09-08 18:28:12 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2012-09-08 18:28:12 -0400 |
| commit | e7402b3781b43c0808479bba80dbd0ef9cc62688 (patch) | |
| tree | 859766b2db462d9ea0312a2086710f9d2a8878f9 /cpp/src/Ice/Proxy.cpp | |
| parent | Fixed ICE-4864: Improved Makefiles for parallel builds with gmake (diff) | |
| download | ice-e7402b3781b43c0808479bba80dbd0ef9cc62688.tar.bz2 ice-e7402b3781b43c0808479bba80dbd0ef9cc62688.tar.xz ice-e7402b3781b43c0808479bba80dbd0ef9cc62688.zip | |
Fixed ICE-4863 (IceProxy::Ice::Object derives privately from Mutex) + a few warnings with Solaris CC
Diffstat (limited to 'cpp/src/Ice/Proxy.cpp')
| -rw-r--r-- | cpp/src/Ice/Proxy.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp index a9768790b1b..07cdd802c84 100644 --- a/cpp/src/Ice/Proxy.cpp +++ b/cpp/src/Ice/Proxy.cpp @@ -1100,7 +1100,7 @@ IceProxy::Ice::Object::ice_getCachedConnection() const { Handle< ::IceDelegate::Ice::Object> __del; { - IceUtil::Mutex::Lock sync(*this); + IceUtil::Mutex::Lock sync(_mutex); __del = _delegate; } @@ -1193,7 +1193,7 @@ IceProxy::Ice::Object::__copyFrom(const ObjectPrx& from) Handle< ::IceDelegateM::Ice::Object> delegateM; { - IceUtil::Mutex::Lock sync(*from.get()); + IceUtil::Mutex::Lock sync(from->_mutex); ref = from->_reference; delegateD = dynamic_cast< ::IceDelegateD::Ice::Object*>(from->_delegate.get()); @@ -1243,7 +1243,7 @@ IceProxy::Ice::Object::__handleException(const ::IceInternal::Handle< ::IceDeleg // Only _delegate needs to be mutex protected here. // { - IceUtil::Mutex::Lock sync(*this); + IceUtil::Mutex::Lock sync(_mutex); if(delegate.get() == _delegate.get()) { _delegate = 0; @@ -1274,7 +1274,7 @@ IceProxy::Ice::Object::__handleExceptionWrapper(const ::IceInternal::Handle< ::I const LocalExceptionWrapper& ex) { { - IceUtil::Mutex::Lock sync(*this); + IceUtil::Mutex::Lock sync(_mutex); if(delegate.get() == _delegate.get()) { _delegate = 0; @@ -1302,7 +1302,7 @@ IceProxy::Ice::Object::__handleExceptionWrapperRelaxed(const ::IceInternal::Hand else { { - IceUtil::Mutex::Lock sync(*this); + IceUtil::Mutex::Lock sync(_mutex); if(del.get() == _delegate.get()) { _delegate = 0; @@ -1374,7 +1374,7 @@ IceProxy::Ice::Object::__getDelegate(bool ami) { if(_reference->getCacheConnection()) { - IceUtil::Mutex::Lock sync(*this); + IceUtil::Mutex::Lock sync(_mutex); if(_delegate) { return _delegate; @@ -1395,7 +1395,7 @@ IceProxy::Ice::Object::__setRequestHandler(const Handle< ::IceDelegate::Ice::Obj { if(_reference->getCacheConnection()) { - IceUtil::Mutex::Lock sync(*this); + IceUtil::Mutex::Lock sync(_mutex); if(_delegate.get() == delegate.get()) { if(dynamic_cast< ::IceDelegateM::Ice::Object*>(_delegate.get())) |