diff options
| author | Jose <jose@zeroc.com> | 2015-12-23 15:00:34 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2015-12-23 15:00:34 +0100 |
| commit | 3c63f0acf41df01688fea2fb5fb5cec4d5eb4710 (patch) | |
| tree | c2a0a25ac956b4ce9a4edc8d37df1c24476e40fd /cpp/src/Ice/ObjectAdapterI.h | |
| parent | C++11 metrics fixes (diff) | |
| download | ice-3c63f0acf41df01688fea2fb5fb5cec4d5eb4710.tar.bz2 ice-3c63f0acf41df01688fea2fb5fb5cec4d5eb4710.tar.xz ice-3c63f0acf41df01688fea2fb5fb5cec4d5eb4710.zip | |
Fixes related to EnableSharedFromThis
Diffstat (limited to 'cpp/src/Ice/ObjectAdapterI.h')
| -rw-r--r-- | cpp/src/Ice/ObjectAdapterI.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/Ice/ObjectAdapterI.h b/cpp/src/Ice/ObjectAdapterI.h index 5addbdfe846..3678276d147 100644 --- a/cpp/src/Ice/ObjectAdapterI.h +++ b/cpp/src/Ice/ObjectAdapterI.h @@ -38,7 +38,7 @@ namespace Ice class ObjectAdapterI; ICE_DEFINE_PTR(ObjectAdapterIPtr, ObjectAdapterI); -class ObjectAdapterI : public ICE_ENABLE_SHARED_FROM_THIS(ObjectAdapterI), +class ObjectAdapterI : public EnableSharedFromThis<ObjectAdapterI>, public ObjectAdapter, public IceUtil::Monitor<IceUtil::RecMutex> { |