1 files changed, 7 insertions, 3 deletions
diff --git a/cpp/src/Ice/ResponseHandler.h b/cpp/src/Ice/ResponseHandler.h
index 23ed39fd70d..0838953bc41 100644
--- a/cpp/src/Ice/ResponseHandler.h
+++ b/cpp/src/Ice/ResponseHandler.h
@@ -16,18 +16,22 @@
 #include <Ice/Config.h>
 #include <Ice/LocalException.h>
 #include <Ice/ResponseHandlerF.h>
+#include <Ice/VirtualShared.h>
 
 namespace IceInternal
 {
 
 class BasicStream;
 
-class ResponseHandler : virtual public ::IceUtil::Shared
+class ResponseHandler :
+#ifdef ICE_CPP11_MAPPING
+    public virtual VirtualShared
+#else
+    public virtual ::IceUtil::Shared
+#endif
 {
 public:
 
-    virtual ~ResponseHandler();
-
     virtual void sendResponse(Ice::Int, BasicStream*, Ice::Byte, bool) = 0;
     virtual void sendNoResponse() = 0;
     virtual bool systemException(Ice::Int, const Ice::SystemException&, bool) = 0;