summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/SlicedData.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2016-01-12 16:16:25 +0100
committerJose <jose@zeroc.com>2016-01-12 16:16:25 +0100
commite7b69a69673093523ade275b02e866e2413e636b (patch)
tree9ec38f89bf0147135888081793fa00499ca97742 /cpp/src/Ice/SlicedData.cpp
parentC++11: Reduce code bloat from C++ proxy factory methods (diff)
downloadice-e7b69a69673093523ade275b02e866e2413e636b.tar.bz2
ice-e7b69a69673093523ade275b02e866e2413e636b.tar.xz
ice-e7b69a69673093523ade275b02e866e2413e636b.zip
C++11 minor improvements
Diffstat (limited to 'cpp/src/Ice/SlicedData.cpp')
-rw-r--r--cpp/src/Ice/SlicedData.cpp20
1 files changed, 9 insertions, 11 deletions
diff --git a/cpp/src/Ice/SlicedData.cpp b/cpp/src/Ice/SlicedData.cpp
index d721b1c6c91..d2e9b89d388 100644
--- a/cpp/src/Ice/SlicedData.cpp
+++ b/cpp/src/Ice/SlicedData.cpp
@@ -43,6 +43,15 @@ Ice::SlicedData::__gcVisitMembers(IceInternal::GCVisitor& visitor)
}
}
}
+
+void
+Ice::UnknownSlicedObject::__gcVisitMembers(IceInternal::GCVisitor& _v)
+{
+ if(_slicedData)
+ {
+ _slicedData->__gcVisitMembers(_v);
+ }
+}
#endif
Ice::UnknownSlicedObject::UnknownSlicedObject(const string& unknownTypeId) : _unknownTypeId(unknownTypeId)
@@ -61,17 +70,6 @@ Ice::UnknownSlicedObject::getSlicedData() const
return _slicedData;
}
-#ifndef ICE_CPP11_MAPPING
-void
-Ice::UnknownSlicedObject::__gcVisitMembers(IceInternal::GCVisitor& _v)
-{
- if(_slicedData)
- {
- _slicedData->__gcVisitMembers(_v);
- }
-}
-#endif
-
void
Ice::UnknownSlicedObject::__write(IceInternal::BasicStream* __os) const
{