diff options
author | Bernard Normier <bernard@zeroc.com> | 2016-11-12 18:25:33 -0500 |
---|---|---|
committer | Bernard Normier <bernard@zeroc.com> | 2016-11-12 18:25:33 -0500 |
commit | 838539aff5bf3f37f4d9a6f33713824e98fa3db3 (patch) | |
tree | 57cac4a47a00697d6f0011d9aff8f76d6994f2ed /cpp/test/Ice/stream/Client.cpp | |
parent | MSBuild project updates (diff) | |
download | ice-838539aff5bf3f37f4d9a6f33713824e98fa3db3.tar.bz2 ice-838539aff5bf3f37f4d9a6f33713824e98fa3db3.tar.xz ice-838539aff5bf3f37f4d9a6f33713824e98fa3db3.zip |
Replaced non-public double underscores in C++
Diffstat (limited to 'cpp/test/Ice/stream/Client.cpp')
-rw-r--r-- | cpp/test/Ice/stream/Client.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/cpp/test/Ice/stream/Client.cpp b/cpp/test/Ice/stream/Client.cpp index 31ab757aa7f..eb3fb613280 100644 --- a/cpp/test/Ice/stream/Client.cpp +++ b/cpp/test/Ice/stream/Client.cpp @@ -32,13 +32,13 @@ public: called = false; } - virtual void __write(Ice::OutputStream* out) const + virtual void _iceWrite(Ice::OutputStream* out) const { - obj->__write(out); + obj->_iceWrite(out); const_cast<TestObjectWriter*>(this)->called = true; } - virtual void __read(Ice::InputStream*) + virtual void _iceRead(Ice::InputStream*) { assert(false); } @@ -61,15 +61,15 @@ public: called = false; } - virtual void __write(Ice::OutputStream*) const + virtual void _iceWrite(Ice::OutputStream*) const { assert(false); } - virtual void __read(Ice::InputStream* in) + virtual void _iceRead(Ice::InputStream* in) { obj = ICE_MAKE_SHARED(MyClass); - obj->__read(in); + obj->_iceRead(in); called = true; } @@ -78,29 +78,29 @@ public: }; ICE_DEFINE_PTR(TestObjectReaderPtr, TestObjectReader); -// Required for ValueHelper<>'s __readImpl and __writeIpml +// Required for ValueHelper<>'s _iceReadImpl and _iceWriteIpml #ifdef ICE_CPP11_MAPPING namespace Ice { template<class S> struct StreamWriter<TestObjectWriter, S> { - static void write(S* __os, const TestObjectWriter&) { assert(false); } + static void write(S* ostr, const TestObjectWriter&) { assert(false); } }; template<class S> struct StreamReader<TestObjectWriter, S> { - static void read(S* __is, TestObjectWriter&) { assert(false); } + static void read(S* istr, TestObjectWriter&) { assert(false); } }; template<class S> struct StreamWriter<TestObjectReader, S> { - static void write(S* __os, const TestObjectReader&) { assert(false); } + static void write(S* ostr, const TestObjectReader&) { assert(false); } }; template<class S> struct StreamReader<TestObjectReader, S> { - static void read(S* __is, TestObjectReader&) { assert(false); } + static void read(S* istr, TestObjectReader&) { assert(false); } }; } #endif |