merging Protocol Buffers into master, updated for Ice 3.5

1 files changed, 24 insertions, 0 deletions

diff --git a/protobuf/demo/cpp/HelloI.h b/protobuf/demo/cpp/HelloI.h
new file mode 100644
index 00000000000..2a0809cbcdb
--- /dev/null
+++ b/protobuf/demo/cpp/HelloI.h
@@ -0,0 +1,24 @@
+// **********************************************************************
+//
+// 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.
+//
+// **********************************************************************
+
+#ifndef HELLO_I_H
+#define HELLO_I_H
+
+#include <Hello.h>
+
+class HelloI : public Demo::Hello
+{
+public:
+
+    virtual void sayHello(const tutorial::Person& p, const Ice::Current&);
+    virtual void shutdown(const Ice::Current&);
+};
+
+#endif