2 files changed, 28 insertions, 26 deletions
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>