diff options
| author | Jose <jose@zeroc.com> | 2015-12-21 20:21:21 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2015-12-21 20:21:21 +0100 |
| commit | 31607cd5a0db7bdc56a938e78155eaf076a5e06d (patch) | |
| tree | 8676c30e797a7e3797de4aa43d158da42f927ad8 /cpp/src/Ice/EndpointI.h | |
| parent | Also define stream creation methods for the C++11 mapping (diff) | |
| download | ice-31607cd5a0db7bdc56a938e78155eaf076a5e06d.tar.bz2 ice-31607cd5a0db7bdc56a938e78155eaf076a5e06d.tar.xz ice-31607cd5a0db7bdc56a938e78155eaf076a5e06d.zip | |
C++ shared_from_this simplifications
Diffstat (limited to 'cpp/src/Ice/EndpointI.h')
| -rw-r--r-- | cpp/src/Ice/EndpointI.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/cpp/src/Ice/EndpointI.h b/cpp/src/Ice/EndpointI.h index 6000f706bdb..ced48f600e5 100644 --- a/cpp/src/Ice/EndpointI.h +++ b/cpp/src/Ice/EndpointI.h @@ -16,16 +16,14 @@ #include <Ice/TransceiverF.h> #include <Ice/ConnectorF.h> #include <Ice/AcceptorF.h> +#include <Ice/VirtualShared.h> namespace IceInternal { class BasicStream; -class ICE_API EndpointI_connectors -#ifndef ICE_CPP11_MAPPING - : public virtual IceUtil::Shared -#endif +class ICE_API EndpointI_connectors : public virtual ICE_SHARED { public: @@ -36,7 +34,7 @@ public: }; class ICE_API EndpointI : public Ice::Endpoint, - public ICE_ENABLE_SHARED_FROM_THIS(EndpointI) + public virtual ICE_SHARED { public: |