Fixed ICE-8223 - renamed cloneImpl to _iceCloneImpl

5 files changed, 41 insertions, 39 deletions

diff --git a/cpp/include/Ice/Object.h b/cpp/include/Ice/Object.h
index f506d9c6e7c..b2320d76f0b 100644
--- a/cpp/include/Ice/Object.h
+++ b/cpp/include/Ice/Object.h
@@ -23,7 +23,7 @@ namespace Ice
 {
 
 class OutputStream;
-class InpputStream;
+class InputStream;
 
 }
 
diff --git a/cpp/include/Ice/SlicedData.h b/cpp/include/Ice/SlicedData.h
index a97b385200e..bd3761840d9 100644
--- a/cpp/include/Ice/SlicedData.h
+++ b/cpp/include/Ice/SlicedData.h
@@ -102,22 +102,23 @@ public:
     const std::string& getUnknownTypeId() const;
 
 #ifdef ICE_CPP11_MAPPING
-    virtual void _iceWrite(::Ice::OutputStream*) const override;
-    virtual void _iceRead(::Ice::InputStream*) override;
     virtual SlicedDataPtr ice_getSlicedData() const override;
 
     virtual std::string ice_id() const override;
     std::shared_ptr<UnknownSlicedValue> ice_clone() const;
 
+    virtual void _iceWrite(::Ice::OutputStream*) const override;
+    virtual void _iceRead(::Ice::InputStream*) override;
+
 protected:
 
-    virtual std::shared_ptr<Value> cloneImpl() const override;
+    virtual std::shared_ptr<Value> _iceCloneImpl() const override;
 #else
-    virtual void _iceGcVisitMembers(IceInternal::GCVisitor&);
+    virtual SlicedDataPtr ice_getSlicedData() const;
 
+    virtual void _iceGcVisitMembers(IceInternal::GCVisitor&);
     virtual void _iceWrite(::Ice::OutputStream*) const;
     virtual void _iceRead(::Ice::InputStream*);
-    virtual SlicedDataPtr ice_getSlicedData() const;
 #endif
 
 private:
diff --git a/cpp/include/Ice/Value.h b/cpp/include/Ice/Value.h
index d2dcf22052e..f4702620d3c 100644
--- a/cpp/include/Ice/Value.h
+++ b/cpp/include/Ice/Value.h
@@ -39,9 +39,6 @@ public:
     virtual void ice_preMarshal();
     virtual void ice_postUnmarshal();
 
-    virtual void _iceWrite(Ice::OutputStream*) const;
-    virtual void _iceRead(Ice::InputStream*);
-
     virtual std::string ice_id() const;
     static const std::string& ice_staticId();
 
@@ -49,10 +46,12 @@ public:
 
     virtual std::shared_ptr<SlicedData> ice_getSlicedData() const;
 
-protected:
+    virtual void _iceWrite(Ice::OutputStream*) const;
+    virtual void _iceRead(Ice::InputStream*);
 
-    virtual std::shared_ptr<Value> cloneImpl() const = 0;
+protected:
 
+    virtual std::shared_ptr<Value> _iceCloneImpl() const = 0;
     virtual void _iceWriteImpl(Ice::OutputStream*) const {}
     virtual void _iceReadImpl(Ice::InputStream*) {}
 };
@@ -67,7 +66,7 @@ public:
 
     std::shared_ptr<T> ice_clone() const
     {
-        return std::static_pointer_cast<T>(cloneImpl());
+        return std::static_pointer_cast<T>(_iceCloneImpl());
     }
 
     virtual std::string ice_id() const override
@@ -77,7 +76,7 @@ public:
 
 protected:
 
-    virtual std::shared_ptr<Value> cloneImpl() const override
+    virtual std::shared_ptr<Value> _iceCloneImpl() const override
     {
         return std::make_shared<T>(static_cast<const T&>(*this));
     }
diff --git a/cpp/src/Ice/SlicedData.cpp b/cpp/src/Ice/SlicedData.cpp
index e9519d73d7d..56b10f6aba1 100644
--- a/cpp/src/Ice/SlicedData.cpp
+++ b/cpp/src/Ice/SlicedData.cpp
@@ -66,15 +66,6 @@ Ice::SlicedData::_iceGcVisitMembers(IceInternal::GCVisitor& visitor)
         }
     }
 }
-
-void
-Ice::UnknownSlicedValue::_iceGcVisitMembers(IceInternal::GCVisitor& _v)
-{
-    if(_slicedData)
-    {
-        _slicedData->_iceGcVisitMembers(_v);
-    }
-}
 #endif
 
 Ice::UnknownSlicedValue::UnknownSlicedValue(const string& unknownTypeId) : _unknownTypeId(unknownTypeId)
@@ -87,20 +78,6 @@ Ice::UnknownSlicedValue::getUnknownTypeId() const
     return _unknownTypeId;
 }
 
-void
-Ice::UnknownSlicedValue::_iceWrite(Ice::OutputStream* ostr) const
-{
-    ostr->startValue(_slicedData);
-    ostr->endValue();
-}
-
-void
-Ice::UnknownSlicedValue::_iceRead(Ice::InputStream* istr)
-{
-    istr->startValue();
-    _slicedData = istr->endValue(true);
-}
-
 SlicedDataPtr
 Ice::UnknownSlicedValue::ice_getSlicedData() const
 {
@@ -118,13 +95,38 @@ Ice::UnknownSlicedValue::ice_id() const
 shared_ptr<Ice::UnknownSlicedValue>
 Ice::UnknownSlicedValue::ice_clone() const
 {
-    return static_pointer_cast<UnknownSlicedValue>(cloneImpl());
+    return static_pointer_cast<UnknownSlicedValue>(_iceCloneImpl());
 }
 
 shared_ptr<Ice::Value>
-Ice::UnknownSlicedValue::cloneImpl() const
+Ice::UnknownSlicedValue::_iceCloneImpl() const
 {
     return make_shared<UnknownSlicedValue>(static_cast<const UnknownSlicedValue&>(*this));
 }
 
+#else
+
+void
+Ice::UnknownSlicedValue::_iceGcVisitMembers(IceInternal::GCVisitor& _v)
+{
+    if(_slicedData)
+    {
+        _slicedData->_iceGcVisitMembers(_v);
+    }
+}
+
 #endif
+
+void
+Ice::UnknownSlicedValue::_iceWrite(Ice::OutputStream* ostr) const
+{
+    ostr->startValue(_slicedData);
+    ostr->endValue();
+}
+
+void
+Ice::UnknownSlicedValue::_iceRead(Ice::InputStream* istr)
+{
+    istr->startValue();
+    _slicedData = istr->endValue(true);
+}
diff --git a/cpp/src/Ice/Value.cpp b/cpp/src/Ice/Value.cpp
index 9b0a4ee5900..5014b83fc2d 100644
--- a/cpp/src/Ice/Value.cpp
+++ b/cpp/src/Ice/Value.cpp
@@ -69,7 +69,7 @@ Ice::Value::ice_staticId()
 shared_ptr<Value>
 Ice::Value::ice_clone() const
 {
-    return cloneImpl();
+    return _iceCloneImpl();
 }
 
 shared_ptr<SlicedData>