diff options
Diffstat (limited to 'cpp/test/Ice/inheritance')
| -rwxr-xr-x | cpp/test/Ice/inheritance/.depend.mak | 41 | ||||
| -rw-r--r-- | cpp/test/Ice/inheritance/AllTests.cpp | 435 | ||||
| -rw-r--r-- | cpp/test/Ice/inheritance/Client.cpp | 4 | ||||
| -rw-r--r-- | cpp/test/Ice/inheritance/Collocated.cpp | 4 | ||||
| -rw-r--r-- | cpp/test/Ice/inheritance/Server.cpp | 2 | ||||
| -rw-r--r-- | cpp/test/Ice/inheritance/TestI.cpp | 64 | ||||
| -rw-r--r-- | cpp/test/Ice/inheritance/TestI.h | 91 |
7 files changed, 528 insertions, 113 deletions
diff --git a/cpp/test/Ice/inheritance/.depend.mak b/cpp/test/Ice/inheritance/.depend.mak index d142abc4ef8..640ed696dcf 100755 --- a/cpp/test/Ice/inheritance/.depend.mak +++ b/cpp/test/Ice/inheritance/.depend.mak @@ -16,6 +16,7 @@ Test.obj: \ "$(includedir)\IceUtil\Exception.h" \ "$(includedir)\Ice\ObjectF.h" \ "$(includedir)\Ice\Handle.h" \ + "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ "$(includedir)\Ice\StreamF.h" \ @@ -24,6 +25,7 @@ Test.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -58,7 +60,7 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -67,13 +69,13 @@ Test.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Outgoing.h" \ @@ -98,6 +100,7 @@ Client.obj: \ "$(includedir)\IceUtil\Exception.h" \ "$(includedir)\Ice\ObjectF.h" \ "$(includedir)\Ice\Handle.h" \ + "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ "$(includedir)\Ice\StreamF.h" \ @@ -106,6 +109,7 @@ Client.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ @@ -146,7 +150,7 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -160,6 +164,7 @@ Client.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -171,7 +176,6 @@ Client.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -194,7 +198,6 @@ Client.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -226,6 +229,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\Exception.h" \ "$(includedir)\Ice\ObjectF.h" \ "$(includedir)\Ice\Handle.h" \ + "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ "$(includedir)\Ice\StreamF.h" \ @@ -234,6 +238,7 @@ AllTests.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ @@ -274,7 +279,7 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -288,6 +293,7 @@ AllTests.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -299,7 +305,6 @@ AllTests.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -322,7 +327,6 @@ AllTests.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -354,6 +358,7 @@ TestI.obj: \ "$(includedir)\IceUtil\Exception.h" \ "$(includedir)\Ice\ObjectF.h" \ "$(includedir)\Ice\Handle.h" \ + "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ "$(includedir)\Ice\StreamF.h" \ @@ -362,6 +367,7 @@ TestI.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ @@ -402,7 +408,7 @@ TestI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -416,6 +422,7 @@ TestI.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -427,7 +434,6 @@ TestI.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -450,7 +456,6 @@ TestI.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -478,6 +483,7 @@ Server.obj: \ "$(includedir)\IceUtil\Exception.h" \ "$(includedir)\Ice\ObjectF.h" \ "$(includedir)\Ice\Handle.h" \ + "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ "$(includedir)\Ice\StreamF.h" \ @@ -486,6 +492,7 @@ Server.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ @@ -526,7 +533,7 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -540,6 +547,7 @@ Server.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -551,7 +559,6 @@ Server.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -574,7 +581,6 @@ Server.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ @@ -607,6 +613,7 @@ Collocated.obj: \ "$(includedir)\IceUtil\Exception.h" \ "$(includedir)\Ice\ObjectF.h" \ "$(includedir)\Ice\Handle.h" \ + "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ "$(includedir)\Ice\StreamF.h" \ @@ -615,6 +622,7 @@ Collocated.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ @@ -655,7 +663,7 @@ Collocated.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ @@ -669,6 +677,7 @@ Collocated.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -680,7 +689,6 @@ Collocated.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ @@ -703,7 +711,6 @@ Collocated.obj: \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ diff --git a/cpp/test/Ice/inheritance/AllTests.cpp b/cpp/test/Ice/inheritance/AllTests.cpp index 31a7613abeb..dd316ac08c8 100644 --- a/cpp/test/Ice/inheritance/AllTests.cpp +++ b/cpp/test/Ice/inheritance/AllTests.cpp @@ -14,227 +14,576 @@ using namespace std; using namespace Test; -InitialPrx +InitialPrxPtr allTests(const Ice::CommunicatorPtr& communicator) { cout << "testing stringToProxy... " << flush; string ref = "initial:default -p 12010"; - Ice::ObjectPrx base = communicator->stringToProxy(ref); + Ice::ObjectPrxPtr base = communicator->stringToProxy(ref); test(base); cout << "ok" << endl; cout << "testing checked cast... " << flush; - InitialPrx initial = InitialPrx::checkedCast(base); + InitialPrxPtr initial = ICE_CHECKED_CAST(InitialPrx, base); test(initial); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(initial, base)); +#else test(initial == base); +#endif cout << "ok" << endl; cout << "getting proxies for class hierarchy... " << flush; - MA::CAPrx ca = initial->caop(); - MB::CBPrx cb = initial->cbop(); - MA::CCPrx cc = initial->ccop(); - MA::CDPrx cd = initial->cdop(); + MA::CAPrxPtr ca = initial->caop(); + MB::CBPrxPtr cb = initial->cbop(); + MA::CCPrxPtr cc = initial->ccop(); + MA::CDPrxPtr cd = initial->cdop(); +#ifdef ICE_CPP11_MAPPING + test(!Ice::targetEquals(ca, cb)); + test(!Ice::targetEquals(ca, cc)); + test(!Ice::targetEquals(ca, cd)); + test(!Ice::targetEquals(cb, cc)); + test(!Ice::targetEquals(cb, cd)); + test(!Ice::targetEquals(cc, cd)); +#else test(ca != cb); test(ca != cc); test(ca != cd); test(cb != cc); test(cb != cd); test(cc != cd); +#endif cout << "ok" << endl; cout << "getting proxies for interface hierarchy... " << flush; - MA::IAPrx ia = initial->iaop(); - MB::IB1Prx ib1 = initial->ib1op(); - MB::IB2Prx ib2 = initial->ib2op(); - MA::ICPrx ic = initial->icop(); + MA::IAPrxPtr ia = initial->iaop(); + MB::IB1PrxPtr ib1 = initial->ib1op(); + MB::IB2PrxPtr ib2 = initial->ib2op(); + MA::ICPrxPtr ic = initial->icop(); +#ifdef ICE_CPP11_MAPPING + test(!Ice::targetEquals(ia, ib1)); + test(!Ice::targetEquals(ia, ib2)); + test(!Ice::targetEquals(ia, ic)); + test(!Ice::targetEquals(ib1, ic)); + test(!Ice::targetEquals(ib2, ic)); +#else test(ia != ib1); test(ia != ib2); test(ia != ic); test(ib1 != ic); test(ib2 != ic); +#endif cout << "ok" << endl; cout << "invoking proxy operations on class hierarchy... " << flush; - MA::CAPrx cao; - MB::CBPrx cbo; - MA::CCPrx cco; + MA::CAPrxPtr cao; + MB::CBPrxPtr cbo; + MA::CCPrxPtr cco; cao = ca->caop(ca); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(cao, ca)); +#else test(cao == ca); +#endif + cao = ca->caop(cb); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(cao, cb)); +#else test(cao == cb); +#endif + cao = ca->caop(cc); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(cao, cc)); +#else test(cao == cc); +#endif + cao = cb->caop(ca); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(cao, ca)); +#else test(cao == ca); +#endif + cao = cb->caop(cb); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(cao, cb)); +#else test(cao == cb); +#endif + cao = cb->caop(cc); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(cao, cc)); +#else test(cao == cc); +#endif + cao = cc->caop(ca); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(cao, ca)); +#else test(cao == ca); +#endif + cao = cc->caop(cb); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(cao, cb)); +#else test(cao == cb); +#endif + cao = cc->caop(cc); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(cao, cc)); +#else test(cao == cc); +#endif cao = cb->cbop(cb); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(cao, cb)); +#else test(cao == cb); +#endif + cbo = cb->cbop(cb); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(cbo, cb)); +#else test(cbo == cb); +#endif + cao = cb->cbop(cc); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(cao, cc)); +#else test(cao == cc); +#endif + cbo = cb->cbop(cc); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(cbo, cc)); +#else test(cbo == cc); +#endif + cao = cc->cbop(cb); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(cao, cb)); +#else test(cao == cb); +#endif + cbo = cc->cbop(cb); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(cbo, cb)); +#else test(cbo == cb); +#endif + cao = cc->cbop(cc); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(cao, cc)); +#else test(cao == cc); +#endif + cbo = cc->cbop(cc); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(cbo, cc)); +#else test(cbo == cc); +#endif cao = cc->ccop(cc); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(cao, cc)); +#else test(cao == cc); +#endif + cbo = cc->ccop(cc); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(cbo, cc)); +#else test(cbo == cc); +#endif + cco = cc->ccop(cc); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(cco, cc)); +#else test(cco == cc); +#endif cout << "ok" << endl; cout << "ditto, but for interface hierarchy... " << flush; - MA::IAPrx iao; - MB::IB1Prx ib1o; - MB::IB2Prx ib2o; - MA::ICPrx ico; + MA::IAPrxPtr iao; + MB::IB1PrxPtr ib1o; + MB::IB2PrxPtr ib2o; + MA::ICPrxPtr ico; iao = ia->iaop(ia); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(iao, ia)); +#else test(iao == ia); +#endif + iao = ia->iaop(ib1); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(iao, ib1)); +#else test(iao == ib1); +#endif + iao = ia->iaop(ib2); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(iao, ib2)); +#else test(iao == ib2); +#endif + iao = ia->iaop(ic); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(iao, ic)); +#else test(iao == ic); +#endif + iao = ib1->iaop(ia); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(iao, ia)); +#else test(iao == ia); +#endif + iao = ib1->iaop(ib1); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(iao, ib1)); +#else test(iao == ib1); +#endif + iao = ib1->iaop(ib2); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(iao, ib2)); +#else test(iao == ib2); +#endif + iao = ib1->iaop(ic); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(iao, ic)); +#else test(iao == ic); +#endif + iao = ib2->iaop(ia); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(iao, ia)); +#else test(iao == ia); +#endif + iao = ib2->iaop(ib1); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(iao, ib1)); +#else test(iao == ib1); +#endif + iao = ib2->iaop(ib2); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(iao, ib2)); +#else test(iao == ib2); +#endif + iao = ib2->iaop(ic); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(iao, ic)); +#else test(iao == ic); +#endif + iao = ic->iaop(ia); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(iao, ia)); +#else test(iao == ia); +#endif + iao = ic->iaop(ib1); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(iao, ib1)); +#else test(iao == ib1); +#endif + iao = ic->iaop(ib2); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(iao, ib2)); +#else test(iao == ib2); +#endif + iao = ic->iaop(ic); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(iao, ic)); +#else test(iao == ic); +#endif iao = ib1->ib1op(ib1); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(iao, ib1)); +#else test(iao == ib1); +#endif + ib1o = ib1->ib1op(ib1); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(ib1o, ib1)); +#else test(ib1o == ib1); +#endif + iao = ib1->ib1op(ic); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(iao, ic)); +#else test(iao == ic); +#endif + ib1o = ib1->ib1op(ic); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(ib1o, ic)); +#else test(ib1o == ic); +#endif + iao = ic->ib1op(ib1); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(iao, ib1)); +#else test(iao == ib1); +#endif + ib1o = ic->ib1op(ib1); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(ib1o, ib1)); +#else test(ib1o == ib1); +#endif + iao = ic->ib1op(ic); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(iao, ic)); +#else test(iao == ic); +#endif ib1o = ic->ib1op(ic); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(ib1o, ic)); +#else test(ib1o == ic); +#endif iao = ib2->ib2op(ib2); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(iao, ib2)); +#else test(iao == ib2); +#endif + ib2o = ib2->ib2op(ib2); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(ib2o, ib2)); +#else test(ib2o == ib2); +#endif + iao = ib2->ib2op(ic); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(iao, ic)); +#else test(iao == ic); +#endif + ib2o = ib2->ib2op(ic); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(ib2o, ic)); +#else test(ib2o == ic); +#endif + iao = ic->ib2op(ib2); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(iao, ib2)); +#else test(iao == ib2); +#endif + ib2o = ic->ib2op(ib2); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(ib2o, ib2)); +#else test(ib2o == ib2); +#endif + iao = ic->ib2op(ic); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(iao, ic)); +#else test(iao == ic); +#endif + ib2o = ic->ib2op(ic); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(ib2o, ic)); +#else test(ib2o == ic); +#endif iao = ic->icop(ic); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(iao, ic)); +#else test(iao == ic); +#endif + ib1o = ic->icop(ic); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(ib1o, ic)); +#else test(ib1o == ic); +#endif + ib2o = ic->icop(ic); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(ib2o, ic)); +#else test(ib2o == ic); +#endif + ico = ic->icop(ic); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(ico, ic)); +#else test(ico == ic); +#endif cout << "ok" << endl; cout << "ditto, but for class implementing interfaces... " << flush; - MA::CDPrx cdo; + MA::CDPrxPtr cdo; cao = cd->caop(cd); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(cao, cd)); +#else test(cao == cd); +#endif + cbo = cd->cbop(cd); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(cbo, cd)); +#else test(cbo == cd); +#endif + cco = cd->ccop(cd); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(cco, cd)); +#else test(cco == cd); +#endif iao = cd->iaop(cd); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(iao, cd)); +#else test(iao == cd); +#endif + ib1o = cd->ib1op(cd); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(ib1o, cd)); +#else test(ib1o == cd); +#endif + ib2o = cd->ib2op(cd); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(ib2o, cd)); +#else test(ib2o == cd); +#endif cao = cd->cdop(cd); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(cao, cd)); +#else test(cao == cd); +#endif + cbo = cd->cdop(cd); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(cbo, cd)); +#else test(cbo == cd); +#endif + cco = cd->cdop(cd); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(cco, cd)); +#else test(cco == cd); +#endif iao = cd->cdop(cd); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(iao, cd)); +#else test(iao == cd); +#endif + ib1o = cd->cdop(cd); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(ib1o, cd)); +#else test(ib1o == cd); +#endif + ib2o = cd->cdop(cd); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(ib2o, cd)); +#else test(ib2o == cd); +#endif cout << "ok" << endl; cout << "testing one shot constructor... " << flush; { - MC::APtr a = new MC::A(1); + MC::APtr a = ICE_MAKE_SHARED(MC::A, 1); test(a->aA == 1); - MC::BPtr b = new MC::B(1, 2); + MC::BPtr b = ICE_MAKE_SHARED(MC::B, 1, 2); test(b->aA == 1); test(b->bB == 2); - MC::CPtr c = new MC::C(1, 2, 3); + MC::CPtr c = ICE_MAKE_SHARED(MC::C, 1, 2, 3); test(c->aA == 1); test(c->bB == 2); test(c->cC == 3); - MC::DPtr d = new MC::D(1, 2, 3, 4); + MC::DPtr d = ICE_MAKE_SHARED(MC::D, 1, 2, 3, 4); test(d->aA == 1); test(d->bB == 2); test(d->cC == 3); @@ -242,19 +591,19 @@ allTests(const Ice::CommunicatorPtr& communicator) } { - MD::APtr a = new MD::A(1); + MD::APtr a = ICE_MAKE_SHARED(MD::A, 1); test(a->aA == 1); - MD::BPtr b = new MD::B(1, 2); + MD::BPtr b = ICE_MAKE_SHARED(MD::B, 1, 2); test(b->aA == 1); test(b->bB == 2); - MD::CPtr c = new MD::C(1, 2, 3); + MD::CPtr c = ICE_MAKE_SHARED(MD::C, 1, 2, 3); test(c->aA == 1); test(c->bB == 2); test(c->cC == 3); - MD::DPtr d = new MD::D(1, 2, 3, 4); + MD::DPtr d = ICE_MAKE_SHARED(MD::D, 1, 2, 3, 4); test(d->aA == 1); test(d->bB == 2); test(d->cC == 3); @@ -262,19 +611,19 @@ allTests(const Ice::CommunicatorPtr& communicator) } { - ME::APtr a = new ME::A(1); + ME::APtr a = ICE_MAKE_SHARED(ME::A, 1); test(a->aA == 1); - ME::BPtr b = new ME::B(1, 2); + ME::BPtr b = ICE_MAKE_SHARED(ME::B, 1, 2); test(b->aA == 1); test(b->bB == 2); - ME::CPtr c = new ME::C(1, 2, 3); + ME::CPtr c = ICE_MAKE_SHARED(ME::C, 1, 2, 3); test(c->aA == 1); test(c->bB == 2); test(c->cC == 3); - ME::DPtr d = new ME::D(1, 2, 3, 4); + ME::DPtr d = ICE_MAKE_SHARED(ME::D, 1, 2, 3, 4); test(d->aA == 1); test(d->bB == 2); test(d->cC == 3); @@ -282,19 +631,19 @@ allTests(const Ice::CommunicatorPtr& communicator) } { - MF::APtr a = new MF::A(1); + MF::APtr a = ICE_MAKE_SHARED(MF::A, 1); test(a->aA == 1); - MF::BPtr b = new MF::B(1, 2); + MF::BPtr b = ICE_MAKE_SHARED(MF::B, 1, 2); test(b->aA == 1); test(b->bB == 2); - MF::CPtr c = new MF::C(1, 2, 3); + MF::CPtr c = ICE_MAKE_SHARED(MF::C, 1, 2, 3); test(c->aA == 1); test(c->bB == 2); test(c->cC == 3); - MF::DPtr d = new MF::D(1, 2, 3, 4); + MF::DPtr d = ICE_MAKE_SHARED(MF::D, 1, 2, 3, 4); test(d->aA == 1); test(d->bB == 2); test(d->cC == 3); @@ -302,19 +651,19 @@ allTests(const Ice::CommunicatorPtr& communicator) } { - MG::APtr a = new MG::A(1); + MG::APtr a = ICE_MAKE_SHARED(MG::A, 1); test(a->aA == 1); - MG::BPtr b = new MG::B(1, 2); + MG::BPtr b = ICE_MAKE_SHARED(MG::B, 1, 2); test(b->aA == 1); test(b->bB == 2); - MG::CPtr c = new MG::C(1, 2, 3); + MG::CPtr c = ICE_MAKE_SHARED(MG::C, 1, 2, 3); test(c->aA == 1); test(c->bB == 2); test(c->cC == 3); - MG::DPtr d = new MG::D(1, 2, 3, 4); + MG::DPtr d = ICE_MAKE_SHARED(MG::D, 1, 2, 3, 4); test(d->aA == 1); test(d->bB == 2); test(d->cC == 3); @@ -322,19 +671,19 @@ allTests(const Ice::CommunicatorPtr& communicator) } { - MH::APtr a = new MH::A(1); + MH::APtr a = ICE_MAKE_SHARED(MH::A, 1); test(a->aA == 1); - MH::BPtr b = new MH::B(1, 2); + MH::BPtr b = ICE_MAKE_SHARED(MH::B, 1, 2); test(b->aA == 1); test(b->bB == 2); - MH::CPtr c = new MH::C(1, 2, 3); + MH::CPtr c = ICE_MAKE_SHARED(MH::C, 1, 2, 3); test(c->aA == 1); test(c->bB == 2); test(c->cC == 3); - MH::DPtr d = new MH::D(1, 2, 3, 4); + MH::DPtr d = ICE_MAKE_SHARED(MH::D, 1, 2, 3, 4); test(d->aA == 1); test(d->bB == 2); test(d->cC == 3); diff --git a/cpp/test/Ice/inheritance/Client.cpp b/cpp/test/Ice/inheritance/Client.cpp index c5a16298181..9256724470f 100644 --- a/cpp/test/Ice/inheritance/Client.cpp +++ b/cpp/test/Ice/inheritance/Client.cpp @@ -19,8 +19,8 @@ using namespace Test; int run(int, char**, const Ice::CommunicatorPtr& communicator) { - InitialPrx allTests(const Ice::CommunicatorPtr&); - InitialPrx initial = allTests(communicator); + InitialPrxPtr allTests(const Ice::CommunicatorPtr&); + InitialPrxPtr initial = allTests(communicator); initial->shutdown(); return EXIT_SUCCESS; } diff --git a/cpp/test/Ice/inheritance/Collocated.cpp b/cpp/test/Ice/inheritance/Collocated.cpp index 4948c224464..5562c432c99 100644 --- a/cpp/test/Ice/inheritance/Collocated.cpp +++ b/cpp/test/Ice/inheritance/Collocated.cpp @@ -21,10 +21,10 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - Ice::ObjectPtr object = new InitialI(adapter); + Ice::ObjectPtr object = ICE_MAKE_SHARED(InitialI, adapter); adapter->add(object, communicator->stringToIdentity("initial")); - InitialPrx allTests(const Ice::CommunicatorPtr&); + InitialPrxPtr allTests(const Ice::CommunicatorPtr&); allTests(communicator); return EXIT_SUCCESS; diff --git a/cpp/test/Ice/inheritance/Server.cpp b/cpp/test/Ice/inheritance/Server.cpp index a62a97dfa8d..cec439b41d5 100644 --- a/cpp/test/Ice/inheritance/Server.cpp +++ b/cpp/test/Ice/inheritance/Server.cpp @@ -20,7 +20,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - Ice::ObjectPtr object = new InitialI(adapter); + Ice::ObjectPtr object = ICE_MAKE_SHARED(InitialI, adapter); adapter->add(object, communicator->stringToIdentity("initial")); adapter->activate(); TEST_READY diff --git a/cpp/test/Ice/inheritance/TestI.cpp b/cpp/test/Ice/inheritance/TestI.cpp index 87e8cd3451c..59da259eb00 100644 --- a/cpp/test/Ice/inheritance/TestI.cpp +++ b/cpp/test/Ice/inheritance/TestI.cpp @@ -12,64 +12,64 @@ using namespace Test; -MA::CAPrx -CAI_::caop(const MA::CAPrx& p, const Ice::Current&) +MA::CAPrxPtr +CAI_::caop(const MA::CAPrxPtr& p, const Ice::Current&) { return p; } -MB::CBPrx -CBI::cbop(const MB::CBPrx& p, const Ice::Current&) +MB::CBPrxPtr +CBI::cbop(const MB::CBPrxPtr& p, const Ice::Current&) { return p; } -MA::CCPrx -CCI::ccop(const MA::CCPrx& p, const Ice::Current&) +MA::CCPrxPtr +CCI::ccop(const MA::CCPrxPtr& p, const Ice::Current&) { return p; } -MA::CDPrx -CDI::cdop(const MA::CDPrx& p, const Ice::Current&) +MA::CDPrxPtr +CDI::cdop(const MA::CDPrxPtr& p, const Ice::Current&) { return p; } -MA::IAPrx -IAI::iaop(const MA::IAPrx& p, const Ice::Current&) +MA::IAPrxPtr +IAI::iaop(const MA::IAPrxPtr& p, const Ice::Current&) { return p; } -MB::IB1Prx -IB1I::ib1op(const MB::IB1Prx& p, const Ice::Current&) +MB::IB1PrxPtr +IB1I::ib1op(const MB::IB1PrxPtr& p, const Ice::Current&) { return p; } -MB::IB2Prx -IB2I::ib2op(const MB::IB2Prx& p, const Ice::Current&) +MB::IB2PrxPtr +IB2I::ib2op(const MB::IB2PrxPtr& p, const Ice::Current&) { return p; } -MA::ICPrx -ICI::icop(const MA::ICPrx& p, const Ice::Current&) +MA::ICPrxPtr +ICI::icop(const MA::ICPrxPtr& p, const Ice::Current&) { return p; } InitialI::InitialI(const Ice::ObjectAdapterPtr& adapter) { - _ca = MA::CAPrx::uncheckedCast(adapter->addWithUUID(new CAI_)); - _cb = MB::CBPrx::uncheckedCast(adapter->addWithUUID(new CBI)); - _cc = MA::CCPrx::uncheckedCast(adapter->addWithUUID(new CCI)); - _cd = MA::CDPrx::uncheckedCast(adapter->addWithUUID(new CDI)); - _ia = MA::IAPrx::uncheckedCast(adapter->addWithUUID(new IAI)); - _ib1 = MB::IB1Prx::uncheckedCast(adapter->addWithUUID(new IB1I)); - _ib2 = MB::IB2Prx::uncheckedCast(adapter->addWithUUID(new IB2I)); - _ic = MA::ICPrx::uncheckedCast(adapter->addWithUUID(new ICI)); + _ca = ICE_UNCHECKED_CAST(MA::CAPrx, adapter->addWithUUID(ICE_MAKE_SHARED(CAI_))); + _cb = ICE_UNCHECKED_CAST(MB::CBPrx, adapter->addWithUUID(ICE_MAKE_SHARED(CBI))); + _cc = ICE_UNCHECKED_CAST(MA::CCPrx, adapter->addWithUUID(ICE_MAKE_SHARED(CCI))); + _cd = ICE_UNCHECKED_CAST(MA::CDPrx, adapter->addWithUUID(ICE_MAKE_SHARED(CDI))); + _ia = ICE_UNCHECKED_CAST(MA::IAPrx, adapter->addWithUUID(ICE_MAKE_SHARED(IAI))); + _ib1 = ICE_UNCHECKED_CAST(MB::IB1Prx, adapter->addWithUUID(ICE_MAKE_SHARED(IB1I))); + _ib2 = ICE_UNCHECKED_CAST(MB::IB2Prx, adapter->addWithUUID(ICE_MAKE_SHARED(IB2I))); + _ic = ICE_UNCHECKED_CAST(MA::ICPrx, adapter->addWithUUID(ICE_MAKE_SHARED(ICI))); } void @@ -78,49 +78,49 @@ InitialI::shutdown(const Ice::Current& current) current.adapter->getCommunicator()->shutdown(); } -MA::CAPrx +MA::CAPrxPtr InitialI::caop(const Ice::Current&) { return _ca; } -MB::CBPrx +MB::CBPrxPtr InitialI::cbop(const Ice::Current&) { return _cb; } -MA::CCPrx +MA::CCPrxPtr InitialI::ccop(const Ice::Current&) { return _cc; } -MA::CDPrx +MA::CDPrxPtr InitialI::cdop(const Ice::Current&) { return _cd; } -MA::IAPrx +MA::IAPrxPtr InitialI::iaop(const Ice::Current&) { return _ia; } -MB::IB1Prx +MB::IB1PrxPtr InitialI::ib1op(const Ice::Current&) { return _ib1; } -MB::IB2Prx +MB::IB2PrxPtr InitialI::ib2op(const Ice::Current&) { return _ib2; } -MA::ICPrx +MA::ICPrxPtr InitialI::icop(const Ice::Current&) { return _ic; diff --git a/cpp/test/Ice/inheritance/TestI.h b/cpp/test/Ice/inheritance/TestI.h index 3ab1be62372..bdb11e987da 100644 --- a/cpp/test/Ice/inheritance/TestI.h +++ b/cpp/test/Ice/inheritance/TestI.h @@ -20,27 +20,85 @@ public: virtual void shutdown(const Ice::Current&); - virtual Test::MA::CAPrx caop(const Ice::Current&); - virtual Test::MB::CBPrx cbop(const Ice::Current&); - virtual Test::MA::CCPrx ccop(const Ice::Current&); - virtual Test::MA::CDPrx cdop(const Ice::Current&); - virtual Test::MA::IAPrx iaop(const Ice::Current&); - virtual Test::MB::IB1Prx ib1op(const Ice::Current&); - virtual Test::MB::IB2Prx ib2op(const Ice::Current&); - virtual Test::MA::ICPrx icop(const Ice::Current&); + virtual Test::MA::CAPrxPtr caop(const Ice::Current&); + virtual Test::MB::CBPrxPtr cbop(const Ice::Current&); + virtual Test::MA::CCPrxPtr ccop(const Ice::Current&); + virtual Test::MA::CDPrxPtr cdop(const Ice::Current&); + virtual Test::MA::IAPrxPtr iaop(const Ice::Current&); + virtual Test::MB::IB1PrxPtr ib1op(const Ice::Current&); + virtual Test::MB::IB2PrxPtr ib2op(const Ice::Current&); + virtual Test::MA::ICPrxPtr icop(const Ice::Current&); private: - Test::MA::CAPrx _ca; - Test::MB::CBPrx _cb; - Test::MA::CCPrx _cc; - Test::MA::CDPrx _cd; - Test::MA::IAPrx _ia; - Test::MB::IB1Prx _ib1; - Test::MB::IB2Prx _ib2; - Test::MA::ICPrx _ic; + Test::MA::CAPrxPtr _ca; + Test::MB::CBPrxPtr _cb; + Test::MA::CCPrxPtr _cc; + Test::MA::CDPrxPtr _cd; + Test::MA::IAPrxPtr _ia; + Test::MB::IB1PrxPtr _ib1; + Test::MB::IB2PrxPtr _ib2; + Test::MA::ICPrxPtr _ic; }; +#ifdef ICE_CPP11_MAPPING +class CAI_ : virtual public Test::MA::CADisp +{ +public: + + virtual std::shared_ptr<Test::MA::CAPrx> caop(const std::shared_ptr<Test::MA::CAPrx>&, const Ice::Current&); +}; + +class CBI : virtual public Test::MB::CBDisp, virtual public CAI_ +{ +public: + + virtual std::shared_ptr<Test::MB::CBPrx> cbop(const std::shared_ptr<Test::MB::CBPrx>&, const Ice::Current&); +}; + +class CCI : virtual public Test::MA::CCDisp, virtual public CBI +{ +public: + + virtual std::shared_ptr<Test::MA::CCPrx> ccop(const std::shared_ptr<Test::MA::CCPrx>&, const Ice::Current&); +}; + +class IAI : virtual public Test::MA::IA +{ +public: + + virtual std::shared_ptr<Test::MA::IAPrx> iaop(const std::shared_ptr<Test::MA::IAPrx>&, const Ice::Current&); +}; + +class IB1I : virtual public Test::MB::IB1, + virtual public IAI +{ +public: + + virtual std::shared_ptr<Test::MB::IB1Prx> ib1op(const std::shared_ptr<Test::MB::IB1Prx>&, const Ice::Current&); +}; + +class IB2I : virtual public Test::MB::IB2, virtual public IAI +{ +public: + + virtual std::shared_ptr<Test::MB::IB2Prx> ib2op(const std::shared_ptr<Test::MB::IB2Prx>&, const Ice::Current&); +}; + +class ICI : virtual public Test::MA::IC, virtual public IB1I, virtual public IB2I +{ +public: + + virtual std::shared_ptr<Test::MA::ICPrx> icop(const std::shared_ptr<Test::MA::ICPrx>&, const Ice::Current&); +}; + +class CDI : virtual public Test::MA::CDDisp, virtual public CCI, virtual public IB1I, virtual public IB2I +{ +public: + + virtual std::shared_ptr<Test::MA::CDPrx> cdop(const std::shared_ptr<Test::MA::CDPrx>&, const Ice::Current&); +}; +#else class CAI_ : virtual public Test::MA::CA { public: @@ -96,5 +154,6 @@ public: virtual Test::MA::CDPrx cdop(const Test::MA::CDPrx&, const Ice::Current&); }; +#endif #endif |