merging Protocol Buffers into master, updated for Ice 3.5

1 files changed, 34 insertions, 0 deletions

diff --git a/protobuf/test/cpp/TestI.cpp b/protobuf/test/cpp/TestI.cpp
new file mode 100644
index 00000000000..d51e54ed46b
--- /dev/null
+++ b/protobuf/test/cpp/TestI.cpp
@@ -0,0 +1,34 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice Protobuf is licensed to you under the terms
+// described in the ICE_PROTOBUF_LICENSE file included in this
+// distribution.
+//
+// **********************************************************************
+
+#include <TestI.h>
+#include <Ice/Ice.h>
+
+using namespace std;
+using namespace Ice;
+
+test::Message
+MyClassI::opMessage(const test::Message& i, test::Message& o, const Ice::Current&)
+{
+    o = i;
+    return i;
+}
+
+void
+MyClassI::opMessageAMD_async(const Test::AMD_MyClass_opMessageAMDPtr& cb, const test::Message& i, const Ice::Current&)
+{
+    cb->ice_response(i, i);
+}
+
+void
+MyClassI::shutdown(const Ice::Current& current)
+{
+    current.adapter->getCommunicator()->shutdown();
+}