diff options
author | Bernard Normier <bernard@zeroc.com> | 2016-11-02 17:56:08 -0400 |
---|---|---|
committer | Bernard Normier <bernard@zeroc.com> | 2016-11-02 17:56:08 -0400 |
commit | 91fa99c34d1211d426b24bf68001fc27a87b3f00 (patch) | |
tree | 15af995f00414098b678b4cff09a9f0c29830fa8 /cpp/src/Ice/OutputStream.cpp | |
parent | Add C# code sign support (diff) | |
download | ice-91fa99c34d1211d426b24bf68001fc27a87b3f00.tar.bz2 ice-91fa99c34d1211d426b24bf68001fc27a87b3f00.tar.xz ice-91fa99c34d1211d426b24bf68001fc27a87b3f00.zip |
Replaced double and triple underscores in C++ by ice-prefixed names
Diffstat (limited to 'cpp/src/Ice/OutputStream.cpp')
-rw-r--r-- | cpp/src/Ice/OutputStream.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/Ice/OutputStream.cpp b/cpp/src/Ice/OutputStream.cpp index 4850b0f5474..7c7a2347664 100644 --- a/cpp/src/Ice/OutputStream.cpp +++ b/cpp/src/Ice/OutputStream.cpp @@ -800,7 +800,7 @@ Ice::OutputStream::write(const ObjectPrx& v) { if(v) { - v->__write(*this); + v->iceWrite(*this); } else { @@ -963,9 +963,9 @@ Ice::OutputStream::EncapsEncoder10::write(const UserException& v) // This allows reading the pending instances even if some part of // the exception was sliced. // - bool usesClasses = v.__usesClasses(); + bool usesClasses = v.iceUsesClasses(); _stream->write(usesClasses); - v.__write(_stream); + v.iceWrite(_stream); if(usesClasses) { writePendingValues(); @@ -1076,7 +1076,7 @@ Ice::OutputStream::EncapsEncoder10::writePendingValues() out << "unknown exception raised by ice_preMarshal"; } - p->first->__write(_stream); + p->first->iceWrite(_stream); } } _stream->writeSize(0); // Zero marker indicates end of sequence of sequences of instances. @@ -1151,7 +1151,7 @@ Ice::OutputStream::EncapsEncoder11::write(const ValuePtr& v) void Ice::OutputStream::EncapsEncoder11::write(const UserException& v) { - v.__write(_stream); + v.iceWrite(_stream); } void @@ -1395,5 +1395,5 @@ Ice::OutputStream::EncapsEncoder11::writeInstance(const ValuePtr& v) } _stream->writeSize(1); // Object instance marker. - v->__write(_stream); + v->iceWrite(_stream); } |