diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-08-04 16:52:11 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-08-04 16:52:11 -0400 |
| commit | 124017bfb9469d9c081c92acee12b4eac9304758 (patch) | |
| tree | e66cf548380f8d722cefd68fb26eae399e08b9d1 /cpp/src/Ice/ACM.h | |
| parent | Update UWP test certificate (diff) | |
| download | ice-124017bfb9469d9c081c92acee12b4eac9304758.tar.bz2 ice-124017bfb9469d9c081c92acee12b4eac9304758.tar.xz ice-124017bfb9469d9c081c92acee12b4eac9304758.zip | |
Refactored shared_from_this/enable_shared_from_this
Diffstat (limited to 'cpp/src/Ice/ACM.h')
| -rw-r--r-- | cpp/src/Ice/ACM.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/cpp/src/Ice/ACM.h b/cpp/src/Ice/ACM.h index 6859669255c..32e89ac02fe 100644 --- a/cpp/src/Ice/ACM.h +++ b/cpp/src/Ice/ACM.h @@ -19,7 +19,6 @@ #include <Ice/InstanceF.h> #include <Ice/PropertiesF.h> #include <Ice/LoggerF.h> -#include <Ice/VirtualShared.h> #include <set> namespace IceInternal @@ -51,7 +50,10 @@ public: virtual Ice::ACM getACM() = 0; }; -class FactoryACMMonitor : public ACMMonitor, public IceUtil::Mutex, public Ice::EnableSharedFromThis<FactoryACMMonitor> +class FactoryACMMonitor : public ACMMonitor, public IceUtil::Mutex +#ifdef ICE_CPP11_MAPPING + , public std::enable_shared_from_this<FactoryACMMonitor> +#endif { public: @@ -87,8 +89,10 @@ private: }; class ConnectionACMMonitor : public ACMMonitor, - public IceUtil::Mutex, - public Ice::EnableSharedFromThis<ConnectionACMMonitor> + public IceUtil::Mutex +#ifdef ICE_CPP11_MAPPING + , public std::enable_shared_from_this<ConnectionACMMonitor> +#endif { public: |