diff options
author | Jose <jose@zeroc.com> | 2015-12-16 16:57:29 +0100 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2015-12-16 16:57:29 +0100 |
commit | d2d004c41cad5024cbffb7b3c312132b1c545b40 (patch) | |
tree | 6f617f5a12bec6a419d6ce248bb9e5002d23702a /cpp/test/Ice/slicing/exceptions/TestI.cpp | |
parent | PHP IceGridLib fixes (diff) | |
download | ice-d2d004c41cad5024cbffb7b3c312132b1c545b40.tar.bz2 ice-d2d004c41cad5024cbffb7b3c312132b1c545b40.tar.xz ice-d2d004c41cad5024cbffb7b3c312132b1c545b40.zip |
c++11 slicing/exceptions test updates
Diffstat (limited to 'cpp/test/Ice/slicing/exceptions/TestI.cpp')
-rw-r--r-- | cpp/test/Ice/slicing/exceptions/TestI.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/test/Ice/slicing/exceptions/TestI.cpp b/cpp/test/Ice/slicing/exceptions/TestI.cpp index 135e7702a65..e4744a61eff 100644 --- a/cpp/test/Ice/slicing/exceptions/TestI.cpp +++ b/cpp/test/Ice/slicing/exceptions/TestI.cpp @@ -171,14 +171,14 @@ TestI::knownPreservedAsKnownPreserved(const ::Ice::Current&) } void -TestI::relayKnownPreservedAsBase(const RelayPrx& r, const ::Ice::Current&) +TestI::relayKnownPreservedAsBase(ICE_IN(RelayPrxPtr) r, const ::Ice::Current&) { r->knownPreservedAsBase(); test(false); } void -TestI::relayKnownPreservedAsKnownPreserved(const RelayPrx& r, const ::Ice::Current&) +TestI::relayKnownPreservedAsKnownPreserved(ICE_IN(RelayPrxPtr) r, const ::Ice::Current&) { r->knownPreservedAsKnownPreserved(); test(false); @@ -191,7 +191,7 @@ TestI::unknownPreservedAsBase(const ::Ice::Current&) ex.b = "base"; ex.kp = "preserved"; ex.kpd = "derived"; - ex.p1 = new SPreservedClass("bc", "spc"); + ex.p1 = ICE_MAKE_SHARED(SPreservedClass, "bc", "spc"); ex.p2 = ex.p1; throw ex; } @@ -203,20 +203,20 @@ TestI::unknownPreservedAsKnownPreserved(const ::Ice::Current&) ex.b = "base"; ex.kp = "preserved"; ex.kpd = "derived"; - ex.p1 = new SPreservedClass("bc", "spc"); + ex.p1 = ICE_MAKE_SHARED(SPreservedClass, "bc", "spc"); ex.p2 = ex.p1; throw ex; } void -TestI::relayUnknownPreservedAsBase(const RelayPrx& r, const ::Ice::Current&) +TestI::relayUnknownPreservedAsBase(ICE_IN(RelayPrxPtr) r, const ::Ice::Current&) { r->unknownPreservedAsBase(); test(false); } void -TestI::relayUnknownPreservedAsKnownPreserved(const RelayPrx& r, const ::Ice::Current&) +TestI::relayUnknownPreservedAsKnownPreserved(ICE_IN(RelayPrxPtr) r, const ::Ice::Current&) { r->unknownPreservedAsKnownPreserved(); test(false); |