diff options
| author | Jose <jose@zeroc.com> | 2015-12-01 17:36:19 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2015-12-01 17:36:19 +0100 |
| commit | 2029ff368e49fae489b8ec8fc12f7d126b182dfb (patch) | |
| tree | 6075d652b7851831c39e6f22004d8720864f1a60 /cpp/src/Ice/SlicedData.cpp | |
| parent | The default LMDB map size for IceGrid and IceStorm is now 10MB (Windows) (diff) | |
| download | ice-2029ff368e49fae489b8ec8fc12f7d126b182dfb.tar.bz2 ice-2029ff368e49fae489b8ec8fc12f7d126b182dfb.tar.xz ice-2029ff368e49fae489b8ec8fc12f7d126b182dfb.zip | |
C++11 mapping initial commit
Diffstat (limited to 'cpp/src/Ice/SlicedData.cpp')
| -rw-r--r-- | cpp/src/Ice/SlicedData.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/cpp/src/Ice/SlicedData.cpp b/cpp/src/Ice/SlicedData.cpp index b47da253e7f..d721b1c6c91 100644 --- a/cpp/src/Ice/SlicedData.cpp +++ b/cpp/src/Ice/SlicedData.cpp @@ -13,15 +13,19 @@ using namespace std; using namespace Ice; +#ifndef ICE_CPP11_MAPPING IceUtil::Shared* Ice::upCast(SliceInfo* p) { return p; } IceUtil::Shared* Ice::upCast(SlicedData* p) { return p; } IceUtil::Shared* Ice::upCast(UnknownSlicedObject* p) { return p; } +#endif Ice::SlicedData::SlicedData(const SliceInfoSeq& seq) : slices(seq) { } + +#ifndef ICE_CPP11_MAPPING void Ice::SlicedData::__gcVisitMembers(IceInternal::GCVisitor& visitor) { @@ -39,6 +43,7 @@ Ice::SlicedData::__gcVisitMembers(IceInternal::GCVisitor& visitor) } } } +#endif Ice::UnknownSlicedObject::UnknownSlicedObject(const string& unknownTypeId) : _unknownTypeId(unknownTypeId) { @@ -56,6 +61,7 @@ Ice::UnknownSlicedObject::getSlicedData() const return _slicedData; } +#ifndef ICE_CPP11_MAPPING void Ice::UnknownSlicedObject::__gcVisitMembers(IceInternal::GCVisitor& _v) { @@ -64,6 +70,7 @@ Ice::UnknownSlicedObject::__gcVisitMembers(IceInternal::GCVisitor& _v) _slicedData->__gcVisitMembers(_v); } } +#endif void Ice::UnknownSlicedObject::__write(IceInternal::BasicStream* __os) const |