1 files changed, 4 insertions, 12 deletions
diff --git a/cpp/include/Ice/BatchRequestInterceptor.h b/cpp/include/Ice/BatchRequestInterceptor.h
index 15afc8d66ff..bf8455412f1 100644
--- a/cpp/include/Ice/BatchRequestInterceptor.h
+++ b/cpp/include/Ice/BatchRequestInterceptor.h
@@ -11,11 +11,8 @@
 #define ICE_BATCH_REQUEST_INTERCEPTOR_H
 
 #include <IceUtil/Shared.h>
-
 #include <Ice/ProxyF.h>
-#ifdef ICE_CPP11
-#   include <functional>
-#endif
+#include <Ice/VirtualShared.h>
 
 namespace Ice
 {
@@ -31,21 +28,16 @@ public:
     virtual void enqueue() const = 0;
     virtual int getSize() const = 0;
     virtual const std::string& getOperation() const = 0;
-    virtual const Ice::ObjectPrx& getProxy() const = 0;
+    virtual const Ice::ObjectPrxPtr& getProxy() const = 0;
 };
 
-class BatchRequestInterceptor : public IceUtil::Shared
+class BatchRequestInterceptor : public ICE_SHARED
 {
 public:
 
     virtual void enqueue(const BatchRequest&, int, int) = 0;
 };
-typedef IceUtil::Handle<BatchRequestInterceptor> BatchRequestInterceptorPtr;
-
-#ifdef ICE_CPP11
-ICE_API BatchRequestInterceptorPtr
-newBatchRequestInterceptor(const ::std::function<void (const BatchRequest&, int, int)>&);
-#endif
+ICE_DEFINE_PTR(BatchRequestInterceptorPtr, BatchRequestInterceptor);
 
 };