summaryrefslogtreecommitdiff
path: root/cpp/test/Ice/stream/Client.cpp
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2016-06-08 18:25:54 -0400
committerJoe George <joe@zeroc.com>2016-06-08 18:35:13 -0400
commite7c350a9333560cba1c7bb4b9faa3be4e3c13bed (patch)
treef724f37a0f6285d5c34f5b3519baf00900862a05 /cpp/test/Ice/stream/Client.cpp
parentICE-6982 and ICE-6946 (diff)
downloadice-e7c350a9333560cba1c7bb4b9faa3be4e3c13bed.tar.bz2
ice-e7c350a9333560cba1c7bb4b9faa3be4e3c13bed.tar.xz
ice-e7c350a9333560cba1c7bb4b9faa3be4e3c13bed.zip
Fix for ICE-ICE-6982 optional data members
Diffstat (limited to 'cpp/test/Ice/stream/Client.cpp')
-rw-r--r--cpp/test/Ice/stream/Client.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/cpp/test/Ice/stream/Client.cpp b/cpp/test/Ice/stream/Client.cpp
index eb73673e0bf..cc346e6738d 100644
--- a/cpp/test/Ice/stream/Client.cpp
+++ b/cpp/test/Ice/stream/Client.cpp
@@ -80,26 +80,29 @@ ICE_DEFINE_PTR(TestObjectReaderPtr, TestObjectReader);
// Required for ValueHelper<>'s __readImpl and __writeIpml
#ifdef ICE_CPP11_MAPPING
+namespace Ice
+{
template<class S>
-struct Ice::StreamWriter<TestObjectWriter, S>
+struct StreamWriter<TestObjectWriter, S>
{
static void write(S* __os, const TestObjectWriter&) { assert(false); }
};
template<class S>
-struct Ice::StreamReader<TestObjectWriter, S>
+struct StreamReader<TestObjectWriter, S>
{
static void read(S* __is, TestObjectWriter&) { assert(false); }
};
template<class S>
-struct Ice::StreamWriter<TestObjectReader, S>
+struct StreamWriter<TestObjectReader, S>
{
static void write(S* __os, const TestObjectReader&) { assert(false); }
};
template<class S>
-struct Ice::StreamReader<TestObjectReader, S>
+struct StreamReader<TestObjectReader, S>
{
static void read(S* __is, TestObjectReader&) { assert(false); }
};
+}
#endif
#ifndef ICE_CPP11_MAPPING