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

This reverts commit 91fa99c34d1211d426b24bf68001fc27a87b3f00.

4 files changed, 36 insertions, 36 deletions

diff --git a/php/src/php5/Types.cpp b/php/src/php5/Types.cpp
index 89c8d04cd4b..1ba373c0dac 100644
--- a/php/src/php5/Types.cpp
+++ b/php/src/php5/Types.cpp
@@ -3009,7 +3009,7 @@ IcePHP::ObjectWriter::ice_preMarshal()
 }
 
 void
-IcePHP::ObjectWriter::iceWrite(Ice::OutputStream* os) const
+IcePHP::ObjectWriter::__write(Ice::OutputStream* os) const
 {
     Ice::SlicedDataPtr slicedData;
 
@@ -3045,7 +3045,7 @@ IcePHP::ObjectWriter::iceWrite(Ice::OutputStream* os) const
 }
 
 void
-IcePHP::ObjectWriter::iceRead(Ice::InputStream*)
+IcePHP::ObjectWriter::__read(Ice::InputStream*)
 {
     assert(false);
 }
@@ -3116,13 +3116,13 @@ IcePHP::ObjectReader::ice_postUnmarshal()
 }
 
 void
-IcePHP::ObjectReader::iceWrite(Ice::OutputStream*) const
+IcePHP::ObjectReader::__write(Ice::OutputStream*) const
 {
     assert(false);
 }
 
 void
-IcePHP::ObjectReader::iceRead(Ice::InputStream* is)
+IcePHP::ObjectReader::__read(Ice::InputStream* is)
 {
     is->startValue();
 
@@ -3478,13 +3478,13 @@ IcePHP::ExceptionReader::ice_throw() const
 }
 
 void
-IcePHP::ExceptionReader::iceWrite(Ice::OutputStream*) const
+IcePHP::ExceptionReader::__write(Ice::OutputStream*) const
 {
     assert(false);
 }
 
 void
-IcePHP::ExceptionReader::iceRead(Ice::InputStream* is)
+IcePHP::ExceptionReader::__read(Ice::InputStream* is)
 {
     is->startException();
 
@@ -3494,7 +3494,7 @@ IcePHP::ExceptionReader::iceRead(Ice::InputStream* is)
 }
 
 bool
-IcePHP::ExceptionReader::iceUsesClasses() const
+IcePHP::ExceptionReader::__usesClasses() const
 {
     return _info->usesClasses;
 }
diff --git a/php/src/php5/Types.h b/php/src/php5/Types.h
index 78eba26098a..3805f44c00d 100644
--- a/php/src/php5/Types.h
+++ b/php/src/php5/Types.h
@@ -540,8 +540,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:
 
@@ -567,8 +567,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;
 
@@ -601,9 +601,9 @@ public:
     virtual ExceptionReader* ice_clone() const;
     virtual void ice_throw() const;
 
-    virtual void iceWrite(Ice::OutputStream*) const;
-    virtual void iceRead(Ice::InputStream*);
-    virtual bool iceUsesClasses() const;
+    virtual void __write(Ice::OutputStream*) const;
+    virtual void __read(Ice::InputStream*);
+    virtual bool __usesClasses() const;
 
     ExceptionInfoPtr getInfo() const;
 
@@ -611,13 +611,13 @@ public:
 
     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:
 
diff --git a/php/src/php7/Types.cpp b/php/src/php7/Types.cpp
index df9d5205079..f42c754cbb1 100644
--- a/php/src/php7/Types.cpp
+++ b/php/src/php7/Types.cpp
@@ -2923,7 +2923,7 @@ IcePHP::ObjectWriter::ice_preMarshal()
 }
 
 void
-IcePHP::ObjectWriter::iceWrite(Ice::OutputStream* os) const
+IcePHP::ObjectWriter::__write(Ice::OutputStream* os) const
 {
     Ice::SlicedDataPtr slicedData;
 
@@ -2959,7 +2959,7 @@ IcePHP::ObjectWriter::iceWrite(Ice::OutputStream* os) const
 }
 
 void
-IcePHP::ObjectWriter::iceRead(Ice::InputStream*)
+IcePHP::ObjectWriter::__read(Ice::InputStream*)
 {
     assert(false);
 }
@@ -3032,13 +3032,13 @@ IcePHP::ObjectReader::ice_postUnmarshal()
 }
 
 void
-IcePHP::ObjectReader::iceWrite(Ice::OutputStream*) const
+IcePHP::ObjectReader::__write(Ice::OutputStream*) const
 {
     assert(false);
 }
 
 void
-IcePHP::ObjectReader::iceRead(Ice::InputStream* is)
+IcePHP::ObjectReader::__read(Ice::InputStream* is)
 {
     is->startValue();
 
@@ -3383,13 +3383,13 @@ IcePHP::ExceptionReader::ice_throw() const
 }
 
 void
-IcePHP::ExceptionReader::iceWrite(Ice::OutputStream*) const
+IcePHP::ExceptionReader::__write(Ice::OutputStream*) const
 {
     assert(false);
 }
 
 void
-IcePHP::ExceptionReader::iceRead(Ice::InputStream* is)
+IcePHP::ExceptionReader::__read(Ice::InputStream* is)
 {
     is->startException();
 
@@ -3399,7 +3399,7 @@ IcePHP::ExceptionReader::iceRead(Ice::InputStream* is)
 }
 
 bool
-IcePHP::ExceptionReader::iceUsesClasses() const
+IcePHP::ExceptionReader::__usesClasses() const
 {
     return _info->usesClasses;
 }
diff --git a/php/src/php7/Types.h b/php/src/php7/Types.h
index 2158c24c1e2..27556c48df7 100644
--- a/php/src/php7/Types.h
+++ b/php/src/php7/Types.h
@@ -537,8 +537,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:
 
@@ -561,8 +561,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;
 
@@ -592,9 +592,9 @@ public:
     virtual ExceptionReader* ice_clone() const;
     virtual void ice_throw() const;
 
-    virtual void iceWrite(Ice::OutputStream*) const;
-    virtual void iceRead(Ice::InputStream*);
-    virtual bool iceUsesClasses() const;
+    virtual void __write(Ice::OutputStream*) const;
+    virtual void __read(Ice::InputStream*);
+    virtual bool __usesClasses() const;
 
     ExceptionInfoPtr getInfo() const;
 
@@ -602,13 +602,13 @@ public:
 
     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: