1 files changed, 17 insertions, 4 deletions
diff --git a/cpp/src/Ice/EndpointIF.h b/cpp/src/Ice/EndpointIF.h
index 015db135c40..07c8694b6da 100644
--- a/cpp/src/Ice/EndpointIF.h
+++ b/cpp/src/Ice/EndpointIF.h
@@ -17,25 +17,38 @@ namespace IceInternal
 {
 
 class EndpointI;
+class TcpEndpointI;
+class UdpEndpointI;
+class WSEndpoint;
+class EndpointI_connectors;
+
+#ifdef ICE_CPP11_MAPPING // C++11 mapping
+
+using EndpointIPtr = ::std::shared_ptr<EndpointI>;
+using TcpEndpointIPtr = ::std::shared_ptr<TcpEndpointI>;
+using UdpEndpointIPtr = ::std::shared_ptr<UdpEndpointI>;
+using WSEndpointPtr = ::std::shared_ptr<WSEndpoint>;
+using EndpointI_connectorsPtr = ::std::shared_ptr<EndpointI_connectors>;
+
+#else // C++98 mapping
+
 ICE_API IceUtil::Shared* upCast(EndpointI*);
 typedef Handle<EndpointI> EndpointIPtr;
 
-class TcpEndpointI;
 ICE_API IceUtil::Shared* upCast(TcpEndpointI*);
 typedef Handle<TcpEndpointI> TcpEndpointIPtr;
 
-class UdpEndpointI;
 ICE_API IceUtil::Shared* upCast(UdpEndpointI*);
 typedef Handle<UdpEndpointI> UdpEndpointIPtr;
 
-class WSEndpoint;
 ICE_API IceUtil::Shared* upCast(WSEndpoint*);
 typedef Handle<WSEndpoint> WSEndpointPtr;
 
-class EndpointI_connectors;
 ICE_API IceUtil::Shared* upCast(EndpointI_connectors*);
 typedef Handle<EndpointI_connectors> EndpointI_connectorsPtr;
 
+#endif
+
 }
 
 #endif