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

3 files changed, 19 insertions, 19 deletions

diff --git a/ruby/src/IceRuby/Proxy.cpp b/ruby/src/IceRuby/Proxy.cpp
index 0029cad3378..f2221ae8d9d 100644
--- a/ruby/src/IceRuby/Proxy.cpp
+++ b/ruby/src/IceRuby/Proxy.cpp
@@ -77,7 +77,7 @@ IceRuby_ObjectPrx_hash(VALUE self)
     ICE_RUBY_TRY
     {
         Ice::ObjectPrx p = getProxy(self);
-        return INT2FIX(p->__hash());
+        return INT2FIX(p->iceHash());
     }
     ICE_RUBY_CATCH
     return Qnil;
diff --git a/ruby/src/IceRuby/Types.cpp b/ruby/src/IceRuby/Types.cpp
index d0577ddcf09..bde29633bad 100644
--- a/ruby/src/IceRuby/Types.cpp
+++ b/ruby/src/IceRuby/Types.cpp
@@ -2468,7 +2468,7 @@ IceRuby::ObjectWriter::ice_preMarshal()
 }
 
 void
-IceRuby::ObjectWriter::__write(Ice::OutputStream* os) const
+IceRuby::ObjectWriter::iceWrite(Ice::OutputStream* os) const
 {
     Ice::SlicedDataPtr slicedData;
 
@@ -2502,7 +2502,7 @@ IceRuby::ObjectWriter::__write(Ice::OutputStream* os) const
 }
 
 void
-IceRuby::ObjectWriter::__read(Ice::InputStream*)
+IceRuby::ObjectWriter::iceRead(Ice::InputStream*)
 {
     assert(false);
 }
@@ -2559,13 +2559,13 @@ IceRuby::ObjectReader::ice_postUnmarshal()
 }
 
 void
-IceRuby::ObjectReader::__write(Ice::OutputStream*) const
+IceRuby::ObjectReader::iceWrite(Ice::OutputStream*) const
 {
     assert(false);
 }
 
 void
-IceRuby::ObjectReader::__read(Ice::InputStream* is)
+IceRuby::ObjectReader::iceRead(Ice::InputStream* is)
 {
     is->startValue();
 
@@ -2855,13 +2855,13 @@ IceRuby::ExceptionReader::ice_throw() const
 }
 
 void
-IceRuby::ExceptionReader::__write(Ice::OutputStream*) const
+IceRuby::ExceptionReader::iceWrite(Ice::OutputStream*) const
 {
     assert(false);
 }
 
 void
-IceRuby::ExceptionReader::__read(Ice::InputStream* is)
+IceRuby::ExceptionReader::iceRead(Ice::InputStream* is)
 {
     is->startException();
 
@@ -2871,7 +2871,7 @@ IceRuby::ExceptionReader::__read(Ice::InputStream* is)
 }
 
 bool
-IceRuby::ExceptionReader::__usesClasses() const
+IceRuby::ExceptionReader::iceUsesClasses() const
 {
     return _info->usesClasses;
 }
diff --git a/ruby/src/IceRuby/Types.h b/ruby/src/IceRuby/Types.h
index 809b34aed0c..a0f6b9dee1d 100644
--- a/ruby/src/IceRuby/Types.h
+++ b/ruby/src/IceRuby/Types.h
@@ -492,8 +492,8 @@ public:
 
     virtual void ice_preMarshal();
 
-    virtual void __write(Ice::OutputStream*) const;
-    virtual void __read(Ice::InputStream*);
+    virtual void iceWrite(Ice::OutputStream*) const;
+    virtual void iceRead(Ice::InputStream*);
 
 private:
 
@@ -516,8 +516,8 @@ public:
 
     virtual void ice_postUnmarshal();
 
-    virtual void __write(Ice::OutputStream*) const;
-    virtual void __read(Ice::InputStream*);
+    virtual void iceWrite(Ice::OutputStream*) const;
+    virtual void iceRead(Ice::InputStream*);
 
     virtual ClassInfoPtr getInfo() const;
 
@@ -548,22 +548,22 @@ public:
 #endif
     virtual void ice_throw() const;
 
-    virtual void __write(Ice::OutputStream*) const;
-    virtual void __read(Ice::InputStream*);
+    virtual void iceWrite(Ice::OutputStream*) const;
+    virtual void iceRead(Ice::InputStream*);
 
-    virtual bool __usesClasses() const;
+    virtual bool iceUsesClasses() const;
 
     VALUE getException() const;
 
     Ice::SlicedDataPtr getSlicedData() const;
 
-    using Ice::UserException::__read;
-    using Ice::UserException::__write;
+    using Ice::UserException::iceRead;
+    using Ice::UserException::iceWrite;
 
 protected:
 
-    virtual void __writeImpl(Ice::OutputStream*) const {}
-    virtual void __readImpl(Ice::InputStream*) {}
+    virtual void iceWriteImpl(Ice::OutputStream*) const {}
+    virtual void iceReadImpl(Ice::InputStream*) {}
 
 private: