merging javascript branch

1 files changed, 34 insertions, 0 deletions

diff --git a/cpp/test/Ice/echo/BlobjectI.h b/cpp/test/Ice/echo/BlobjectI.h
new file mode 100644
index 00000000000..ae99c5e5fb9
--- /dev/null
+++ b/cpp/test/Ice/echo/BlobjectI.h
@@ -0,0 +1,34 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef BLOBJECT_H
+#define BLOBJECT_H
+
+#include <Ice/Object.h>
+
+class BlobjectI : public Ice::BlobjectAsync
+{
+public:
+
+    BlobjectI();
+
+    void startBatch();
+    void flushBatch();
+
+    virtual void ice_invoke_async(const Ice::AMD_Object_ice_invokePtr&, const std::vector<Ice::Byte>&,
+                                  const Ice::Current&);
+
+private:
+
+    bool _startBatch;
+    Ice::ObjectPrx _batchProxy;
+};
+typedef IceUtil::Handle<BlobjectI> BlobjectIPtr;
+
+#endif