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

This reverts commit 91fa99c34d1211d426b24bf68001fc27a87b3f00.

4 files changed, 30 insertions, 30 deletions

diff --git a/python/modules/IcePy/Operation.cpp b/python/modules/IcePy/Operation.cpp
index d20d7408447..c8dad9a0c96 100644
--- a/python/modules/IcePy/Operation.cpp
+++ b/python/modules/IcePy/Operation.cpp
@@ -2114,7 +2114,7 @@ IcePy::AsyncTypedInvocation::end(const Ice::ObjectPrx& proxy, const OperationPtr
 
         {
             AllowThreads allowThreads; // Release Python's global interpreter lock during blocking operations.
-            ok = proxy->iceI_end_ice_invoke(results, r);
+            ok = proxy->___end_ice_invoke(results, r);
         }
 
         if(ok)
@@ -2803,7 +2803,7 @@ IcePy::AsyncBlobjectInvocation::end(const Ice::ObjectPrx& proxy, const Ice::Asyn
 
         {
             AllowThreads allowThreads; // Release Python's global interpreter lock during blocking operations.
-            ok = proxy->iceI_end_ice_invoke(results, r);
+            ok = proxy->___end_ice_invoke(results, r);
         }
 
         //
@@ -4142,7 +4142,7 @@ IcePy::TypedServantWrapper::ice_invoke_async(const Ice::AMD_Object_ice_invokePtr
         //
         if(!op->pseudoOp)
         {
-            iceCheckMode(op->mode, current.mode);
+            __checkMode(op->mode, current.mode);
         }
 
         UpcallPtr up = new TypedUpcall(op, cb, current.adapter->getCommunicator());
diff --git a/python/modules/IcePy/Proxy.cpp b/python/modules/IcePy/Proxy.cpp
index b02106e5f68..d9b2704b2a8 100644
--- a/python/modules/IcePy/Proxy.cpp
+++ b/python/modules/IcePy/Proxy.cpp
@@ -164,7 +164,7 @@ extern "C"
 static long
 proxyHash(ProxyObject* self)
 {
-    return static_cast<long>((*self->proxy)->iceHash());
+    return static_cast<long>((*self->proxy)->__hash());
 }
 
 #ifdef WIN32
diff --git a/python/modules/IcePy/Types.cpp b/python/modules/IcePy/Types.cpp
index 2c2b55eeb25..59be1eb8ab5 100644
--- a/python/modules/IcePy/Types.cpp
+++ b/python/modules/IcePy/Types.cpp
@@ -3232,7 +3232,7 @@ IcePy::ObjectWriter::ice_preMarshal()
 }
 
 void
-IcePy::ObjectWriter::iceWrite(Ice::OutputStream* os) const
+IcePy::ObjectWriter::__write(Ice::OutputStream* os) const
 {
     Ice::SlicedDataPtr slicedData;
 
@@ -3266,7 +3266,7 @@ IcePy::ObjectWriter::iceWrite(Ice::OutputStream* os) const
 }
 
 void
-IcePy::ObjectWriter::iceRead(Ice::InputStream*)
+IcePy::ObjectWriter::__read(Ice::InputStream*)
 {
     assert(false);
 }
@@ -3341,13 +3341,13 @@ IcePy::ObjectReader::ice_postUnmarshal()
 }
 
 void
-IcePy::ObjectReader::iceWrite(Ice::OutputStream*) const
+IcePy::ObjectReader::__write(Ice::OutputStream*) const
 {
     assert(false);
 }
 
 void
-IcePy::ObjectReader::iceRead(Ice::InputStream* is)
+IcePy::ObjectReader::__read(Ice::InputStream* is)
 {
     is->startValue();
 
@@ -3735,7 +3735,7 @@ IcePy::ExceptionWriter::ice_throw() const
 }
 
 void
-IcePy::ExceptionWriter::iceWrite(Ice::OutputStream* os) const
+IcePy::ExceptionWriter::__write(Ice::OutputStream* os) const
 {
     AdoptThread adoptThread; // Ensure the current thread is able to call into Python.
 
@@ -3743,12 +3743,12 @@ IcePy::ExceptionWriter::iceWrite(Ice::OutputStream* os) const
 }
 
 void
-IcePy::ExceptionWriter::iceRead(Ice::InputStream*)
+IcePy::ExceptionWriter::__read(Ice::InputStream*)
 {
 }
 
 bool
-IcePy::ExceptionWriter::iceUsesClasses() const
+IcePy::ExceptionWriter::__usesClasses() const
 {
     return _info->usesClasses;
 }
@@ -3790,13 +3790,13 @@ IcePy::ExceptionReader::ice_throw() const
 }
 
 void
-IcePy::ExceptionReader::iceWrite(Ice::OutputStream*) const
+IcePy::ExceptionReader::__write(Ice::OutputStream*) const
 {
     assert(false);
 }
 
 void
-IcePy::ExceptionReader::iceRead(Ice::InputStream* is)
+IcePy::ExceptionReader::__read(Ice::InputStream* is)
 {
     AdoptThread adoptThread; // Ensure the current thread is able to call into Python.
 
@@ -3808,7 +3808,7 @@ IcePy::ExceptionReader::iceRead(Ice::InputStream* is)
 }
 
 bool
-IcePy::ExceptionReader::iceUsesClasses() const
+IcePy::ExceptionReader::__usesClasses() const
 {
     return _info->usesClasses;
 }
diff --git a/python/modules/IcePy/Types.h b/python/modules/IcePy/Types.h
index 07b8c6585a0..921047496b9 100644
--- a/python/modules/IcePy/Types.h
+++ b/python/modules/IcePy/Types.h
@@ -554,8 +554,8 @@ public:
 
     virtual void ice_preMarshal();
 
-    virtual void iceWrite(Ice::OutputStream*) const;
-    virtual void iceRead(Ice::InputStream*);
+    virtual void __write(Ice::OutputStream*) const;
+    virtual void __read(Ice::InputStream*);
 
 private:
 
@@ -578,8 +578,8 @@ public:
 
     virtual void ice_postUnmarshal();
 
-    virtual void iceWrite(Ice::OutputStream*) const;
-    virtual void iceRead(Ice::InputStream*);
+    virtual void __write(Ice::OutputStream*) const;
+    virtual void __read(Ice::InputStream*);
 
     virtual ClassInfoPtr getInfo() const;
 
@@ -610,15 +610,15 @@ public:
 #endif
     virtual void ice_throw() const;
 
-    virtual void iceWrite(Ice::OutputStream*) const;
-    virtual void iceRead(Ice::InputStream*);
+    virtual void __write(Ice::OutputStream*) const;
+    virtual void __read(Ice::InputStream*);
 
-    virtual bool iceUsesClasses() const;
+    virtual bool __usesClasses() const;
 
 protected:
 
-    virtual void iceWriteImpl(Ice::OutputStream*) const {}
-    virtual void iceReadImpl(Ice::InputStream*) {}
+    virtual void __writeImpl(Ice::OutputStream*) const {}
+    virtual void __readImpl(Ice::InputStream*) {}
 
 private:
 
@@ -643,22 +643,22 @@ public:
 #endif
     virtual void ice_throw() const;
 
-    virtual void iceWrite(Ice::OutputStream*) const;
-    virtual void iceRead(Ice::InputStream*);
+    virtual void __write(Ice::OutputStream*) const;
+    virtual void __read(Ice::InputStream*);
 
-    virtual bool iceUsesClasses() const;
+    virtual bool __usesClasses() const;
 
     PyObject* getException() const; // Borrowed reference.
 
     Ice::SlicedDataPtr getSlicedData() const;
 
-    using Ice::UserException::iceRead;
-    using Ice::UserException::iceWrite;
+    using Ice::UserException::__read;
+    using Ice::UserException::__write;
 
 protected:
 
-    virtual void iceWriteImpl(Ice::OutputStream*) const {}
-    virtual void iceReadImpl(Ice::InputStream*) {}
+    virtual void __writeImpl(Ice::OutputStream*) const {}
+    virtual void __readImpl(Ice::InputStream*) {}
 
 private: