Revert "Replaced double and triple underscores in C++ by ice-prefixed names"

This reverts commit 91fa99c34d1211d426b24bf68001fc27a87b3f00.

1 files changed, 6 insertions, 6 deletions

diff --git a/cpp/src/Ice/OutputStream.cpp b/cpp/src/Ice/OutputStream.cpp
index 7c7a2347664..4850b0f5474 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->iceWrite(*this);
+        v->__write(*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.iceUsesClasses();
+    bool usesClasses = v.__usesClasses();
     _stream->write(usesClasses);
-    v.iceWrite(_stream);
+    v.__write(_stream);
     if(usesClasses)
     {
         writePendingValues();
@@ -1076,7 +1076,7 @@ Ice::OutputStream::EncapsEncoder10::writePendingValues()
                 out << "unknown exception raised by ice_preMarshal";
             }
 
-            p->first->iceWrite(_stream);
+            p->first->__write(_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.iceWrite(_stream);
+    v.__write(_stream);
 }
 
 void
@@ -1395,5 +1395,5 @@ Ice::OutputStream::EncapsEncoder11::writeInstance(const ValuePtr& v)
     }
 
     _stream->writeSize(1); // Object instance marker.
-    v->iceWrite(_stream);
+    v->__write(_stream);
 }