diff options
Diffstat (limited to 'cpp/include/Ice/SlicedDataF.h')
-rw-r--r-- | cpp/include/Ice/SlicedDataF.h | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/cpp/include/Ice/SlicedDataF.h b/cpp/include/Ice/SlicedDataF.h index d72444347c1..dd2d1f71277 100644 --- a/cpp/include/Ice/SlicedDataF.h +++ b/cpp/include/Ice/SlicedDataF.h @@ -17,17 +17,25 @@ namespace Ice { struct SliceInfo; +class SlicedData; +class UnknownSlicedObject; + +#ifdef ICE_CPP11_MAPPING +typedef ::std::shared_ptr<SliceInfo> SliceInfoPtr; +typedef ::std::shared_ptr<SlicedData> SlicedDataPtr; +typedef ::std::shared_ptr<UnknownSlicedObject> UnknownSlicedObjectPtr; +#else ICE_API IceUtil::Shared* upCast(SliceInfo*); typedef IceInternal::Handle<SliceInfo> SliceInfoPtr; -typedef ::std::vector<SliceInfoPtr> SliceInfoSeq; -class SlicedData; ICE_API IceUtil::Shared* upCast(SlicedData*); typedef IceInternal::Handle<SlicedData> SlicedDataPtr; -class UnknownSlicedObject; ICE_API IceUtil::Shared* upCast(UnknownSlicedObject*); typedef IceInternal::Handle<UnknownSlicedObject> UnknownSlicedObjectPtr; +#endif + +typedef ::std::vector<SliceInfoPtr> SliceInfoSeq; } |