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/RouterInfo.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/RouterInfo.h')
| -rw-r--r-- | cpp/src/Ice/RouterInfo.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cpp/src/Ice/RouterInfo.h b/cpp/src/Ice/RouterInfo.h index a7e632a5951..298cbc455f4 100644 --- a/cpp/src/Ice/RouterInfo.h +++ b/cpp/src/Ice/RouterInfo.h @@ -19,7 +19,6 @@ #include <Ice/BuiltinSequences.h> #include <Ice/Identity.h> #include <Ice/Comparable.h> -#include <Ice/VirtualShared.h> #include <set> @@ -68,7 +67,10 @@ public: }; typedef IceUtil::Handle<GetClientEndpointsCallback> GetClientEndpointsCallbackPtr; - class AddProxyCallback : public Ice::EnableSharedFromThis<AddProxyCallback> + class AddProxyCallback +#ifndef ICE_CPP11_MAPPING + : public virtual IceUtil::Shared +#endif { public: |