diff options
Diffstat (limited to 'cpp/test')
172 files changed, 8836 insertions, 2317 deletions
diff --git a/cpp/test/Glacier2/attack/.depend.mak b/cpp/test/Glacier2/attack/.depend.mak index 25a7a30ba59..ebc4d3c46e8 100755 --- a/cpp/test/Glacier2/attack/.depend.mak +++ b/cpp/test/Glacier2/attack/.depend.mak @@ -16,6 +16,7 @@ Backend.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 @@ Backend.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 @@ Backend.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 @@ Backend.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\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -96,6 +98,7 @@ BackendI.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" \ @@ -104,6 +107,7 @@ BackendI.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" \ @@ -144,7 +148,7 @@ BackendI.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" \ @@ -158,6 +162,7 @@ BackendI.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" \ @@ -169,7 +174,6 @@ BackendI.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" \ @@ -192,7 +196,6 @@ BackendI.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" \ @@ -222,6 +225,7 @@ Client.obj: \ "$(includedir)\IceUtil\Handle.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" \ @@ -230,6 +234,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" \ @@ -270,7 +275,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" \ @@ -284,6 +289,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" \ @@ -295,7 +301,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" \ @@ -317,7 +322,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" \ @@ -355,6 +359,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" \ @@ -363,6 +368,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" \ @@ -403,7 +409,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" \ @@ -417,6 +423,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" \ @@ -428,7 +435,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" \ @@ -450,7 +456,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" \ diff --git a/cpp/test/Glacier2/dynamicFiltering/.depend.mak b/cpp/test/Glacier2/dynamicFiltering/.depend.mak index 24c200acff3..53161996b25 100755 --- a/cpp/test/Glacier2/dynamicFiltering/.depend.mak +++ b/cpp/test/Glacier2/dynamicFiltering/.depend.mak @@ -20,6 +20,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" \ @@ -28,6 +29,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" \ @@ -62,7 +64,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" \ @@ -71,13 +73,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)\Glacier2\Session.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ @@ -107,6 +109,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" \ @@ -115,6 +118,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" \ @@ -155,7 +159,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" \ @@ -169,6 +173,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" \ @@ -180,7 +185,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" \ @@ -202,7 +206,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" \ @@ -240,6 +243,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" \ @@ -248,6 +252,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" \ @@ -288,7 +293,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" \ @@ -302,6 +307,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" \ @@ -313,7 +319,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" \ @@ -335,7 +340,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" \ @@ -369,6 +373,7 @@ SessionI.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" \ @@ -377,6 +382,7 @@ SessionI.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" \ @@ -417,7 +423,7 @@ SessionI.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" \ @@ -431,6 +437,7 @@ SessionI.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" \ @@ -442,7 +449,6 @@ SessionI.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" \ @@ -465,7 +471,6 @@ SessionI.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" \ @@ -497,6 +502,7 @@ BackendI.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" \ @@ -505,6 +511,7 @@ BackendI.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" \ @@ -545,7 +552,7 @@ BackendI.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" \ @@ -559,6 +566,7 @@ BackendI.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" \ @@ -570,7 +578,6 @@ BackendI.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" \ @@ -593,7 +600,6 @@ BackendI.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" \ @@ -624,6 +630,7 @@ TestControllerI.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" \ @@ -632,6 +639,7 @@ TestControllerI.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" \ @@ -672,7 +680,7 @@ TestControllerI.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" \ @@ -686,6 +694,7 @@ TestControllerI.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" \ @@ -697,7 +706,6 @@ TestControllerI.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" \ @@ -720,7 +728,6 @@ TestControllerI.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/Glacier2/override/.depend.mak b/cpp/test/Glacier2/override/.depend.mak index c7120ea0b7c..e66df4dca6b 100755 --- a/cpp/test/Glacier2/override/.depend.mak +++ b/cpp/test/Glacier2/override/.depend.mak @@ -17,6 +17,7 @@ Callback.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" \ @@ -25,6 +26,7 @@ Callback.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" \ @@ -59,7 +61,7 @@ Callback.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" \ @@ -68,6 +70,7 @@ Callback.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" \ @@ -75,7 +78,6 @@ Callback.obj: \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -98,6 +100,7 @@ CallbackI.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 @@ CallbackI.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 @@ CallbackI.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 @@ CallbackI.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 @@ CallbackI.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 @@ CallbackI.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" \ @@ -247,6 +250,7 @@ Client.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -254,6 +258,7 @@ Client.obj: \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -282,7 +287,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" \ @@ -295,6 +300,7 @@ Client.obj: \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -306,7 +312,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" \ @@ -327,7 +332,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" \ @@ -362,6 +366,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" \ @@ -370,6 +375,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" \ @@ -410,7 +416,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" \ @@ -424,6 +430,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" \ @@ -435,7 +442,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" \ @@ -457,7 +463,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" \ diff --git a/cpp/test/Glacier2/router/.depend.mak b/cpp/test/Glacier2/router/.depend.mak index aaf929f4593..f5e29c58a32 100755 --- a/cpp/test/Glacier2/router/.depend.mak +++ b/cpp/test/Glacier2/router/.depend.mak @@ -17,6 +17,7 @@ Callback.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" \ @@ -25,6 +26,7 @@ Callback.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" \ @@ -59,7 +61,7 @@ Callback.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" \ @@ -68,6 +70,7 @@ Callback.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" \ @@ -75,7 +78,6 @@ Callback.obj: \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\Outgoing.h" \ @@ -100,6 +102,7 @@ CallbackI.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" \ @@ -108,6 +111,7 @@ CallbackI.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" \ @@ -148,7 +152,7 @@ CallbackI.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" \ @@ -162,6 +166,7 @@ CallbackI.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" \ @@ -173,7 +178,6 @@ CallbackI.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" \ @@ -196,7 +200,6 @@ CallbackI.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" \ @@ -250,6 +253,7 @@ Client.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -257,6 +261,7 @@ Client.obj: \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -285,7 +290,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" \ @@ -298,6 +303,7 @@ Client.obj: \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -309,7 +315,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" \ @@ -330,7 +335,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" \ @@ -365,6 +369,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" \ @@ -373,6 +378,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" \ @@ -413,7 +419,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" \ @@ -427,6 +433,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" \ @@ -438,7 +445,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" \ @@ -460,7 +466,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" \ diff --git a/cpp/test/Glacier2/sessionControl/.depend.mak b/cpp/test/Glacier2/sessionControl/.depend.mak index 5d29af9b3a0..7382a43a3ac 100755 --- a/cpp/test/Glacier2/sessionControl/.depend.mak +++ b/cpp/test/Glacier2/sessionControl/.depend.mak @@ -20,6 +20,7 @@ Session.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" \ @@ -28,6 +29,7 @@ Session.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" \ @@ -62,7 +64,7 @@ Session.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" \ @@ -71,6 +73,7 @@ Session.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" \ @@ -78,7 +81,6 @@ Session.obj: \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Glacier2\Session.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ @@ -108,6 +110,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" \ @@ -116,6 +119,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" \ @@ -156,7 +160,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" \ @@ -170,6 +174,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" \ @@ -181,7 +186,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" \ @@ -203,7 +207,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" \ @@ -241,6 +244,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" \ @@ -249,6 +253,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" \ @@ -289,7 +294,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" \ @@ -303,6 +308,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" \ @@ -314,7 +320,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" \ @@ -336,7 +341,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" \ @@ -368,6 +372,7 @@ SessionI.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" \ @@ -376,6 +381,7 @@ SessionI.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" \ @@ -416,7 +422,7 @@ SessionI.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" \ @@ -430,6 +436,7 @@ SessionI.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" \ @@ -441,7 +448,6 @@ SessionI.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" \ @@ -464,7 +470,6 @@ SessionI.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/Glacier2/sessionHelper/.depend.mak b/cpp/test/Glacier2/sessionHelper/.depend.mak index 94f0e71b2d8..1921a676ccb 100755 --- a/cpp/test/Glacier2/sessionHelper/.depend.mak +++ b/cpp/test/Glacier2/sessionHelper/.depend.mak @@ -16,6 +16,7 @@ Callback.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 @@ Callback.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 @@ Callback.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 @@ Callback.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" \ @@ -117,6 +119,7 @@ Client.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -124,6 +127,7 @@ Client.obj: \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -152,7 +156,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" \ @@ -165,6 +169,7 @@ Client.obj: \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -176,7 +181,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" \ @@ -198,7 +202,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" \ @@ -254,6 +257,7 @@ Server.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -261,6 +265,7 @@ Server.obj: \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -289,7 +294,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" \ @@ -302,6 +307,7 @@ Server.obj: \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -313,7 +319,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" \ @@ -335,7 +340,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" \ diff --git a/cpp/test/Glacier2/ssl/.depend.mak b/cpp/test/Glacier2/ssl/.depend.mak index a3d5d447710..dfeefed13d3 100755 --- a/cpp/test/Glacier2/ssl/.depend.mak +++ b/cpp/test/Glacier2/ssl/.depend.mak @@ -16,6 +16,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" \ @@ -24,6 +25,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" \ @@ -64,7 +66,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" \ @@ -78,6 +80,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" \ @@ -89,7 +92,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" \ @@ -111,7 +113,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" \ @@ -148,6 +149,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" \ @@ -156,6 +158,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" \ @@ -196,7 +199,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" \ @@ -210,6 +213,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" \ @@ -221,7 +225,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" \ @@ -243,7 +246,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" \ diff --git a/cpp/test/Glacier2/staticFiltering/.depend.mak b/cpp/test/Glacier2/staticFiltering/.depend.mak index 0c59777e763..8d5a4b1f045 100755 --- a/cpp/test/Glacier2/staticFiltering/.depend.mak +++ b/cpp/test/Glacier2/staticFiltering/.depend.mak @@ -16,6 +16,7 @@ Backend.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 @@ Backend.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 @@ Backend.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 @@ Backend.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\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -96,6 +98,7 @@ BackendI.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" \ @@ -104,6 +107,7 @@ BackendI.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" \ @@ -144,7 +148,7 @@ BackendI.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" \ @@ -158,6 +162,7 @@ BackendI.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" \ @@ -169,7 +174,6 @@ BackendI.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" \ @@ -192,7 +196,6 @@ BackendI.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" \ @@ -221,6 +224,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" \ @@ -229,6 +233,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" \ @@ -269,7 +274,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" \ @@ -283,6 +288,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" \ @@ -294,7 +300,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" \ @@ -316,7 +321,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" \ @@ -354,6 +358,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" \ @@ -362,6 +367,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" \ @@ -402,7 +408,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" \ @@ -416,6 +422,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" \ @@ -427,7 +434,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" \ @@ -449,7 +455,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" \ diff --git a/cpp/test/Ice/Makefile b/cpp/test/Ice/Makefile index 3735e180ff7..5115508c288 100644 --- a/cpp/test/Ice/Makefile +++ b/cpp/test/Ice/Makefile @@ -11,6 +11,18 @@ top_srcdir = ../.. include $(top_srcdir)/config/Make.rules +ifeq ($(CPP11_MAPPING),yes) +SUBDIRS = proxy \ + operations \ + exceptions \ + ami \ + info \ + inheritance \ + objects \ + properties \ + admin \ + enums +else SUBDIRS = proxy \ operations \ exceptions \ @@ -52,7 +64,8 @@ SUBDIRS = proxy \ echo \ logger \ networkProxy \ - services + services +endif .PHONY: $(EVERYTHING) $(SUBDIRS) diff --git a/cpp/test/Ice/Makefile.mak b/cpp/test/Ice/Makefile.mak index 06c131baeb9..407822dc35e 100644 --- a/cpp/test/Ice/Makefile.mak +++ b/cpp/test/Ice/Makefile.mak @@ -11,6 +11,18 @@ top_srcdir = ..\.. !include $(top_srcdir)\config\Make.rules.mak +!if "$(CPP11_MAPPING)" == "yes" +SUBDIRS = proxy \ + operations \ + exceptions \ + ami \ + info \ + inheritance \ + objects \ + properties \ + admin \ + enums +!else SUBDIRS = proxy \ operations \ exceptions \ @@ -65,7 +77,7 @@ SUBDIRS = $(SUBDIRS) \ interceptor \ services !endif - +!endif $(EVERYTHING):: @for %i in ( $(SUBDIRS) ) do \ diff --git a/cpp/test/Ice/acm/.depend.mak b/cpp/test/Ice/acm/.depend.mak index 80524069778..fc201e5e491 100755 --- a/cpp/test/Ice/acm/.depend.mak +++ b/cpp/test/Ice/acm/.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\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -96,6 +98,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" \ @@ -104,6 +107,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" \ @@ -144,7 +148,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" \ @@ -158,6 +162,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" \ @@ -169,7 +174,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" \ @@ -192,7 +196,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" \ @@ -224,6 +227,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" \ @@ -232,6 +236,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" \ @@ -272,7 +277,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" \ @@ -286,6 +291,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" \ @@ -297,7 +303,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" \ @@ -320,7 +325,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" \ @@ -371,6 +375,7 @@ TestI.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -378,6 +383,7 @@ TestI.obj: \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -406,7 +412,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" \ @@ -419,6 +425,7 @@ TestI.obj: \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -430,7 +437,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" \ @@ -452,7 +458,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" \ @@ -480,6 +485,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" \ @@ -488,6 +494,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" \ @@ -528,7 +535,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" \ @@ -542,6 +549,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" \ @@ -553,7 +561,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" \ @@ -576,7 +583,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" \ diff --git a/cpp/test/Ice/acm/AllTests.cpp b/cpp/test/Ice/acm/AllTests.cpp index e1855fea2d4..d89c6827296 100644 --- a/cpp/test/Ice/acm/AllTests.cpp +++ b/cpp/test/Ice/acm/AllTests.cpp @@ -24,7 +24,9 @@ toString(int value) return os.str(); } -class LoggerI : public Ice::Logger, private IceUtil::Mutex +class LoggerI : public ICE_ENABLE_SHARED_FROM_THIS(LoggerI), + public Ice::Logger, + private IceUtil::Mutex { public: @@ -93,7 +95,7 @@ public: virtual Ice::LoggerPtr cloneWithPrefix(const std::string&) { - return this; + return ICE_SHARED_FROM_THIS; } private: @@ -111,13 +113,20 @@ private: bool _started; vector<string> _messages; }; -typedef IceUtil::Handle<LoggerI> LoggerIPtr; - -class TestCase : public IceUtil::Thread, protected Ice::ConnectionCallback, protected IceUtil::Monitor<IceUtil::Mutex> +ICE_DEFINE_PTR(LoggerIPtr, LoggerI); + +class TestCase : +#ifdef ICE_CPP11_MAPPING + public enable_shared_from_this<Ice::ConnectionCallback>, +#else + public IceUtil::Thread, +#endif + public Ice::ConnectionCallback, + protected IceUtil::Monitor<IceUtil::Mutex> { public: - TestCase(const string& name, const RemoteCommunicatorPrx& com) : + TestCase(const string& name, const RemoteCommunicatorPrxPtr& com) : _name(name), _com(com), _logger(new LoggerI()), _clientACMTimeout(-1), _clientACMClose(-1), _clientACMHeartbeat(-1), _serverACMTimeout(-1), _serverACMClose(-1), _serverACMHeartbeat(-1), @@ -158,12 +167,19 @@ public: _communicator->destroy(); } - void - join() +#ifdef ICE_CPP11_MAPPING + void join(thread& t) +#else + void join() +#endif { cout << "testing " << _name << "... " << flush; _logger->start(); +#ifdef ICE_CPP11_MAPPING + t.join(); +#else getThreadControl().join(); +#endif if(_msg.empty()) { cout << "ok" << endl; @@ -178,11 +194,11 @@ public: virtual void run() { - TestIntfPrx proxy = TestIntfPrx::uncheckedCast(_communicator->stringToProxy( + TestIntfPrxPtr proxy = ICE_UNCHECKED_CAST(TestIntfPrx, _communicator->stringToProxy( _adapter->getTestIntf()->ice_toString())); try { - proxy->ice_getConnection()->setCallback(this); + proxy->ice_getConnection()->setCallback(ICE_SHARED_FROM_THIS); runTestCase(_adapter, proxy); } catch(const std::exception& ex) @@ -225,7 +241,7 @@ public: } } - virtual void runTestCase(const RemoteObjectAdapterPrx&, const TestIntfPrx&) = 0; + virtual void runTestCase(const RemoteObjectAdapterPrxPtr&, const TestIntfPrxPtr&) = 0; void setClientACM(int timeout, int close, int heartbeat) @@ -246,12 +262,12 @@ public: protected: const string _name; - const RemoteCommunicatorPrx _com; + const RemoteCommunicatorPrxPtr _com; string _msg; LoggerIPtr _logger; Ice::CommunicatorPtr _communicator; - RemoteObjectAdapterPrx _adapter; + RemoteObjectAdapterPrxPtr _adapter; int _clientACMTimeout; int _clientACMClose; @@ -263,306 +279,323 @@ protected: int _heartbeat; bool _closed; }; -typedef IceUtil::Handle<TestCase> TestCasePtr; - -} +ICE_DEFINE_PTR(TestCasePtr, TestCase); -void -allTests(const Ice::CommunicatorPtr& communicator) +class InvocationHeartbeatTest : public TestCase { - string ref = "communicator:default -p 12010"; - RemoteCommunicatorPrx com = RemoteCommunicatorPrx::uncheckedCast(communicator->stringToProxy(ref)); - - vector<TestCasePtr> tests; +public: - class InvocationHeartbeatTest : public TestCase + InvocationHeartbeatTest(const RemoteCommunicatorPrxPtr& com) : + TestCase("invocation heartbeat", com) { - public: + } - InvocationHeartbeatTest(const RemoteCommunicatorPrx& com) : - TestCase("invocation heartbeat", com) - { - } + virtual void runTestCase(const RemoteObjectAdapterPrxPtr& adapter, const TestIntfPrxPtr& proxy) + { + proxy->sleep(2); - virtual void runTestCase(const RemoteObjectAdapterPrx& adapter, const TestIntfPrx& proxy) - { - proxy->sleep(2); + Lock sync(*this); + test(_heartbeat >= 2); + } +}; - Lock sync(*this); - test(_heartbeat >= 2); - } - }; +class InvocationHeartbeatOnHoldTest : public TestCase +{ +public: - class InvocationHeartbeatOnHoldTest : public TestCase + InvocationHeartbeatOnHoldTest(const RemoteCommunicatorPrxPtr& com) : + TestCase("invocation with heartbeat on hold", com) { - public: + // Use default ACM configuration. + } - InvocationHeartbeatOnHoldTest(const RemoteCommunicatorPrx& com) : - TestCase("invocation with heartbeat on hold", com) + virtual void runTestCase(const RemoteObjectAdapterPrxPtr& adapter, const TestIntfPrxPtr& proxy) + { + try { - // Use default ACM configuration. + // When the OA is put on hold, connections shouldn't + // send heartbeats, the invocation should therefore + // fail. + proxy->sleepAndHold(10); + test(false); } - - virtual void runTestCase(const RemoteObjectAdapterPrx& adapter, const TestIntfPrx& proxy) + catch(const Ice::ConnectionTimeoutException&) { - try - { - // When the OA is put on hold, connections shouldn't - // send heartbeats, the invocation should therefore - // fail. - proxy->sleepAndHold(10); - test(false); - } - catch(const Ice::ConnectionTimeoutException&) - { - adapter->activate(); - proxy->interruptSleep(); + adapter->activate(); + proxy->interruptSleep(); - waitForClosed(); - } + waitForClosed(); } - }; + } +}; + +class InvocationNoHeartbeatTest : public TestCase +{ +public: - class InvocationNoHeartbeatTest : public TestCase + InvocationNoHeartbeatTest(const RemoteCommunicatorPrxPtr& com) : + TestCase("invocation with no heartbeat", com) { - public: + setServerACM(1, 2, 0); // Disable heartbeat on invocations + } - InvocationNoHeartbeatTest(const RemoteCommunicatorPrx& com) : - TestCase("invocation with no heartbeat", com) + virtual void runTestCase(const RemoteObjectAdapterPrxPtr& adapter, const TestIntfPrxPtr& proxy) + { + try { - setServerACM(1, 2, 0); // Disable heartbeat on invocations + // Heartbeats are disabled on the server, the + // invocation should fail since heartbeats are + // expected. + proxy->sleep(10); + test(false); } - - virtual void runTestCase(const RemoteObjectAdapterPrx& adapter, const TestIntfPrx& proxy) + catch(const Ice::ConnectionTimeoutException&) { - try - { - // Heartbeats are disabled on the server, the - // invocation should fail since heartbeats are - // expected. - proxy->sleep(10); - test(false); - } - catch(const Ice::ConnectionTimeoutException&) - { - proxy->interruptSleep(); + proxy->interruptSleep(); - waitForClosed(); + waitForClosed(); - Lock sync(*this); - test(_heartbeat == 0); - } + Lock sync(*this); + test(_heartbeat == 0); } - }; + } +}; + +class InvocationHeartbeatCloseOnIdleTest : public TestCase +{ +public: - class InvocationHeartbeatCloseOnIdleTest : public TestCase + InvocationHeartbeatCloseOnIdleTest(const RemoteCommunicatorPrxPtr& com) : + TestCase("invocation with no heartbeat and close on idle", com) { - public: + setClientACM(1, 1, 0); // Only close on idle. + setServerACM(1, 2, 0); // Disable heartbeat on invocations + } - InvocationHeartbeatCloseOnIdleTest(const RemoteCommunicatorPrx& com) : - TestCase("invocation with no heartbeat and close on idle", com) - { - setClientACM(1, 1, 0); // Only close on idle. - setServerACM(1, 2, 0); // Disable heartbeat on invocations - } + virtual void runTestCase(const RemoteObjectAdapterPrxPtr& adapter, const TestIntfPrxPtr& proxy) + { + // No close on invocation, the call should succeed this + // time. + proxy->sleep(2); - virtual void runTestCase(const RemoteObjectAdapterPrx& adapter, const TestIntfPrx& proxy) - { - // No close on invocation, the call should succeed this - // time. - proxy->sleep(2); + Lock sync(*this); + test(_heartbeat == 0); + test(!_closed); + } +}; - Lock sync(*this); - test(_heartbeat == 0); - test(!_closed); - } - }; +class CloseOnIdleTest : public TestCase +{ +public: - class CloseOnIdleTest : public TestCase + CloseOnIdleTest(const RemoteCommunicatorPrxPtr& com) : TestCase("close on idle", com) { - public: + setClientACM(1, 1, 0); // Only close on idle + } - CloseOnIdleTest(const RemoteCommunicatorPrx& com) : TestCase("close on idle", com) - { - setClientACM(1, 1, 0); // Only close on idle - } + virtual void runTestCase(const RemoteObjectAdapterPrxPtr& adapter, const TestIntfPrxPtr& proxy) + { + IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(1500)); // Idle for 1.5 seconds - virtual void runTestCase(const RemoteObjectAdapterPrx& adapter, const TestIntfPrx& proxy) - { - IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(1500)); // Idle for 1.5 seconds + waitForClosed(); - waitForClosed(); + Lock sync(*this); + test(_heartbeat == 0); + } +}; - Lock sync(*this); - test(_heartbeat == 0); - } - }; +class CloseOnInvocationTest : public TestCase +{ +public: - class CloseOnInvocationTest : public TestCase + CloseOnInvocationTest(const RemoteCommunicatorPrxPtr& com) : TestCase("close on invocation", com) { - public: + setClientACM(1, 2, 0); // Only close on invocation + } - CloseOnInvocationTest(const RemoteCommunicatorPrx& com) : TestCase("close on invocation", com) - { - setClientACM(1, 2, 0); // Only close on invocation - } + virtual void runTestCase(const RemoteObjectAdapterPrxPtr& adapter, const TestIntfPrxPtr& proxy) + { + IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(1500)); // Idle for 1.5 seconds - virtual void runTestCase(const RemoteObjectAdapterPrx& adapter, const TestIntfPrx& proxy) - { - IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(1500)); // Idle for 1.5 seconds + Lock sync(*this); + test(_heartbeat == 0); + test(!_closed); + } +}; - Lock sync(*this); - test(_heartbeat == 0); - test(!_closed); - } - }; +class CloseOnIdleAndInvocationTest : public TestCase +{ +public: - class CloseOnIdleAndInvocationTest : public TestCase + CloseOnIdleAndInvocationTest(const RemoteCommunicatorPrxPtr& com) : TestCase("close on idle and invocation", com) { - public: + setClientACM(1, 3, 0); // Only close on idle and invocation + } - CloseOnIdleAndInvocationTest(const RemoteCommunicatorPrx& com) : TestCase("close on idle and invocation", com) - { - setClientACM(1, 3, 0); // Only close on idle and invocation - } + virtual void runTestCase(const RemoteObjectAdapterPrxPtr& adapter, const TestIntfPrxPtr& proxy) + { + // + // Put the adapter on hold. The server will not respond to + // the graceful close. This allows to test whether or not + // the close is graceful or forceful. + // + adapter->hold(); + IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(1500)); // Idle for 1.5 seconds - virtual void runTestCase(const RemoteObjectAdapterPrx& adapter, const TestIntfPrx& proxy) { - // - // Put the adapter on hold. The server will not respond to - // the graceful close. This allows to test whether or not - // the close is graceful or forceful. - // - adapter->hold(); - IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(1500)); // Idle for 1.5 seconds + Lock sync(*this); + test(_heartbeat == 0); + test(!_closed); // Not closed yet because of graceful close. + } - { - Lock sync(*this); - test(_heartbeat == 0); - test(!_closed); // Not closed yet because of graceful close. - } + adapter->activate(); + IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(500)); - adapter->activate(); - IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(500)); + waitForClosed(); + } +}; - waitForClosed(); - } - }; +class ForcefulCloseOnIdleAndInvocationTest : public TestCase +{ +public: - class ForcefulCloseOnIdleAndInvocationTest : public TestCase + ForcefulCloseOnIdleAndInvocationTest(const RemoteCommunicatorPrxPtr& com) : + TestCase("forceful close on idle and invocation", com) { - public: + setClientACM(1, 4, 0); // Only close on idle and invocation + } - ForcefulCloseOnIdleAndInvocationTest(const RemoteCommunicatorPrx& com) : - TestCase("forceful close on idle and invocation", com) - { - setClientACM(1, 4, 0); // Only close on idle and invocation - } + virtual void runTestCase(const RemoteObjectAdapterPrxPtr& adapter, const TestIntfPrxPtr& proxy) + { + adapter->hold(); + IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(1500)); // Idle for 1.5 seconds - virtual void runTestCase(const RemoteObjectAdapterPrx& adapter, const TestIntfPrx& proxy) - { - adapter->hold(); - IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(1500)); // Idle for 1.5 seconds + waitForClosed(); - waitForClosed(); + Lock sync(*this); + test(_heartbeat == 0); + } +}; - Lock sync(*this); - test(_heartbeat == 0); - } - }; +class HeartbeatOnIdleTest : public TestCase +{ +public: - class HeartbeatOnIdleTest : public TestCase + HeartbeatOnIdleTest(const RemoteCommunicatorPrxPtr& com) : TestCase("heartbeat on idle", com) { - public: + setServerACM(1, -1, 2); // Enable server heartbeats. + } - HeartbeatOnIdleTest(const RemoteCommunicatorPrx& com) : TestCase("heartbeat on idle", com) - { - setServerACM(1, -1, 2); // Enable server heartbeats. - } + virtual void runTestCase(const RemoteObjectAdapterPrxPtr& adapter, const TestIntfPrxPtr& proxy) + { + IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(2000)); - virtual void runTestCase(const RemoteObjectAdapterPrx& adapter, const TestIntfPrx& proxy) - { - IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(2000)); + Lock sync(*this); + test(_heartbeat >= 3); + } +}; - Lock sync(*this); - test(_heartbeat >= 3); - } - }; +class HeartbeatAlwaysTest : public TestCase +{ +public: - class HeartbeatAlwaysTest : public TestCase + HeartbeatAlwaysTest(const RemoteCommunicatorPrxPtr& com) : TestCase("heartbeat always", com) { - public: + setServerACM(1, -1, 3); // Enable server heartbeats. + } - HeartbeatAlwaysTest(const RemoteCommunicatorPrx& com) : TestCase("heartbeat always", com) + virtual void runTestCase(const RemoteObjectAdapterPrxPtr& adapter, const TestIntfPrxPtr& proxy) + { + for(int i = 0; i < 12; ++i) { - setServerACM(1, -1, 3); // Enable server heartbeats. + proxy->ice_ping(); + IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(200)); } - virtual void runTestCase(const RemoteObjectAdapterPrx& adapter, const TestIntfPrx& proxy) - { - for(int i = 0; i < 12; ++i) - { - proxy->ice_ping(); - IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(200)); - } + Lock sync(*this); + test(_heartbeat >= 3); + } +}; - Lock sync(*this); - test(_heartbeat >= 3); - } - }; +class SetACMTest : public TestCase +{ +public: - class SetACMTest : public TestCase + SetACMTest(const RemoteCommunicatorPrxPtr& com) : TestCase("setACM/getACM", com) { - public: + setClientACM(15, 4, 0); + } - SetACMTest(const RemoteCommunicatorPrx& com) : TestCase("setACM/getACM", com) - { - setClientACM(15, 4, 0); - } + virtual void runTestCase(const RemoteObjectAdapterPrxPtr& adapter, const TestIntfPrxPtr& proxy) + { + Ice::ACM acm; + acm = proxy->ice_getCachedConnection()->getACM(); + test(acm.timeout == 15); + test(acm.close == Ice::CloseOnIdleForceful); + test(acm.heartbeat == Ice::HeartbeatOff); - virtual void runTestCase(const RemoteObjectAdapterPrx& adapter, const TestIntfPrx& proxy) - { - Ice::ACM acm; - acm = proxy->ice_getCachedConnection()->getACM(); - test(acm.timeout == 15); - test(acm.close == Ice::CloseOnIdleForceful); - test(acm.heartbeat == Ice::HeartbeatOff); - - proxy->ice_getCachedConnection()->setACM(IceUtil::None, IceUtil::None, IceUtil::None); - acm = proxy->ice_getCachedConnection()->getACM(); - test(acm.timeout == 15); - test(acm.close == Ice::CloseOnIdleForceful); - test(acm.heartbeat == Ice::HeartbeatOff); - - proxy->ice_getCachedConnection()->setACM(1, Ice::CloseOnInvocationAndIdle, Ice::HeartbeatAlways); - acm = proxy->ice_getCachedConnection()->getACM(); - test(acm.timeout == 1); - test(acm.close == Ice::CloseOnInvocationAndIdle); - test(acm.heartbeat == Ice::HeartbeatAlways); - - // Make sure the client sends few heartbeats to the server - proxy->waitForHeartbeat(2); - } - }; + proxy->ice_getCachedConnection()->setACM(IceUtil::None, IceUtil::None, IceUtil::None); + acm = proxy->ice_getCachedConnection()->getACM(); + test(acm.timeout == 15); + test(acm.close == Ice::CloseOnIdleForceful); + test(acm.heartbeat == Ice::HeartbeatOff); - tests.push_back(new InvocationHeartbeatTest(com)); - tests.push_back(new InvocationHeartbeatOnHoldTest(com)); - tests.push_back(new InvocationNoHeartbeatTest(com)); - tests.push_back(new InvocationHeartbeatCloseOnIdleTest(com)); + proxy->ice_getCachedConnection()->setACM(1, Ice::CloseOnInvocationAndIdle, Ice::HeartbeatAlways); + acm = proxy->ice_getCachedConnection()->getACM(); + test(acm.timeout == 1); + test(acm.close == Ice::CloseOnInvocationAndIdle); + test(acm.heartbeat == Ice::HeartbeatAlways); - tests.push_back(new CloseOnIdleTest(com)); - tests.push_back(new CloseOnInvocationTest(com)); - tests.push_back(new CloseOnIdleAndInvocationTest(com)); - tests.push_back(new ForcefulCloseOnIdleAndInvocationTest(com)); + // Make sure the client sends few heartbeats to the server + proxy->waitForHeartbeat(2); + } +}; - tests.push_back(new HeartbeatOnIdleTest(com)); - tests.push_back(new HeartbeatAlwaysTest(com)); - tests.push_back(new SetACMTest(com)); +} + +void +allTests(const Ice::CommunicatorPtr& communicator) +{ + string ref = "communicator:default -p 12010"; + RemoteCommunicatorPrxPtr com = ICE_UNCHECKED_CAST(RemoteCommunicatorPrx, communicator->stringToProxy(ref)); + + vector<TestCasePtr> tests; + + tests.push_back(ICE_MAKE_SHARED(InvocationHeartbeatTest, com)); + tests.push_back(ICE_MAKE_SHARED(InvocationHeartbeatOnHoldTest, com)); + tests.push_back(ICE_MAKE_SHARED(InvocationNoHeartbeatTest, com)); + tests.push_back(ICE_MAKE_SHARED(InvocationHeartbeatCloseOnIdleTest, com)); + + tests.push_back(ICE_MAKE_SHARED(CloseOnIdleTest, com)); + tests.push_back(ICE_MAKE_SHARED(CloseOnInvocationTest, com)); + tests.push_back(ICE_MAKE_SHARED(CloseOnIdleAndInvocationTest, com)); + tests.push_back(ICE_MAKE_SHARED(ForcefulCloseOnIdleAndInvocationTest, com)); + + tests.push_back(ICE_MAKE_SHARED(HeartbeatOnIdleTest, com)); + tests.push_back(ICE_MAKE_SHARED(HeartbeatAlwaysTest, com)); + tests.push_back(ICE_MAKE_SHARED(SetACMTest, com)); for(vector<TestCasePtr>::const_iterator p = tests.begin(); p != tests.end(); ++p) { (*p)->init(); } + +#ifdef ICE_CPP11_MAPPING + vector<pair<thread, TestCasePtr>> threads; + for(auto p = tests.begin(); p != tests.end(); ++p) + { + TestCasePtr testCase = *p; + thread t([testCase]() + { + testCase->run(); + }); + threads.push_back(make_pair(move(t), testCase)); + } + for(auto p = threads.begin(); p != threads.end(); ++p) + { + p->second->join(p->first); + } +#else for(vector<TestCasePtr>::const_iterator p = tests.begin(); p != tests.end(); ++p) { (*p)->start(); @@ -571,6 +604,7 @@ allTests(const Ice::CommunicatorPtr& communicator) { (*p)->join(); } +#endif for(vector<TestCasePtr>::const_iterator p = tests.begin(); p != tests.end(); ++p) { (*p)->destroy(); diff --git a/cpp/test/Ice/acm/Server.cpp b/cpp/test/Ice/acm/Server.cpp index a40af1f7b03..64abc193761 100644 --- a/cpp/test/Ice/acm/Server.cpp +++ b/cpp/test/Ice/acm/Server.cpp @@ -22,7 +22,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) communicator->getProperties()->setProperty("TestAdapter.ACM.Timeout", "0"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::Identity id = communicator->stringToIdentity("communicator"); - adapter->add(new RemoteCommunicatorI(), id); + adapter->add(ICE_MAKE_SHARED(RemoteCommunicatorI), id); adapter->activate(); TEST_READY diff --git a/cpp/test/Ice/acm/TestI.cpp b/cpp/test/Ice/acm/TestI.cpp index 493221b57a6..fb554bca5d1 100644 --- a/cpp/test/Ice/acm/TestI.cpp +++ b/cpp/test/Ice/acm/TestI.cpp @@ -26,7 +26,11 @@ toString(int value) return os.str(); } -class ConnectionCallbackI : public Ice::ConnectionCallback, private IceUtil::Monitor<IceUtil::Mutex> +class ConnectionCallbackI : public Ice::ConnectionCallback, +#ifdef ICE_CPP11_MAPPING + public enable_shared_from_this<Ice::ConnectionCallback>, +#endif + private IceUtil::Monitor<IceUtil::Mutex> { public: @@ -58,11 +62,11 @@ private: int _count; }; -typedef IceUtil::Handle<ConnectionCallbackI> ConnectionCallbackIPtr; +ICE_DEFINE_PTR(ConnectionCallbackIPtr, ConnectionCallbackI); } -RemoteObjectAdapterPrx +RemoteObjectAdapterPrxPtr RemoteCommunicatorI::createObjectAdapter(int timeout, int close, int heartbeat, const Current& current) { Ice::CommunicatorPtr com = current.adapter->getCommunicator(); @@ -85,7 +89,9 @@ RemoteCommunicatorI::createObjectAdapter(int timeout, int close, int heartbeat, } properties->setProperty(name + ".ThreadPool.Size", "2"); ObjectAdapterPtr adapter = com->createObjectAdapterWithEndpoints(name, protocol + " -h \"" + host + "\""); - return RemoteObjectAdapterPrx::uncheckedCast(current.adapter->addWithUUID(new RemoteObjectAdapterI(adapter))); + + return ICE_UNCHECKED_CAST(RemoteObjectAdapterPrx, current.adapter->addWithUUID( + ICE_MAKE_SHARED(RemoteObjectAdapterI, adapter))); } void @@ -96,13 +102,13 @@ RemoteCommunicatorI::shutdown(const Ice::Current& current) RemoteObjectAdapterI::RemoteObjectAdapterI(const Ice::ObjectAdapterPtr& adapter) : _adapter(adapter), - _testIntf(TestIntfPrx::uncheckedCast(_adapter->add(new TestI(), + _testIntf(ICE_UNCHECKED_CAST(TestIntfPrx, _adapter->add(ICE_MAKE_SHARED(TestI), adapter->getCommunicator()->stringToIdentity("test")))) { _adapter->activate(); } -TestIntfPrx +TestIntfPrxPtr RemoteObjectAdapterI::getTestIntf(const Ice::Current&) { return _testIntf; @@ -157,7 +163,7 @@ TestI::interruptSleep(const Ice::Current& current) void TestI::waitForHeartbeat(int count, const Ice::Current& current) { - ConnectionCallbackIPtr callback = new ConnectionCallbackI(); + ConnectionCallbackIPtr callback = ICE_MAKE_SHARED(ConnectionCallbackI); current.con->setCallback(callback); callback->waitForCount(count); } diff --git a/cpp/test/Ice/acm/TestI.h b/cpp/test/Ice/acm/TestI.h index c72d7b6a6b5..3a9a591083a 100644 --- a/cpp/test/Ice/acm/TestI.h +++ b/cpp/test/Ice/acm/TestI.h @@ -16,7 +16,7 @@ class RemoteCommunicatorI : public Test::RemoteCommunicator { public: - virtual Test::RemoteObjectAdapterPrx createObjectAdapter(int, int, int, const Ice::Current&); + virtual Test::RemoteObjectAdapterPrxPtr createObjectAdapter(int, int, int, const Ice::Current&); virtual void shutdown(const Ice::Current&); }; @@ -26,7 +26,7 @@ public: RemoteObjectAdapterI(const Ice::ObjectAdapterPtr&); - virtual Test::TestIntfPrx getTestIntf(const Ice::Current&); + virtual Test::TestIntfPrxPtr getTestIntf(const Ice::Current&); virtual void activate(const Ice::Current&); virtual void hold(const Ice::Current&); virtual void deactivate(const Ice::Current&); @@ -34,7 +34,7 @@ public: private: const Ice::ObjectAdapterPtr _adapter; - const Test::TestIntfPrx _testIntf; + const Test::TestIntfPrxPtr _testIntf; }; class TestI : public Test::TestIntf, private IceUtil::Monitor<IceUtil::Mutex> diff --git a/cpp/test/Ice/adapterDeactivation/.depend.mak b/cpp/test/Ice/adapterDeactivation/.depend.mak index 3fba0b9bd5a..9a51b63c683 100755 --- a/cpp/test/Ice/adapterDeactivation/.depend.mak +++ b/cpp/test/Ice/adapterDeactivation/.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\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -97,6 +99,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" \ @@ -105,6 +108,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" \ @@ -145,7 +149,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" \ @@ -159,6 +163,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" \ @@ -170,7 +175,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" \ @@ -192,7 +196,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" \ @@ -224,6 +227,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" \ @@ -232,6 +236,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" \ @@ -272,7 +277,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" \ @@ -286,6 +291,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" \ @@ -297,7 +303,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" \ @@ -320,7 +325,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" \ @@ -371,6 +375,7 @@ TestI.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -378,6 +383,7 @@ TestI.obj: \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -406,7 +412,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" \ @@ -419,6 +425,7 @@ TestI.obj: \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -430,7 +437,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" \ @@ -452,7 +458,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" \ @@ -481,6 +486,7 @@ ServantLocatorI.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" \ @@ -489,6 +495,7 @@ ServantLocatorI.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" \ @@ -529,7 +536,7 @@ ServantLocatorI.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" \ @@ -543,6 +550,7 @@ ServantLocatorI.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" \ @@ -554,7 +562,6 @@ ServantLocatorI.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" \ @@ -577,7 +584,6 @@ ServantLocatorI.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" \ @@ -611,6 +617,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" \ @@ -619,6 +626,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" \ @@ -659,7 +667,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" \ @@ -673,6 +681,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" \ @@ -684,7 +693,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" \ @@ -706,7 +714,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" \ @@ -739,6 +746,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" \ @@ -747,6 +755,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" \ @@ -787,7 +796,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" \ @@ -801,6 +810,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" \ @@ -812,7 +822,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" \ @@ -834,7 +843,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/adapterDeactivation/AllTests.cpp b/cpp/test/Ice/adapterDeactivation/AllTests.cpp index 8186540cb30..c1661d22975 100644 --- a/cpp/test/Ice/adapterDeactivation/AllTests.cpp +++ b/cpp/test/Ice/adapterDeactivation/AllTests.cpp @@ -15,18 +15,22 @@ using namespace std; using namespace Ice; using namespace Test; -TestIntfPrx +TestIntfPrxPtr allTests(const CommunicatorPtr& communicator) { cout << "testing stringToProxy... " << flush; - ObjectPrx base = communicator->stringToProxy("test:default -p 12010"); + ObjectPrxPtr base = communicator->stringToProxy("test:default -p 12010"); test(base); cout << "ok" << endl; cout << "testing checked cast... " << flush; - TestIntfPrx obj = TestIntfPrx::checkedCast(base); + TestIntfPrxPtr obj = ICE_CHECKED_CAST(TestIntfPrx, base); test(obj); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(obj, base)); +#else test(obj == base); +#endif cout << "ok" << endl; { @@ -64,7 +68,11 @@ allTests(const CommunicatorPtr& communicator) Ice::InitializationData initData; initData.properties = communicator->getProperties()->clone(); Ice::CommunicatorPtr comm = Ice::initialize(initData); +#ifdef ICE_CPP11_MAPPING + comm->stringToProxy("test:default -p 12010")->ice_ping_async(); +#else comm->stringToProxy("test:default -p 12010")->begin_ice_ping(); +#endif comm->destroy(); } cout << "ok" << endl; diff --git a/cpp/test/Ice/adapterDeactivation/Client.cpp b/cpp/test/Ice/adapterDeactivation/Client.cpp index d76c2bc2387..35e5e8abdca 100644 --- a/cpp/test/Ice/adapterDeactivation/Client.cpp +++ b/cpp/test/Ice/adapterDeactivation/Client.cpp @@ -22,8 +22,8 @@ using namespace Test; int run(int, char**, const Ice::CommunicatorPtr& communicator) { - TestIntfPrx allTests(const CommunicatorPtr&); - TestIntfPrx obj = allTests(communicator); + TestIntfPrxPtr allTests(const CommunicatorPtr&); + TestIntfPrxPtr obj = allTests(communicator); return EXIT_SUCCESS; } diff --git a/cpp/test/Ice/adapterDeactivation/Collocated.cpp b/cpp/test/Ice/adapterDeactivation/Collocated.cpp index ef093c73098..67f6a550f39 100644 --- a/cpp/test/Ice/adapterDeactivation/Collocated.cpp +++ b/cpp/test/Ice/adapterDeactivation/Collocated.cpp @@ -23,10 +23,10 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - ServantLocatorPtr locator = new ServantLocatorI; + ServantLocatorPtr locator = ICE_MAKE_SHARED(ServantLocatorI); adapter->addServantLocator(locator, ""); - TestIntfPrx allTests(const CommunicatorPtr&); + TestIntfPrxPtr allTests(const CommunicatorPtr&); allTests(communicator); adapter->waitForDeactivate(); diff --git a/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp b/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp index bb5656c3b8c..a2aae5b77f6 100644 --- a/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp +++ b/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp @@ -26,25 +26,37 @@ ServantLocatorI::~ServantLocatorI() } Ice::ObjectPtr +#ifdef ICE_CPP11_MAPPING +ServantLocatorI::locate(const Ice::Current& current, std::shared_ptr<void>& cookie) +#else ServantLocatorI::locate(const Ice::Current& current, Ice::LocalObjectPtr& cookie) +#endif { test(!_deactivated); test(current.id.category == ""); test(current.id.name == "test"); - cookie = new CookieI; + cookie = ICE_MAKE_SHARED(CookieI); - return new TestI; + return ICE_MAKE_SHARED(TestI); } void +#ifdef ICE_CPP11_MAPPING +ServantLocatorI::finished(const Ice::Current&, const Ice::ObjectPtr&, + const std::shared_ptr<void>& cookie) +#else ServantLocatorI::finished(const Ice::Current&, const Ice::ObjectPtr&, const Ice::LocalObjectPtr& cookie) +#endif { test(!_deactivated); - +#ifdef ICE_CPP11_MAPPING + shared_ptr<CookieI> co = static_pointer_cast<CookieI>(cookie); +#else CookiePtr co = CookiePtr::dynamicCast(cookie); +#endif test(co); test(co->message() == "blahblah"); } diff --git a/cpp/test/Ice/adapterDeactivation/ServantLocatorI.h b/cpp/test/Ice/adapterDeactivation/ServantLocatorI.h index b5e9dfc5bdb..6f75cd63e41 100644 --- a/cpp/test/Ice/adapterDeactivation/ServantLocatorI.h +++ b/cpp/test/Ice/adapterDeactivation/ServantLocatorI.h @@ -19,8 +19,13 @@ public: ServantLocatorI(); virtual ~ServantLocatorI(); +#ifdef ICE_CPP11_MAPPING + virtual Ice::ObjectPtr locate(const Ice::Current&, ::std::shared_ptr<void>&); + virtual void finished(const Ice::Current&, const Ice::ObjectPtr&, const ::std::shared_ptr<void>&); +#else virtual Ice::ObjectPtr locate(const Ice::Current&, Ice::LocalObjectPtr&); virtual void finished(const Ice::Current&, const Ice::ObjectPtr&, const Ice::LocalObjectPtr&); +#endif virtual void deactivate(const std::string&); public: diff --git a/cpp/test/Ice/adapterDeactivation/Server.cpp b/cpp/test/Ice/adapterDeactivation/Server.cpp index 2213bfdbb62..b8e57302aad 100644 --- a/cpp/test/Ice/adapterDeactivation/Server.cpp +++ b/cpp/test/Ice/adapterDeactivation/Server.cpp @@ -21,7 +21,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - ServantLocatorPtr locator = new ServantLocatorI; + ServantLocatorPtr locator = ICE_MAKE_SHARED(ServantLocatorI); adapter->addServantLocator(locator, ""); adapter->activate(); TEST_READY diff --git a/cpp/test/Ice/adapterDeactivation/TestI.cpp b/cpp/test/Ice/adapterDeactivation/TestI.cpp index 49a0d45b633..6c29a78d005 100644 --- a/cpp/test/Ice/adapterDeactivation/TestI.cpp +++ b/cpp/test/Ice/adapterDeactivation/TestI.cpp @@ -17,12 +17,15 @@ using namespace Ice; void TestI::transient(const Current& current) { + cerr << "TestI::transient" << endl; CommunicatorPtr communicator = current.adapter->getCommunicator(); ObjectAdapterPtr adapter = communicator->createObjectAdapterWithEndpoints("TransientTestAdapter", "default -p 9999"); adapter->activate(); + cerr << "TestI::transient activate" << endl; adapter->destroy(); + cerr << "TestI::transient ok" << endl; } void diff --git a/cpp/test/Ice/admin/.depend.mak b/cpp/test/Ice/admin/.depend.mak index 06a7e889e45..f062167f9e4 100755 --- a/cpp/test/Ice/admin/.depend.mak +++ b/cpp/test/Ice/admin/.depend.mak @@ -19,6 +19,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" \ @@ -27,6 +28,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" \ @@ -61,7 +63,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" \ @@ -70,6 +72,7 @@ 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" \ @@ -79,7 +82,6 @@ Test.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -102,6 +104,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" \ @@ -110,6 +113,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" \ @@ -150,7 +154,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" \ @@ -164,6 +168,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" \ @@ -175,7 +180,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" \ @@ -198,7 +202,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" \ @@ -230,6 +233,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" \ @@ -238,6 +242,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" \ @@ -278,7 +283,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" \ @@ -292,6 +297,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" \ @@ -303,7 +309,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" \ @@ -326,7 +331,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" \ @@ -358,6 +362,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" \ @@ -366,6 +371,7 @@ TestI.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" \ @@ -400,7 +406,7 @@ TestI.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" \ @@ -409,6 +415,7 @@ TestI.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" \ @@ -435,7 +442,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" \ @@ -458,7 +464,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\Metrics.h" \ @@ -483,6 +488,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" \ @@ -491,6 +497,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" \ @@ -531,7 +538,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" \ @@ -545,6 +552,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" \ @@ -556,7 +564,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" \ @@ -579,7 +586,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" \ diff --git a/cpp/test/Ice/admin/AllTests.cpp b/cpp/test/Ice/admin/AllTests.cpp index 09f0fc2909c..43bf5d0fdfc 100644 --- a/cpp/test/Ice/admin/AllTests.cpp +++ b/cpp/test/Ice/admin/AllTests.cpp @@ -13,6 +13,7 @@ using namespace std; using namespace Test; +using namespace Ice; static void testFacets(const Ice::CommunicatorPtr& com, bool builtInFacets = true) @@ -25,9 +26,9 @@ testFacets(const Ice::CommunicatorPtr& com, bool builtInFacets = true) test(com->findAdminFacet("Metrics")); } - TestFacetPtr f1 = new TestFacetI; - TestFacetPtr f2 = new TestFacetI; - TestFacetPtr f3 = new TestFacetI; + TestFacetPtr f1 = ICE_MAKE_SHARED(TestFacetI); + TestFacetPtr f2 = ICE_MAKE_SHARED(TestFacetI); + TestFacetPtr f3 = ICE_MAKE_SHARED(TestFacetI); com->addAdminFacet(f1, "Facet1"); com->addAdminFacet(f2, "Facet2"); @@ -118,7 +119,7 @@ private: Ice::LogMessageSeq _expectedLogMessages; }; -typedef IceUtil::Handle<RemoteLoggerI> RemoteLoggerIPtr; +ICE_DEFINE_PTR(RemoteLoggerIPtr, RemoteLoggerI); RemoteLoggerI::RemoteLoggerI() : _receivedCalls(0) { @@ -259,8 +260,8 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "ok" << endl; string ref = "factory:default -p 12010 -t 10000"; - RemoteCommunicatorFactoryPrx factory = - RemoteCommunicatorFactoryPrx::uncheckedCast(communicator->stringToProxy(ref)); + RemoteCommunicatorFactoryPrxPtr factory = + ICE_UNCHECKED_CAST(RemoteCommunicatorFactoryPrx, communicator->stringToProxy(ref)); string defaultHost = communicator->getProperties()->getProperty("Ice.Default.Host"); @@ -272,9 +273,13 @@ allTests(const Ice::CommunicatorPtr& communicator) Ice::PropertyDict props; props["Ice.Admin.Endpoints"] = "tcp -h " + defaultHost; props["Ice.Admin.InstanceName"] = "Test"; - RemoteCommunicatorPrx com = factory->createCommunicator(props); - Ice::ObjectPrx obj = com->getAdmin(); + RemoteCommunicatorPrxPtr com = factory->createCommunicator(props); + Ice::ObjectPrxPtr obj = com->getAdmin(); +#ifdef ICE_CPP11_MAPPING + shared_ptr<Ice::ProcessPrx> proc = Ice::checkedCast<Ice::ProcessPrx>(obj, "Process"); +#else Ice::ProcessPrx proc = Ice::ProcessPrx::checkedCast(obj, "Process"); +#endif proc->shutdown(); com->waitForShutdown(); com->destroy(); @@ -289,10 +294,13 @@ allTests(const Ice::CommunicatorPtr& communicator) props["Prop1"] = "1"; props["Prop2"] = "2"; props["Prop3"] = "3"; - RemoteCommunicatorPrx com = factory->createCommunicator(props); - Ice::ObjectPrx obj = com->getAdmin(); + RemoteCommunicatorPrxPtr com = factory->createCommunicator(props); + Ice::ObjectPrxPtr obj = com->getAdmin(); +#ifdef ICE_CPP11_MAPPING + shared_ptr<Ice::PropertiesAdminPrx> pa = Ice::checkedCast<Ice::PropertiesAdminPrx>(obj, "Properties"); +#else Ice::PropertiesAdminPrx pa = Ice::PropertiesAdminPrx::checkedCast(obj, "Properties"); - +#endif // // Test: PropertiesAdmin::getProperty() // @@ -353,15 +361,19 @@ allTests(const Ice::CommunicatorPtr& communicator) props["Ice.Admin.Endpoints"] = "tcp -h " + defaultHost; props["Ice.Admin.InstanceName"] = "Test"; props["NullLogger"] = "1"; - RemoteCommunicatorPrx com = factory->createCommunicator(props); + RemoteCommunicatorPrxPtr com = factory->createCommunicator(props); com->trace("testCat", "trace"); com->warning("warning"); com->error("error"); com->print("print"); - Ice::ObjectPrx obj = com->getAdmin(); + Ice::ObjectPrxPtr obj = com->getAdmin(); +#ifdef ICE_CPP11_MAPPING + shared_ptr<Ice::LoggerAdminPrx> logger = Ice::checkedCast<Ice::LoggerAdminPrx>(obj, "Logger"); +#else Ice::LoggerAdminPrx logger = Ice::LoggerAdminPrx::checkedCast(obj, "Logger"); +#endif test(logger); string prefix; @@ -389,8 +401,8 @@ allTests(const Ice::CommunicatorPtr& communicator) com->warning("warning2"); Ice::LogMessageTypeSeq messageTypes; - messageTypes.push_back(Ice::ErrorMessage); - messageTypes.push_back(Ice::WarningMessage); + messageTypes.push_back(ICE_ENUM(LogMessageType, ErrorMessage)); + messageTypes.push_back(ICE_ENUM(LogMessageType, WarningMessage)); logMessages = logger->getLog(messageTypes, Ice::StringSeq(), -1, prefix); @@ -400,7 +412,7 @@ allTests(const Ice::CommunicatorPtr& communicator) p = logMessages.begin(); while(p != logMessages.end()) { - test(p->type == Ice::ErrorMessage || p->type == Ice::WarningMessage); + test(p->type == ICE_ENUM(LogMessageType, ErrorMessage) || p->type == ICE_ENUM(LogMessageType, WarningMessage)); ++p; } @@ -412,8 +424,8 @@ allTests(const Ice::CommunicatorPtr& communicator) com->trace("testCat2", "B"); messageTypes.clear(); - messageTypes.push_back(Ice::ErrorMessage); - messageTypes.push_back(Ice::TraceMessage); + messageTypes.push_back(ICE_ENUM(LogMessageType, ErrorMessage)); + messageTypes.push_back(ICE_ENUM(LogMessageType, TraceMessage)); Ice::StringSeq categories; categories.push_back("testCat"); @@ -426,8 +438,8 @@ allTests(const Ice::CommunicatorPtr& communicator) p = logMessages.begin(); while(p != logMessages.end()) { - test(p->type == Ice::ErrorMessage || - (p->type == Ice::TraceMessage && p->traceCategory == "testCat")); + test(p->type == ICE_ENUM(LogMessageType, ErrorMessage) || + (p->type == ICE_ENUM(LogMessageType, TraceMessage) && p->traceCategory == "testCat")); ++p; } @@ -452,10 +464,10 @@ allTests(const Ice::CommunicatorPtr& communicator) Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapterWithEndpoints("RemoteLoggerAdapter", "tcp -h localhost"); - RemoteLoggerIPtr remoteLogger = new RemoteLoggerI; + RemoteLoggerIPtr remoteLogger = ICE_MAKE_SHARED(RemoteLoggerI); - Ice::RemoteLoggerPrx myProxy = - Ice::RemoteLoggerPrx::uncheckedCast(adapter->addWithUUID(remoteLogger)); + Ice::RemoteLoggerPrxPtr myProxy = + ICE_UNCHECKED_CAST(Ice::RemoteLoggerPrx, adapter->addWithUUID(remoteLogger)); adapter->activate(); @@ -468,10 +480,10 @@ allTests(const Ice::CommunicatorPtr& communicator) logger->attachRemoteLogger(myProxy, Ice::LogMessageTypeSeq(), Ice::StringSeq(), -1); remoteLogger->wait(1); - remoteLogger->checkNextLog(Ice::TraceMessage, "rtrace", "testCat"); - remoteLogger->checkNextLog(Ice::WarningMessage, "rwarning"); - remoteLogger->checkNextLog(Ice::ErrorMessage, "rerror"); - remoteLogger->checkNextLog(Ice::PrintMessage, "rprint"); + remoteLogger->checkNextLog(ICE_ENUM(LogMessageType, TraceMessage), "rtrace", "testCat"); + remoteLogger->checkNextLog(ICE_ENUM(LogMessageType, WarningMessage), "rwarning"); + remoteLogger->checkNextLog(ICE_ENUM(LogMessageType, ErrorMessage), "rerror"); + remoteLogger->checkNextLog(ICE_ENUM(LogMessageType, PrintMessage), "rprint"); com->trace("testCat", "rtrace"); com->warning("rwarning"); @@ -491,8 +503,8 @@ allTests(const Ice::CommunicatorPtr& communicator) logger->attachRemoteLogger(myProxy, messageTypes, categories, 4); remoteLogger->wait(1); - remoteLogger->checkNextLog(Ice::TraceMessage, "rtrace2", "testCat"); - remoteLogger->checkNextLog(Ice::ErrorMessage, "rerror2"); + remoteLogger->checkNextLog(ICE_ENUM(LogMessageType, TraceMessage), "rtrace2", "testCat"); + remoteLogger->checkNextLog(ICE_ENUM(LogMessageType, ErrorMessage), "rerror2"); com->warning("rwarning2"); com->trace("testCat", "rtrace2"); @@ -527,9 +539,13 @@ allTests(const Ice::CommunicatorPtr& communicator) Ice::PropertyDict props; props["Ice.Admin.Endpoints"] = "tcp -h " + defaultHost; props["Ice.Admin.InstanceName"] = "Test"; - RemoteCommunicatorPrx com = factory->createCommunicator(props); - Ice::ObjectPrx obj = com->getAdmin(); + RemoteCommunicatorPrxPtr com = factory->createCommunicator(props); + Ice::ObjectPrxPtr obj = com->getAdmin(); +#ifdef ICE_CPP11_MAPPING + shared_ptr<Test::TestFacetPrx> tf = Ice::checkedCast<Test::TestFacetPrx>(obj, "TestFacet"); +#else Test::TestFacetPrx tf = Test::TestFacetPrx::checkedCast(obj, "TestFacet"); +#endif tf->op(); com->destroy(); } @@ -545,12 +561,19 @@ allTests(const Ice::CommunicatorPtr& communicator) props["Ice.Admin.Endpoints"] = "tcp -h " + defaultHost; props["Ice.Admin.InstanceName"] = "Test"; props["Ice.Admin.Facets"] = "Properties"; - RemoteCommunicatorPrx com = factory->createCommunicator(props); - Ice::ObjectPrx obj = com->getAdmin(); + RemoteCommunicatorPrxPtr com = factory->createCommunicator(props); + Ice::ObjectPrxPtr obj = com->getAdmin(); +#ifdef ICE_CPP11_MAPPING + shared_ptr<Ice::ProcessPrx> proc = Ice::checkedCast<Ice::ProcessPrx>(obj, "Process"); + test(!proc); + shared_ptr<Test::TestFacetPrx> tf = Ice::checkedCast<Test::TestFacetPrx>(obj, "TestFacet"); + test(!tf); +#else Ice::ProcessPrx proc = Ice::ProcessPrx::checkedCast(obj, "Process"); test(!proc); Test::TestFacetPrx tf = Test::TestFacetPrx::checkedCast(obj, "TestFacet"); test(!tf); +#endif com->destroy(); } { @@ -562,12 +585,19 @@ allTests(const Ice::CommunicatorPtr& communicator) props["Ice.Admin.Endpoints"] = "tcp -h " + defaultHost; props["Ice.Admin.InstanceName"] = "Test"; props["Ice.Admin.Facets"] = "Process"; - RemoteCommunicatorPrx com = factory->createCommunicator(props); - Ice::ObjectPrx obj = com->getAdmin(); + RemoteCommunicatorPrxPtr com = factory->createCommunicator(props); + Ice::ObjectPrxPtr obj = com->getAdmin(); +#ifdef ICE_CPP11_MAPPING + shared_ptr<Ice::PropertiesAdminPrx> pa = Ice::checkedCast<Ice::PropertiesAdminPrx>(obj, "Properties"); + test(!pa); + shared_ptr<Test::TestFacetPrx> tf = Ice::checkedCast<Test::TestFacetPrx>(obj, "TestFacet"); + test(!tf); +#else Ice::PropertiesAdminPrx pa = Ice::PropertiesAdminPrx::checkedCast(obj, "Properties"); test(!pa); Test::TestFacetPrx tf = Test::TestFacetPrx::checkedCast(obj, "TestFacet"); test(!tf); +#endif com->destroy(); } { @@ -579,12 +609,19 @@ allTests(const Ice::CommunicatorPtr& communicator) props["Ice.Admin.Endpoints"] = "tcp -h " + defaultHost; props["Ice.Admin.InstanceName"] = "Test"; props["Ice.Admin.Facets"] = "TestFacet"; - RemoteCommunicatorPrx com = factory->createCommunicator(props); - Ice::ObjectPrx obj = com->getAdmin(); + RemoteCommunicatorPrxPtr com = factory->createCommunicator(props); + Ice::ObjectPrxPtr obj = com->getAdmin(); +#ifdef ICE_CPP11_MAPPING + shared_ptr<Ice::PropertiesAdminPrx> pa = Ice::checkedCast<Ice::PropertiesAdminPrx>(obj, "Properties"); + test(!pa); + shared_ptr<Ice::ProcessPrx> proc = Ice::checkedCast<Ice::ProcessPrx>(obj, "Process"); + test(!proc); +#else Ice::PropertiesAdminPrx pa = Ice::PropertiesAdminPrx::checkedCast(obj, "Properties"); test(!pa); Ice::ProcessPrx proc = Ice::ProcessPrx::checkedCast(obj, "Process"); test(!proc); +#endif com->destroy(); } { @@ -596,14 +633,23 @@ allTests(const Ice::CommunicatorPtr& communicator) props["Ice.Admin.Endpoints"] = "tcp -h " + defaultHost; props["Ice.Admin.InstanceName"] = "Test"; props["Ice.Admin.Facets"] = "Properties TestFacet"; - RemoteCommunicatorPrx com = factory->createCommunicator(props); - Ice::ObjectPrx obj = com->getAdmin(); + RemoteCommunicatorPrxPtr com = factory->createCommunicator(props); + Ice::ObjectPrxPtr obj = com->getAdmin(); +#ifdef ICE_CPP11_MAPPING + shared_ptr<Ice::PropertiesAdminPrx> pa = Ice::checkedCast<Ice::PropertiesAdminPrx>(obj, "Properties"); + test(pa->getProperty("Ice.Admin.InstanceName") == "Test"); + shared_ptr<Test::TestFacetPrx> tf = Ice::checkedCast<Test::TestFacetPrx>(obj, "TestFacet"); + tf->op(); + shared_ptr<Ice::ProcessPrx> proc = Ice::checkedCast<Ice::ProcessPrx>(obj, "Process"); + test(!proc); +#else Ice::PropertiesAdminPrx pa = Ice::PropertiesAdminPrx::checkedCast(obj, "Properties"); test(pa->getProperty("Ice.Admin.InstanceName") == "Test"); Test::TestFacetPrx tf = Test::TestFacetPrx::checkedCast(obj, "TestFacet"); tf->op(); Ice::ProcessPrx proc = Ice::ProcessPrx::checkedCast(obj, "Process"); test(!proc); +#endif com->destroy(); } { @@ -615,13 +661,21 @@ allTests(const Ice::CommunicatorPtr& communicator) props["Ice.Admin.Endpoints"] = "tcp -h " + defaultHost; props["Ice.Admin.InstanceName"] = "Test"; props["Ice.Admin.Facets"] = "TestFacet, Process"; - RemoteCommunicatorPrx com = factory->createCommunicator(props); - Ice::ObjectPrx obj = com->getAdmin(); + RemoteCommunicatorPrxPtr com = factory->createCommunicator(props); + Ice::ObjectPrxPtr obj = com->getAdmin(); +#ifdef ICE_CPP11_MAPPING + shared_ptr<Ice::PropertiesAdminPrx> pa = Ice::checkedCast<Ice::PropertiesAdminPrx>(obj, "Properties"); + test(!pa); + shared_ptr<Test::TestFacetPrx> tf = Ice::checkedCast<Test::TestFacetPrx>(obj, "TestFacet"); + tf->op(); + shared_ptr<Ice::ProcessPrx> proc = Ice::checkedCast<Ice::ProcessPrx>(obj, "Process"); +#else Ice::PropertiesAdminPrx pa = Ice::PropertiesAdminPrx::checkedCast(obj, "Properties"); test(!pa); Test::TestFacetPrx tf = Test::TestFacetPrx::checkedCast(obj, "TestFacet"); tf->op(); Ice::ProcessPrx proc = Ice::ProcessPrx::checkedCast(obj, "Process"); +#endif proc->shutdown(); com->waitForShutdown(); com->destroy(); diff --git a/cpp/test/Ice/admin/Server.cpp b/cpp/test/Ice/admin/Server.cpp index a6dd71c2d1e..f3cd628be4a 100644 --- a/cpp/test/Ice/admin/Server.cpp +++ b/cpp/test/Ice/admin/Server.cpp @@ -21,7 +21,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::Identity id = communicator->stringToIdentity("factory"); - adapter->add(new RemoteCommunicatorFactoryI, id); + adapter->add(ICE_MAKE_SHARED(RemoteCommunicatorFactoryI), id); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/admin/TestI.cpp b/cpp/test/Ice/admin/TestI.cpp index dc6870a5d3c..3cd1188aa1f 100644 --- a/cpp/test/Ice/admin/TestI.cpp +++ b/cpp/test/Ice/admin/TestI.cpp @@ -19,7 +19,7 @@ namespace // A no-op Logger, used when testing the Logger Admin // -class NullLogger : public Ice::Logger +class NullLogger : public Ice::Logger, public ICE_ENABLE_SHARED_FROM_THIS(NullLogger) { public: @@ -46,7 +46,7 @@ public: virtual Ice::LoggerPtr cloneWithPrefix(const string&) { - return this; + return ICE_SHARED_FROM_THIS; } }; @@ -59,7 +59,7 @@ RemoteCommunicatorI::RemoteCommunicatorI(const Ice::CommunicatorPtr& communicato { } -Ice::ObjectPrx +Ice::ObjectPrxPtr RemoteCommunicatorI::getAdmin(const Ice::Current&) { return _communicator->getAdmin(); @@ -141,7 +141,7 @@ RemoteCommunicatorI::updated(const Ice::PropertyDict& changes) notify(); } -Test::RemoteCommunicatorPrx +Test::RemoteCommunicatorPrxPtr RemoteCommunicatorFactoryI::createCommunicator(const Ice::PropertyDict& props, const Ice::Current& current) { // @@ -156,7 +156,7 @@ RemoteCommunicatorFactoryI::createCommunicator(const Ice::PropertyDict& props, c if(init.properties->getPropertyAsInt("NullLogger") > 0) { - init.logger = new NullLogger; + init.logger = ICE_MAKE_SHARED(NullLogger); } // @@ -167,23 +167,23 @@ RemoteCommunicatorFactoryI::createCommunicator(const Ice::PropertyDict& props, c // // Install a custom admin facet. // - communicator->addAdminFacet(new TestFacetI, "TestFacet"); + communicator->addAdminFacet(ICE_MAKE_SHARED(TestFacetI), "TestFacet"); // // The RemoteCommunicator servant also implements PropertiesAdminUpdateCallback. // Set the callback on the admin facet. // - RemoteCommunicatorIPtr servant = new RemoteCommunicatorI(communicator); + RemoteCommunicatorIPtr servant = ICE_MAKE_SHARED(RemoteCommunicatorI, communicator); Ice::ObjectPtr propFacet = communicator->findAdminFacet("Properties"); if(propFacet) { - Ice::NativePropertiesAdminPtr admin = Ice::NativePropertiesAdminPtr::dynamicCast(propFacet); + Ice::NativePropertiesAdminPtr admin = ICE_DYNAMIC_CAST(Ice::NativePropertiesAdmin, propFacet); assert(admin); admin->addUpdateCallback(servant); } - Ice::ObjectPrx proxy = current.adapter->addWithUUID(servant); - return Test::RemoteCommunicatorPrx::uncheckedCast(proxy); + Ice::ObjectPrxPtr proxy = current.adapter->addWithUUID(servant); + return ICE_UNCHECKED_CAST(Test::RemoteCommunicatorPrx, proxy); } void diff --git a/cpp/test/Ice/admin/TestI.h b/cpp/test/Ice/admin/TestI.h index aa8e913bb22..6539b48153d 100644 --- a/cpp/test/Ice/admin/TestI.h +++ b/cpp/test/Ice/admin/TestI.h @@ -21,7 +21,7 @@ public: RemoteCommunicatorI(const Ice::CommunicatorPtr&); - virtual Ice::ObjectPrx getAdmin(const Ice::Current&); + virtual Ice::ObjectPrxPtr getAdmin(const Ice::Current&); virtual Ice::PropertyDict getChanges(const Ice::Current&); virtual void print(const std::string&, const Ice::Current&); @@ -41,13 +41,13 @@ private: Ice::PropertyDict _changes; bool _called; }; -typedef IceUtil::Handle<RemoteCommunicatorI> RemoteCommunicatorIPtr; +ICE_DEFINE_PTR(RemoteCommunicatorIPtr, RemoteCommunicatorI); class RemoteCommunicatorFactoryI : public Test::RemoteCommunicatorFactory { public: - virtual Test::RemoteCommunicatorPrx createCommunicator(const Ice::PropertyDict&, const Ice::Current&); + virtual Test::RemoteCommunicatorPrxPtr createCommunicator(const Ice::PropertyDict&, const Ice::Current&); virtual void shutdown(const Ice::Current&); }; diff --git a/cpp/test/Ice/ami/.depend.mak b/cpp/test/Ice/ami/.depend.mak index f9e651d5545..775d41b05d0 100755 --- a/cpp/test/Ice/ami/.depend.mak +++ b/cpp/test/Ice/ami/.depend.mak @@ -20,6 +20,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" \ @@ -28,6 +29,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" \ @@ -62,7 +64,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" \ @@ -71,13 +73,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\BuiltinSequences.h" \ "$(includedir)\Ice\Endpoint.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -103,6 +105,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" \ @@ -111,6 +114,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" \ @@ -151,7 +155,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" \ @@ -165,6 +169,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" \ @@ -176,7 +181,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" \ @@ -199,7 +203,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" \ @@ -231,6 +234,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" \ @@ -239,6 +243,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" \ @@ -279,7 +284,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" \ @@ -293,6 +298,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" \ @@ -304,7 +310,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" \ @@ -327,7 +332,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" \ @@ -359,6 +363,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" \ @@ -367,6 +372,7 @@ TestI.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" \ @@ -401,7 +407,7 @@ TestI.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" \ @@ -410,13 +416,13 @@ TestI.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\BuiltinSequences.h" \ "$(includedir)\Ice\Endpoint.h" \ "$(includedir)\Ice\Ice.h" \ @@ -458,7 +464,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" \ @@ -484,6 +489,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" \ @@ -492,6 +498,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" \ @@ -532,7 +539,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" \ @@ -546,6 +553,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" \ @@ -557,7 +565,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" \ @@ -580,7 +587,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" \ @@ -613,6 +619,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" \ @@ -621,6 +628,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" \ @@ -661,7 +669,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" \ @@ -675,6 +683,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" \ @@ -686,7 +695,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" \ @@ -709,7 +717,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/ami/AllTests.cpp b/cpp/test/Ice/ami/AllTests.cpp index 7ae4514bb09..c122840bff9 100644 --- a/cpp/test/Ice/ami/AllTests.cpp +++ b/cpp/test/Ice/ami/AllTests.cpp @@ -17,6 +17,9 @@ using namespace std; namespace { +enum ThrowType { LocalException, UserException, StandardException, OtherException }; + +#ifndef ICE_CPP11_MAPPING struct Cookie : public Ice::LocalObject { Cookie(int i) : val(i) @@ -735,8 +738,6 @@ private: }; typedef IceUtil::Handle<FlushExCallback> FlushExCallbackPtr; -enum ThrowType { LocalException, UserException, StandardException, OtherException }; - class Thrower : public CallbackBase { public: @@ -829,7 +830,7 @@ private: } case OtherException: { - throw 99; + throw 99; break; } default: @@ -843,12 +844,1215 @@ private: ThrowType _t; }; typedef IceUtil::Handle<Thrower> ThrowerPtr; +#endif } void allTests(const Ice::CommunicatorPtr& communicator, bool collocated) { +#ifdef ICE_CPP11_MAPPING + string sref = "test:default -p 12010"; + auto obj = communicator->stringToProxy(sref); + test(obj); + + auto p = Ice::uncheckedCast<Test::TestIntfPrx>(obj); + + sref = "testController:default -p 12011"; + obj = communicator->stringToProxy(sref); + test(obj); + + auto testController = Ice::uncheckedCast<Test::TestIntfControllerPrx>(obj); + + Ice::Context ctx; + cout << "testing begin/end invocation... " << flush; + { + { + promise<bool> promise; + p->ice_isA_async(Test::TestIntf::ice_staticId(), + [&](bool value) + { + promise.set_value(value); + }, + [&](const exception_ptr& ex) + { + promise.set_exception(ex); + }); + test(promise.get_future().get()); + } + + { + promise<bool> promise; + p->ice_isA_async(Test::TestIntf::ice_staticId(), + [&](bool value) + { + promise.set_value(value); + }, + [&](const exception_ptr& ex) + { + promise.set_exception(ex); + }, + nullptr, ctx); + test(promise.get_future().get()); + } + + { + promise<void> promise; + p->ice_ping_async( + [&]() + { + promise.set_value(); + }, + [&](const exception_ptr& ex) + { + promise.set_exception(ex); + }); + promise.get_future().get(); + } + + { + promise<void> promise; + p->ice_ping_async( + [&]() + { + promise.set_value(); + }, + [&](const exception_ptr& ex) + { + promise.set_exception(ex); + }, + nullptr, ctx); + promise.get_future().get(); + } + + { + promise<string> promise; + p->ice_id_async( + [&](const string& id) + { + promise.set_value(id); + }, + [&](const exception_ptr& ex) + { + promise.set_exception(ex); + }); + test(promise.get_future().get() == Test::TestIntf::ice_staticId()); + } + + { + promise<string> promise; + p->ice_id_async( + [&](const string& id) + { + promise.set_value(id); + }, + [&](const exception_ptr& ex) + { + promise.set_exception(ex); + }, + nullptr, ctx); + test(promise.get_future().get() == Test::TestIntf::ice_staticId()); + } + + { + promise<vector<string>> promise; + p->ice_ids_async( + [&](const vector<string>& ids) + { + promise.set_value(ids); + }, + [&](const exception_ptr& ex) + { + promise.set_exception(ex); + }); + test(promise.get_future().get().size() == 2); + } + + { + promise<vector<string>> promise; + p->ice_ids_async( + [&](const vector<string>& ids) + { + promise.set_value(ids); + }, + [&](const exception_ptr& ex) + { + promise.set_exception(ex); + }, + nullptr, ctx); + test(promise.get_future().get().size() == 2); + } + + if(!collocated) + { + promise<Ice::ConnectionPtr> promise; + p->ice_getConnection_async( + [&](const Ice::ConnectionPtr& connection) + { + promise.set_value(connection); + }, + [&](const exception_ptr& ex) + { + promise.set_exception(ex); + }); + test(promise.get_future().get()); + } + + { + promise<void> promise; + p->op_async( + [&]() + { + promise.set_value(); + }, + [&](const exception_ptr& ex) + { + promise.set_exception(ex); + }); + promise.get_future().get(); + } + + { + promise<void> promise; + p->op_async( + [&]() + { + promise.set_value(); + }, + [&](const exception_ptr& ex) + { + promise.set_exception(ex); + }, + nullptr, ctx); + promise.get_future().get(); + } + + { + promise<int> promise; + p->opWithResult_async( + [&](int result) + { + promise.set_value(result); + }, + [&](const exception_ptr& ex) + { + promise.set_exception(ex); + }); + test(promise.get_future().get() == 15); + } + + { + promise<int> promise; + p->opWithResult_async( + [&](int result) + { + promise.set_value(result); + }, + [&](const exception_ptr& ex) + { + promise.set_exception(ex); + }, + nullptr, ctx); + test(promise.get_future().get() == 15); + } + + { + promise<void> promise; + p->opWithUE_async( + [&]() + { + promise.set_value(); + }, + [&](const exception_ptr& ex) + { + promise.set_exception(ex); + }); + + try + { + promise.get_future().get(); + test(false); + } + catch(const Test::TestIntfException&) + { + } + } + + { + promise<void> promise; + p->opWithUE_async( + [&]() + { + promise.set_value(); + }, + [&](const exception_ptr& ex) + { + promise.set_exception(ex); + }, + nullptr, ctx); + + try + { + promise.get_future().get(); + test(false); + } + catch(const Test::TestIntfException&) + { + } + } + } + cout << "ok" << endl; + + cout << "testing future API... " << flush; + { + + test(p->ice_isA_async(Test::TestIntf::ice_staticId()).get()); + test(p->ice_isA_async(Test::TestIntf::ice_staticId(), ctx).get()); + + p->ice_ping_async().get(); + p->ice_ping_async(ctx).get(); + + test(p->ice_ids_async().get().size() == 2); + test(p->ice_ids_async(ctx).get().size() == 2); + + if(!collocated) + { + test(p->ice_getConnection_async().get()); + } + + p->op_async().get(); + p->op_async(ctx).get(); + + test(p->opWithResult_async().get() == 15); + test(p->opWithResult_async(ctx).get() == 15); + + + try + { + p->opWithUE_async().get(); + test(false); + } + catch(const Test::TestIntfException&) + { + } + + try + { + p->opWithUE_async(ctx).get(); + test(false); + } + catch(const Test::TestIntfException&) + { + } + } + cout << "ok" << endl; + + cout << "testing local exceptions... " << flush; + { + auto indirect = Ice::uncheckedCast<Test::TestIntfPrx>(p->ice_adapterId("dummy")); + + { + promise<void> promise; + indirect->op_async( + [&]() + { + promise.set_value(); + }, + [&](const exception_ptr& ex) + { + promise.set_exception(ex); + }); + try + { + promise.get_future().get(); + test(false); + } + catch(const Ice::NoEndpointException&) + { + } + } + + { + try + { + promise<int> promise; + p->ice_oneway()->opWithResult_async( + [&](int value) + { + promise.set_value(value); + }, + [&](const exception_ptr& ex) + { + promise.set_exception(ex); + }); + test(false); + } + catch(const IceUtil::IllegalArgumentException&) + { + } + } + + // + // Check that CommunicatorDestroyedException is raised directly. + // + if(p->ice_getConnection()) + { + Ice::InitializationData initData; + initData.properties = communicator->getProperties()->clone(); + Ice::CommunicatorPtr ic = Ice::initialize(initData); + auto obj = ic->stringToProxy(p->ice_toString()); + auto p2 = Ice::checkedCast<Test::TestIntfPrx>(obj); + ic->destroy(); + + try + { + promise<void> promise; + p2->op_async( + [&]() + { + promise.set_value(); + }, + [&](const exception_ptr& ex) + { + promise.set_exception(ex); + }); + test(false); + } + catch(const Ice::CommunicatorDestroyedException&) + { + // Expected. + } + } + } + cout << "ok" << endl; + + cout << "testing local exceptions with future API... " << flush; + { + auto indirect = Ice::uncheckedCast<Test::TestIntfPrx>(p->ice_adapterId("dummy")); + auto r = indirect->op_async(); + try + { + r.get(); + test(false); + } + catch(const Ice::NoEndpointException&) + { + } + + + try + { + p->ice_oneway()->opWithResult_async().get(); + test(false); + } + catch(const IceUtil::IllegalArgumentException&) + { + } + + // + // Check that CommunicatorDestroyedException is raised directly. + // + if(p->ice_getConnection()) + { + Ice::InitializationData initData; + initData.properties = communicator->getProperties()->clone(); + Ice::CommunicatorPtr ic = Ice::initialize(initData); + auto obj = ic->stringToProxy(p->ice_toString()); + auto p2 = Ice::checkedCast<Test::TestIntfPrx>(obj); + ic->destroy(); + + try + { + p2->op_async(); + test(false); + } + catch(const Ice::CommunicatorDestroyedException&) + { + // Expected. + } + } + } + cout << "ok" << endl; + + cout << "testing exception callback... " << flush; + { + auto i = Ice::uncheckedCast<Test::TestIntfPrx>(p->ice_adapterId("dummy")); + + { + promise<bool> promise; + i->ice_isA_async(Test::TestIntf::ice_staticId(), + [&](bool value) + { + promise.set_value(value); + }, + [&](const exception_ptr& ex) + { + promise.set_exception(ex); + }); + try + { + promise.get_future().get(); + test(false); + } + catch(const Ice::NoEndpointException&) + { + } + } + + { + promise<void> promise; + i->op_async( + [&]() + { + promise.set_value(); + }, + [&](const exception_ptr& ex) + { + promise.set_exception(ex); + }); + + try + { + promise.get_future().get(); + test(false); + } + catch(const Ice::NoEndpointException&) + { + } + } + + { + promise<void> promise; + i->opWithUE_async( + [&]() + { + promise.set_value(); + }, + [&](const exception_ptr& ex) + { + promise.set_exception(ex); + }); + + try + { + promise.get_future().get(); + test(false); + } + catch(const Ice::NoEndpointException&) + { + } + } + + // Ensures no exception is called when response is received + { + promise<bool> promise; + p->ice_isA_async( + Test::TestIntf::ice_staticId(), + [&](bool value) + { + promise.set_value(value); + }, + [&](const exception_ptr& ex) + { + promise.set_exception(ex); + }); + try + { + test(promise.get_future().get()); + } + catch(...) + { + test(false); + } + } + + { + promise<void> promise; + p->op_async( + [&]() + { + promise.set_value(); + }, + [&](const exception_ptr& ex) + { + promise.set_exception(ex); + }); + try + { + promise.get_future().get(); + } + catch(...) + { + test(false); + } + } + + // If response is a user exception, it should be received. + { + promise<void> promise; + p->opWithUE_async( + [&]() + { + promise.set_value(); + }, + [&](const exception_ptr& ex) + { + promise.set_exception(ex); + }); + + try + { + promise.get_future().get(); + test(false); + } + catch(const Test::TestIntfException&) + { + } + } + } + cout << "ok" << endl; + + cout << "testing sent callback... " << flush; + { + { + promise<bool> response; + promise<bool> sent; + + p->ice_isA_async("", + [&](bool value) + { + response.set_value(value); + }, + [&](const exception_ptr& ex) + { + response.set_exception(ex); + }, + [&](bool sentAsync) + { + sent.set_value(sentAsync); + }); + + sent.get_future().get(); + response.get_future().get(); + } + + { + promise<void> response; + promise<bool> sent; + + p->ice_ping_async( + [&]() + { + response.set_value(); + }, + [&](const exception_ptr& ex) + { + response.set_exception(ex); + }, + [&](bool sentAsync) + { + sent.set_value(sentAsync); + }); + + sent.get_future().get(); + response.get_future().get(); + } + + { + promise<string> response; + promise<bool> sent; + + p->ice_id_async( + [&](string value) + { + response.set_value(value); + }, + [&](const exception_ptr& ex) + { + response.set_exception(ex); + }, + [&](bool sentAsync) + { + sent.set_value(sentAsync); + }); + + sent.get_future().get(); + response.get_future().get(); + } + + { + promise<vector<string>> response; + promise<bool> sent; + + p->ice_ids_async( + [&](vector<string> value) + { + response.set_value(value); + }, + [&](const exception_ptr& ex) + { + response.set_exception(ex); + }, + [&](bool sentAsync) + { + sent.set_value(sentAsync); + }); + + sent.get_future().get(); + response.get_future().get(); + } + + { + promise<void> response; + promise<bool> sent; + + p->op_async( + [&]() + { + response.set_value(); + }, + [&](const exception_ptr& ex) + { + response.set_exception(ex); + }, + [&](bool sentAsync) + { + sent.set_value(sentAsync); + }); + + sent.get_future().get(); + response.get_future().get(); + } + + vector<future<bool>> futures; + Ice::ByteSeq seq; + seq.resize(1024); + testController->holdAdapter(); + try + { + while(true) + { + promise<bool> promise; + p->opWithPayload_async( + seq, + []() + { + }, + [&](const exception_ptr& ex) + { + promise.set_exception(ex); + }, + [&](bool sentAsync) + { + promise.set_value(sentAsync); + }); + future<bool> future = promise.get_future(); + if(!future.get()) + { + break; + } + futures.push_back(move(future)); + } + } + catch(...) + { + testController->resumeAdapter(); + throw; + } + testController->resumeAdapter(); + } + cout << "ok" << endl; + + auto thrower = [](ThrowType t) + { + switch(t) + { + case LocalException: + { + throw Ice::ObjectNotExistException(__FILE__, __LINE__); + break; + } + case UserException: + { + throw Test::TestIntfException(); + break; + } + case StandardException: + { + throw ::std::bad_alloc(); + break; + } + case OtherException: + { + throw 99; + break; + } + default: + { + assert(false); + break; + } + } + }; + + cout << "testing unexpected exceptions from callback... " << flush; + { + auto q = Ice::uncheckedCast<Test::TestIntfPrx>(p->ice_adapterId("dummy")); + ThrowType throwEx[] = { LocalException, UserException, StandardException, OtherException }; + + for(int i = 0; i < 4; ++i) + { + { + promise<void> promise; + p->op_async( + [&, i]() + { + promise.set_value(); + thrower(throwEx[i]); + }, + [&](const exception_ptr& ex) + { + test(false); + }); + + try + { + promise.get_future().get(); + } + catch(const exception& ex) + { + cerr << ex.what() << endl; + test(false); + } + } + + { + promise<void> promise; + p->op_async( + [&]() + { + }, + [&, i](const exception_ptr&) + { + test(false); + }, + [&, i](bool) + { + promise.set_value(); + thrower(throwEx[i]); + }); + + try + { + promise.get_future().get(); + } + catch(const exception&) + { + test(false); + } + } + } + } + cout << "ok" << endl; + + cout << "testing batch requests with proxy... " << flush; + { + { + test(p->opBatchCount() == 0); + auto b1 = p->ice_batchOneway(); + b1->opBatch(); + b1->opBatch(); + auto id = this_thread::get_id(); + promise<void> promise; + b1->ice_flushBatchRequests_async( + [&](const exception_ptr& ex) + { + promise.set_exception(ex); + }, + [&](bool sentSynchronously) + { + test((sentSynchronously && id == this_thread::get_id()) || + (!sentSynchronously && id != this_thread::get_id())); + promise.set_value(); + }); + promise.get_future().get(); + test(p->waitForBatch(2)); + } + + if(p->ice_getConnection()) + { + test(p->opBatchCount() == 0); + auto b1 = p->ice_batchOneway(); + b1->opBatch(); + b1->ice_getConnection()->close(false); + + auto id = this_thread::get_id(); + promise<void> promise; + b1->ice_flushBatchRequests_async( + [&](const exception_ptr& ex) + { + promise.set_exception(ex); + }, + [&](bool sentSynchronously) + { + test((sentSynchronously && id == this_thread::get_id()) || + (!sentSynchronously && id != this_thread::get_id())); + promise.set_value(); + }); + promise.get_future().get(); + test(p->waitForBatch(1)); + } + } + cout << "ok" << endl; + + if(p->ice_getConnection()) // No collocation optimization + { + cout << "testing batch requests with connection... " << flush; + { + { + test(p->opBatchCount() == 0); + auto b1 = Ice::uncheckedCast<Test::TestIntfPrx>( + p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); + b1->opBatch(); + b1->opBatch(); + + auto id = this_thread::get_id(); + promise<void> promise; + + b1->ice_getConnection()->flushBatchRequests_async( + nullptr, + [&](const exception_ptr& ex) + { + promise.set_exception(ex); + }, + [&](bool sentSynchronously) + { + test((sentSynchronously && id == this_thread::get_id()) || + (!sentSynchronously && id != this_thread::get_id())); + promise.set_value(); + }); + promise.get_future().get(); + test(p->waitForBatch(2)); + } + + { + // Ensure it also works with a twoway proxy + auto id = this_thread::get_id(); + promise<void> promise; + p->ice_getConnection()->flushBatchRequests_async( + nullptr, + [&](const exception_ptr& ex) + { + promise.set_exception(ex); + }, + [&](bool sentSynchronously) + { + test((sentSynchronously && id == this_thread::get_id()) || + (!sentSynchronously && id != this_thread::get_id())); + promise.set_value(); + }); + promise.get_future().get(); + } + + { + test(p->opBatchCount() == 0); + auto b1 = Ice::uncheckedCast<Test::TestIntfPrx>( + p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); + b1->opBatch(); + b1->ice_getConnection()->close(false); + + promise<void> promise; + b1->ice_getConnection()->flushBatchRequests_async( + nullptr, + [&](exception_ptr ex) + { + promise.set_exception(move(ex)); + }, + [&](bool) + { + promise.set_value(); + }); + + try + { + promise.get_future().get(); + test(false); + } + catch(const Ice::LocalException&) + { + } + test(p->opBatchCount() == 0); + } + } + cout << "ok" << endl; + + cout << "testing batch requests with communicator... " << flush; + { + { + // + // 1 connection. + // + test(p->opBatchCount() == 0); + auto b1 = Ice::uncheckedCast<Test::TestIntfPrx>( + p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); + b1->opBatch(); + b1->opBatch(); + + promise<void> promise; + auto id = this_thread::get_id(); + communicator->flushBatchRequests_async( + nullptr, + [&](exception_ptr ex) + { + promise.set_exception(move(ex)); + }, + [&](bool sentSynchronously) + { + test((sentSynchronously && id == this_thread::get_id()) || + (!sentSynchronously && id != this_thread::get_id())); + promise.set_value(); + }); + promise.get_future().get(); + test(p->waitForBatch(2)); + } + + { + // + // Exception - 1 connection. + // + test(p->opBatchCount() == 0); + auto b1 = Ice::uncheckedCast<Test::TestIntfPrx>( + p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); + b1->opBatch(); + b1->ice_getConnection()->close(false); + + promise<void> promise; + auto id = this_thread::get_id(); + communicator->flushBatchRequests_async( + nullptr, + [&](exception_ptr ex) + { + promise.set_exception(move(ex)); + }, + [&](bool sentSynchronously) + { + test((sentSynchronously && id == this_thread::get_id()) || + (!sentSynchronously && id != this_thread::get_id())); + promise.set_value(); + }); + promise.get_future().get(); // Exceptions are ignored! + test(p->opBatchCount() == 0); + } + + { + // + // 2 connections. + // + test(p->opBatchCount() == 0); + auto b1 = Ice::uncheckedCast<Test::TestIntfPrx>( + p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); + auto b2 = Ice::uncheckedCast<Test::TestIntfPrx>( + p->ice_connectionId("2")->ice_getConnection()->createProxy( + p->ice_getIdentity())->ice_batchOneway()); + b2->ice_getConnection(); // Ensure connection is established. + b1->opBatch(); + b1->opBatch(); + b2->opBatch(); + b2->opBatch(); + + promise<void> promise; + auto id = this_thread::get_id(); + communicator->flushBatchRequests_async( + nullptr, + [&](exception_ptr ex) + { + promise.set_exception(move(ex)); + }, + [&](bool sentSynchronously) + { + test((sentSynchronously && id == this_thread::get_id()) || + (!sentSynchronously && id != this_thread::get_id())); + promise.set_value(); + }); + promise.get_future().get(); + test(p->waitForBatch(4)); + } + + { + // + // 2 connections - 2 failures. + // + // The sent callback should be invoked even if all connections fail. + // + test(p->opBatchCount() == 0); + auto b1 = Ice::uncheckedCast<Test::TestIntfPrx>( + p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway()); + auto b2 = Ice::uncheckedCast<Test::TestIntfPrx>( + p->ice_connectionId("2")->ice_getConnection()->createProxy( + p->ice_getIdentity())->ice_batchOneway()); + + b2->ice_getConnection(); // Ensure connection is established. + b1->opBatch(); + b2->opBatch(); + b1->ice_getConnection()->close(false); + b2->ice_getConnection()->close(false); + + promise<void> promise; + auto id = this_thread::get_id(); + communicator->flushBatchRequests_async( + nullptr, + [&](exception_ptr ex) + { + promise.set_exception(move(ex)); + }, + [&](bool sentSynchronously) + { + test((sentSynchronously && id == this_thread::get_id()) || + (!sentSynchronously && id != this_thread::get_id())); + promise.set_value(); + }); + promise.get_future().get(); // Exceptions are ignored! + test(p->opBatchCount() == 0); + } + } + cout << "ok" << endl; + + cout << "testing cancel operations... " << flush; + { + if(p->ice_getConnection()) + { + testController->holdAdapter(); + { + promise<void> promise; + auto cancel = p->ice_ping_async( + [&]() + { + promise.set_value(); + }, + [&](exception_ptr ex) + { + promise.set_exception(ex); + }); + cancel(); + + try + { + promise.get_future().get(); + test(false); + } + catch(const Ice::InvocationCanceledException&) + { + } + catch(...) + { + testController->resumeAdapter(); + throw; + } + } + + { + promise<void> promise; + auto cancel = p->ice_id_async( + [&](string) + { + promise.set_value(); + }, + [&](exception_ptr ex) + { + promise.set_exception(ex); + }); + cancel(); + + try + { + promise.get_future().get(); + test(false); + } + catch(const Ice::InvocationCanceledException&) + { + } + catch(...) + { + testController->resumeAdapter(); + throw; + } + } + testController->resumeAdapter(); + } + } + cout << "ok" << endl; +// +// TODO port this to use the C++11 callback API +// +// if(p->ice_getConnection()) +// { +// cout << "testing close connection with sending queue... " << flush; +// { +// Ice::ByteSeq seq; +// seq.resize(1024 * 10); +// for(Ice::ByteSeq::iterator q = seq.begin(); q != seq.end(); ++q) +// { +// *q = static_cast<Ice::Byte>(IceUtilInternal::random(255)); +// } +// +// +// Send multiple opWithPayload, followed by a close and followed by multiple opWithPaylod. +// The goal is to make sure that none of the opWithPayload fail even if the server closes +// the connection gracefully in between. +// +// int maxQueue = 2; +// bool done = false; +// while(!done && maxQueue < 5000) +// { +// done = true; +// p->ice_ping(); +// vector<Ice::AsyncResultPtr> results; +// for(int i = 0; i < maxQueue; ++i) +// { +// results.push_back(p->begin_opWithPayload(seq)); +// } +// if(!p->begin_close(false)->isSent()) +// { +// for(int i = 0; i < maxQueue; i++) +// { +// Ice::AsyncResultPtr r = p->begin_opWithPayload(seq); +// results.push_back(r); +// if(r->isSent()) +// { +// done = false; +// maxQueue *= 2; +// break; +// } +// } +// } +// else +// { +// maxQueue *= 2; +// done = false; +// } +// +// cerr << maxQueue << endl; +// for(vector<Ice::AsyncResultPtr>::const_iterator p = results.begin(); p != results.end(); ++p) +// { +// (*p)->waitForCompleted(); +// try +// { +// (*p)->throwLocalException(); +// } +// catch(const Ice::LocalException&) +// { +// test(false); +// } +// } +// } +// } +// cout << "ok" << endl; +// } + + } + + p->shutdown(); +#else string sref = "test:default -p 12010"; Ice::ObjectPrx obj = communicator->stringToProxy(sref); test(obj); @@ -1003,7 +2207,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) } cout << "ok" << endl; -#ifdef ICE_CPP11 +#ifdef ICE_CPP11_COMPILER cout << "testing C++11 async callback... " << flush; { AsyncCallbackPtr cb = new AsyncCallback(); @@ -1148,7 +2352,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) } cout << "ok" << endl; -#ifdef ICE_CPP11 +#ifdef ICE_CPP11_COMPILER cout << "testing C++11 response callback... " << flush; { ResponseCallbackPtr cb = new ResponseCallback(); @@ -1342,7 +2546,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) } cout << "ok" << endl; -#ifdef ICE_CPP11 +#ifdef ICE_CPP11_COMPILER cout << "testing local exceptions with C++11 response callback... " << flush; { Test::TestIntfPrx i = Test::TestIntfPrx::uncheckedCast(p->ice_adapterId("dummy")); @@ -1422,7 +2626,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) } cout << "ok" << endl; -#ifdef ICE_CPP11 +#ifdef ICE_CPP11_COMPILER cout << "testing C++11 exception callback... " << flush; { Test::TestIntfPrx i = Test::TestIntfPrx::uncheckedCast(p->ice_adapterId("dummy")); @@ -1530,7 +2734,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) } cout << "ok" << endl; -#ifdef ICE_CPP11 +#ifdef ICE_CPP11_COMPILER cout << "testing C++11 sent callback... " << flush; { SentCallbackPtr cb = new SentCallback; @@ -1746,7 +2950,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) } cout << "ok" << endl; -#ifdef ICE_CPP11 +#ifdef ICE_CPP11_COMPILER cout << "testing unexpected exceptions from C++11 callback... " << flush; { Test::TestIntfPrx q = Test::TestIntfPrx::uncheckedCast(p->ice_adapterId("dummy")); @@ -1917,7 +3121,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) } cout << "ok" << endl; -#ifdef ICE_CPP11 +#ifdef ICE_CPP11_COMPILER cout << "testing C++11 batch requests with proxy... " << flush; { @@ -2111,7 +3315,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) } cout << "ok" << endl; -#ifdef ICE_CPP11 +#ifdef ICE_CPP11_COMPILER cout << "testing C++11 batch requests with connection... " << flush; { if(p->ice_getConnection()) @@ -2463,7 +3667,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) } cout << "ok" << endl; -#ifdef ICE_CPP11 +#ifdef ICE_CPP11_COMPILER cout << "testing C++11 batch requests with communicator... " << flush; { { @@ -2802,7 +4006,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) // int maxQueue = 2; bool done = false; - while(!done && maxQueue < 50) + while(!done && maxQueue < 5000) { done = true; p->ice_ping(); @@ -2830,6 +4034,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) maxQueue *= 2; done = false; } + for(vector<Ice::AsyncResultPtr>::const_iterator p = results.begin(); p != results.end(); ++p) { (*p)->waitForCompleted(); @@ -2847,4 +4052,5 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated) cout << "ok" << endl; } p->shutdown(); +#endif } diff --git a/cpp/test/Ice/ami/Collocated.cpp b/cpp/test/Ice/ami/Collocated.cpp index d1cc8f97a87..2ca1426f036 100644 --- a/cpp/test/Ice/ami/Collocated.cpp +++ b/cpp/test/Ice/ami/Collocated.cpp @@ -26,9 +26,9 @@ run(int, char**, const Ice::CommunicatorPtr& communicator, Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectAdapterPtr adapter2 = communicator->createObjectAdapter("ControllerAdapter"); - TestIntfControllerIPtr testController = new TestIntfControllerI(adapter); + TestIntfControllerIPtr testController = ICE_MAKE_SHARED(TestIntfControllerI, adapter); - adapter->add(new TestIntfI(), communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(TestIntfI), communicator->stringToIdentity("test")); //adapter->activate(); // Collocated test doesn't need to activate the OA adapter2->add(testController, communicator->stringToIdentity("testController")); diff --git a/cpp/test/Ice/ami/Server.cpp b/cpp/test/Ice/ami/Server.cpp index 52553ba29d8..91485d90e0e 100644 --- a/cpp/test/Ice/ami/Server.cpp +++ b/cpp/test/Ice/ami/Server.cpp @@ -25,9 +25,9 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectAdapterPtr adapter2 = communicator->createObjectAdapter("ControllerAdapter"); - TestIntfControllerIPtr testController = new TestIntfControllerI(adapter); + TestIntfControllerIPtr testController = ICE_MAKE_SHARED(TestIntfControllerI, adapter); - adapter->add(new TestIntfI(), communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(TestIntfI), communicator->stringToIdentity("test")); adapter->activate(); adapter2->add(testController, communicator->stringToIdentity("testController")); diff --git a/cpp/test/Ice/ami/TestI.h b/cpp/test/Ice/ami/TestI.h index b47d7be0d53..8e9a0128ee2 100644 --- a/cpp/test/Ice/ami/TestI.h +++ b/cpp/test/Ice/ami/TestI.h @@ -13,7 +13,7 @@ #include <Test.h> class TestIntfControllerI; -typedef IceUtil::Handle<TestIntfControllerI> TestIntfControllerIPtr; +ICE_DEFINE_PTR(TestIntfControllerIPtr, TestIntfControllerI); class TestIntfI : virtual public Test::TestIntf, public IceUtil::Monitor<IceUtil::Mutex> { diff --git a/cpp/test/Ice/background/.depend.mak b/cpp/test/Ice/background/.depend.mak index 15a6b85c5df..723fe082531 100755 --- a/cpp/test/Ice/background/.depend.mak +++ b/cpp/test/Ice/background/.depend.mak @@ -20,6 +20,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" \ @@ -28,6 +29,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" \ @@ -62,7 +64,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" \ @@ -71,6 +73,7 @@ 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" \ @@ -78,7 +81,6 @@ Test.obj: \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Endpoint.h" \ "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -119,6 +121,7 @@ Configuration.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -126,6 +129,7 @@ Configuration.obj: \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -157,7 +161,7 @@ Configuration.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" \ @@ -206,6 +210,7 @@ Connector.obj: \ "$(includedir)\Ice\ProxyF.h" \ "$(includedir)\Ice\ProxyHandle.h" \ "$(includedir)\Ice\ObjectF.h" \ + "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ "$(includedir)\Ice\StreamF.h" \ @@ -213,6 +218,7 @@ Connector.obj: \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -244,7 +250,7 @@ Connector.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" \ @@ -263,6 +269,7 @@ Connector.obj: \ "..\..\..\src\Ice\AcceptorF.h" \ "Test.h" \ "$(includedir)\Ice\GCObject.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -290,6 +297,7 @@ Acceptor.obj: \ "$(includedir)\Ice\ProxyF.h" \ "$(includedir)\Ice\ProxyHandle.h" \ "$(includedir)\Ice\ObjectF.h" \ + "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ "$(includedir)\Ice\StreamF.h" \ @@ -298,6 +306,7 @@ Acceptor.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" \ @@ -332,7 +341,7 @@ Acceptor.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" \ @@ -349,6 +358,7 @@ Acceptor.obj: \ "Test.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" \ @@ -385,6 +395,7 @@ EndpointI.obj: \ "$(includedir)\Ice\ProxyF.h" \ "$(includedir)\Ice\ProxyHandle.h" \ "$(includedir)\Ice\ObjectF.h" \ + "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ "$(includedir)\Ice\StreamF.h" \ @@ -393,6 +404,7 @@ EndpointI.obj: \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\Ice\Version.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ @@ -432,7 +444,7 @@ EndpointI.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" \ @@ -441,6 +453,7 @@ EndpointI.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" \ @@ -487,6 +500,7 @@ Transceiver.obj: \ "$(includedir)\Ice\ProxyF.h" \ "$(includedir)\Ice\ProxyHandle.h" \ "$(includedir)\Ice\ObjectF.h" \ + "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ "$(includedir)\Ice\StreamF.h" \ @@ -495,6 +509,7 @@ Transceiver.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" \ @@ -533,7 +548,7 @@ Transceiver.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" \ @@ -584,6 +599,7 @@ EndpointFactory.obj: \ "$(includedir)\Ice\ProxyF.h" \ "$(includedir)\Ice\ProxyHandle.h" \ "$(includedir)\Ice\ObjectF.h" \ + "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ "$(includedir)\Ice\StreamF.h" \ @@ -592,6 +608,7 @@ EndpointFactory.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" \ @@ -629,7 +646,7 @@ EndpointFactory.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" \ @@ -638,6 +655,7 @@ EndpointFactory.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" \ @@ -683,6 +701,7 @@ PluginI.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -691,6 +710,7 @@ PluginI.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" \ @@ -718,7 +738,7 @@ PluginI.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" \ @@ -772,6 +792,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" \ @@ -780,6 +801,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" \ @@ -820,7 +842,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" \ @@ -834,6 +856,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" \ @@ -845,7 +868,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" \ @@ -868,7 +890,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" \ @@ -928,6 +949,7 @@ AllTests.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -935,6 +957,7 @@ AllTests.obj: \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -963,7 +986,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" \ @@ -976,6 +999,7 @@ AllTests.obj: \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -987,7 +1011,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" \ @@ -1009,7 +1032,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" \ @@ -1045,6 +1067,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" \ @@ -1053,6 +1076,7 @@ TestI.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" \ @@ -1087,7 +1111,7 @@ TestI.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" \ @@ -1096,6 +1120,7 @@ TestI.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" \ @@ -1135,7 +1160,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" \ @@ -1156,7 +1180,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" \ @@ -1182,6 +1205,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" \ @@ -1190,6 +1214,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" \ @@ -1230,7 +1255,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" \ @@ -1244,6 +1269,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" \ @@ -1255,7 +1281,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" \ @@ -1278,7 +1303,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" \ diff --git a/cpp/test/Ice/binding/.depend.mak b/cpp/test/Ice/binding/.depend.mak index cb2d0107ae0..18a8a89bb98 100755 --- a/cpp/test/Ice/binding/.depend.mak +++ b/cpp/test/Ice/binding/.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\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -96,6 +98,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" \ @@ -104,6 +107,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" \ @@ -144,7 +148,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" \ @@ -158,6 +162,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" \ @@ -169,7 +174,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" \ @@ -192,7 +196,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" \ @@ -225,6 +228,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\Handle.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" \ @@ -233,6 +237,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" \ @@ -273,7 +278,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" \ @@ -287,6 +292,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" \ @@ -298,7 +304,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" \ @@ -321,7 +326,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" \ @@ -353,6 +357,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" \ @@ -361,6 +366,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" \ @@ -401,7 +407,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" \ @@ -415,6 +421,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" \ @@ -426,7 +433,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" \ @@ -449,7 +455,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" \ @@ -477,6 +482,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" \ @@ -485,6 +491,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" \ @@ -525,7 +532,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" \ @@ -539,6 +546,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" \ @@ -550,7 +558,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" \ @@ -573,7 +580,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" \ diff --git a/cpp/test/Ice/checksum/.depend.mak b/cpp/test/Ice/checksum/.depend.mak index 14cb5bb9697..9b011f090ef 100755 --- a/cpp/test/Ice/checksum/.depend.mak +++ b/cpp/test/Ice/checksum/.depend.mak @@ -20,6 +20,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" \ @@ -28,6 +29,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" \ @@ -62,7 +64,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" \ @@ -71,6 +73,7 @@ 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" \ @@ -78,7 +81,6 @@ Test.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -100,6 +102,7 @@ Types.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" \ @@ -108,6 +111,7 @@ Types.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" \ @@ -142,7 +146,7 @@ Types.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" \ @@ -151,13 +155,13 @@ Types.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" \ @@ -184,6 +188,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" \ @@ -192,6 +197,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" \ @@ -232,7 +238,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" \ @@ -246,6 +252,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" \ @@ -257,7 +264,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" \ @@ -280,7 +286,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" \ @@ -312,6 +317,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" \ @@ -320,6 +326,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" \ @@ -360,7 +367,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" \ @@ -374,6 +381,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" \ @@ -385,7 +393,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" \ @@ -408,7 +415,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" \ diff --git a/cpp/test/Ice/checksum/server/.depend.mak b/cpp/test/Ice/checksum/server/.depend.mak index 97ad822df9e..c258390bd20 100755 --- a/cpp/test/Ice/checksum/server/.depend.mak +++ b/cpp/test/Ice/checksum/server/.depend.mak @@ -20,6 +20,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" \ @@ -28,6 +29,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" \ @@ -62,7 +64,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" \ @@ -71,6 +73,7 @@ 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" \ @@ -78,7 +81,6 @@ Test.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -100,6 +102,7 @@ Types.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" \ @@ -108,6 +111,7 @@ Types.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" \ @@ -142,7 +146,7 @@ Types.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" \ @@ -151,13 +155,13 @@ Types.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" \ @@ -184,6 +188,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" \ @@ -192,6 +197,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" \ @@ -232,7 +238,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" \ @@ -246,6 +252,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" \ @@ -257,7 +264,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" \ @@ -280,7 +286,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" \ @@ -308,6 +313,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" \ @@ -316,6 +322,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" \ @@ -356,7 +363,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" \ @@ -370,6 +377,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" \ @@ -381,7 +389,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" \ @@ -404,7 +411,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" \ diff --git a/cpp/test/Ice/custom/.depend.mak b/cpp/test/Ice/custom/.depend.mak index faef600cfab..a4631617e10 100755 --- a/cpp/test/Ice/custom/.depend.mak +++ b/cpp/test/Ice/custom/.depend.mak @@ -25,6 +25,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" \ @@ -33,6 +34,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" \ @@ -67,7 +69,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" \ @@ -76,13 +78,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" \ "MyByteSeq.h" \ "CustomMap.h" \ "CustomBuffer.h" \ @@ -128,7 +130,6 @@ Test.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" \ @@ -153,6 +154,7 @@ Wstring.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" \ @@ -161,6 +163,7 @@ Wstring.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" \ @@ -195,7 +198,7 @@ Wstring.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" \ @@ -204,13 +207,13 @@ Wstring.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" \ @@ -235,6 +238,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" \ @@ -243,6 +247,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" \ @@ -283,7 +288,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" \ @@ -297,6 +302,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" \ @@ -308,7 +314,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" \ @@ -331,7 +336,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" \ @@ -368,6 +372,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" \ @@ -376,6 +381,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" \ @@ -416,7 +422,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" \ @@ -430,6 +436,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" \ @@ -441,7 +448,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" \ @@ -464,7 +470,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" \ @@ -515,6 +520,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" \ @@ -523,6 +529,7 @@ TestI.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" \ @@ -557,7 +564,7 @@ TestI.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" \ @@ -566,6 +573,7 @@ TestI.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" \ @@ -585,7 +593,6 @@ TestI.obj: \ "Test.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "MyByteSeq.h" \ "CustomMap.h" \ "CustomBuffer.h" \ @@ -619,7 +626,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" \ @@ -644,6 +650,7 @@ WstringI.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" \ @@ -652,6 +659,7 @@ WstringI.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" \ @@ -686,7 +694,7 @@ WstringI.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" \ @@ -695,13 +703,13 @@ WstringI.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" \ Server.obj: \ Server.cpp \ @@ -719,6 +727,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" \ @@ -727,6 +736,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" \ @@ -767,7 +777,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" \ @@ -781,6 +791,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" \ @@ -792,7 +803,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" \ @@ -815,7 +825,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" \ @@ -853,6 +862,7 @@ TestAMD.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" \ @@ -861,6 +871,7 @@ TestAMD.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" \ @@ -895,7 +906,7 @@ TestAMD.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" \ @@ -904,6 +915,7 @@ TestAMD.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" \ @@ -911,7 +923,6 @@ TestAMD.obj: \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "MyByteSeq.h" \ "CustomMap.h" \ "CustomBuffer.h" \ @@ -956,7 +967,6 @@ TestAMD.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" \ @@ -981,6 +991,7 @@ TestAMDI.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" \ @@ -989,6 +1000,7 @@ TestAMDI.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" \ @@ -1023,7 +1035,7 @@ TestAMDI.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" \ @@ -1032,6 +1044,7 @@ TestAMDI.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" \ @@ -1051,7 +1064,6 @@ TestAMDI.obj: \ "TestAMD.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "MyByteSeq.h" \ "CustomMap.h" \ "CustomBuffer.h" \ @@ -1085,7 +1097,6 @@ TestAMDI.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" \ @@ -1109,6 +1120,7 @@ WstringAMD.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" \ @@ -1117,6 +1129,7 @@ WstringAMD.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" \ @@ -1151,7 +1164,7 @@ WstringAMD.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" \ @@ -1160,6 +1173,7 @@ WstringAMD.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" \ @@ -1167,7 +1181,6 @@ WstringAMD.obj: \ "$(includedir)\Ice\IncomingAsync.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" \ @@ -1191,6 +1204,7 @@ WstringAMDI.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" \ @@ -1199,6 +1213,7 @@ WstringAMDI.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" \ @@ -1233,7 +1248,7 @@ WstringAMDI.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" \ @@ -1242,6 +1257,7 @@ WstringAMDI.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" \ @@ -1249,7 +1265,6 @@ WstringAMDI.obj: \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ ServerAMD.obj: \ ServerAMD.cpp \ @@ -1267,6 +1282,7 @@ ServerAMD.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" \ @@ -1275,6 +1291,7 @@ ServerAMD.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" \ @@ -1315,7 +1332,7 @@ ServerAMD.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" \ @@ -1329,6 +1346,7 @@ ServerAMD.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" \ @@ -1340,7 +1358,6 @@ ServerAMD.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" \ @@ -1363,7 +1380,6 @@ ServerAMD.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" \ @@ -1403,6 +1419,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" \ @@ -1411,6 +1428,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" \ @@ -1451,7 +1469,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" \ @@ -1465,6 +1483,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" \ @@ -1476,7 +1495,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" \ @@ -1499,7 +1517,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/custom/AllTests.cpp b/cpp/test/Ice/custom/AllTests.cpp index bb867f79cfa..1ba93ec0f39 100644 --- a/cpp/test/Ice/custom/AllTests.cpp +++ b/cpp/test/Ice/custom/AllTests.cpp @@ -2274,7 +2274,7 @@ allTests(const Ice::CommunicatorPtr& communicator) } cout << "ok" << endl; -#ifdef ICE_CPP11 +#ifdef ICE_CPP11_COMPILER cout << "testing alternate strings with new C++11 AMI callbacks... " << flush; { @@ -3120,7 +3120,7 @@ allTests(const Ice::CommunicatorPtr& communicator) } cout << "ok" << endl; -#ifdef ICE_CPP11 +#ifdef ICE_CPP11_COMPILER cout << "testing alternate dictionaries with new C++11 AMI callbacks... " << flush; { { @@ -3237,7 +3237,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cb->check(); } cout << "ok" << endl; -#ifdef ICE_CPP11 +#ifdef ICE_CPP11_COMPILER cout << "testing class mapped structs with C++11 AMI... " << flush; { CallbackPtr cb = new Callback(); @@ -3302,7 +3302,7 @@ allTests(const Ice::CommunicatorPtr& communicator) newInParam(wstr)); cb->check(); } -#ifdef ICE_CPP11 +#ifdef ICE_CPP11_COMPILER { CallbackPtr cb = new Callback(); wsc1->begin_opString(wstr, @@ -3341,7 +3341,7 @@ allTests(const Ice::CommunicatorPtr& communicator) &Callback::noEx), newInParam(wstr)); cb->check(); } -#ifdef ICE_CPP11 +#ifdef ICE_CPP11_COMPILER { CallbackPtr cb = new Callback(); wsc2->begin_opString(wstr, @@ -3397,7 +3397,7 @@ allTests(const Ice::CommunicatorPtr& communicator) wsc1->begin_throwExcept(wstr, Ice::newCallback(cb, &Callback::throwExcept1), newInParam(wstr)); cb->check(); } -#ifdef ICE_CPP11 +#ifdef ICE_CPP11_COMPILER { CallbackPtr cb = new Callback(); wsc1->begin_throwExcept(wstr, nullptr, @@ -3435,7 +3435,7 @@ allTests(const Ice::CommunicatorPtr& communicator) wsc2->begin_throwExcept(wstr, Ice::newCallback(cb, &Callback::throwExcept2), newInParam(wstr)); cb->check(); } -#ifdef ICE_CPP11 +#ifdef ICE_CPP11_COMPILER { CallbackPtr cb = new Callback(); wsc2->begin_throwExcept(wstr, nullptr, diff --git a/cpp/test/Ice/custom/CustomMap.h b/cpp/test/Ice/custom/CustomMap.h index ba097ce2d1e..863fcf5101d 100644 --- a/cpp/test/Ice/custom/CustomMap.h +++ b/cpp/test/Ice/custom/CustomMap.h @@ -12,7 +12,7 @@ #include <IceUtil/Config.h> -#ifdef ICE_CPP11 +#ifdef ICE_CPP11_COMPILER # include <unordered_map> #else # include <map> @@ -21,7 +21,7 @@ namespace Test { -#ifdef ICE_CPP11 +#ifdef ICE_CPP11_COMPILER template<typename K, typename V> class CustomMap : public std::unordered_map<K, V> { diff --git a/cpp/test/Ice/defaultServant/.depend.mak b/cpp/test/Ice/defaultServant/.depend.mak index 24709959dce..aa867b02ebb 100755 --- a/cpp/test/Ice/defaultServant/.depend.mak +++ b/cpp/test/Ice/defaultServant/.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\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -96,6 +98,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" \ @@ -104,6 +107,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" \ @@ -144,7 +148,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" \ @@ -158,6 +162,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" \ @@ -169,7 +174,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" \ @@ -192,7 +196,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" \ @@ -220,6 +223,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" \ @@ -228,6 +232,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" \ @@ -268,7 +273,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" \ @@ -282,6 +287,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" \ @@ -293,7 +299,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" \ @@ -316,7 +321,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" \ @@ -348,6 +352,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" \ @@ -356,6 +361,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" \ @@ -396,7 +402,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" \ @@ -410,6 +416,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" \ @@ -421,7 +428,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" \ @@ -444,7 +450,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" \ diff --git a/cpp/test/Ice/defaultValue/.depend.mak b/cpp/test/Ice/defaultValue/.depend.mak index 05055be438d..ec085a7c21b 100755 --- a/cpp/test/Ice/defaultValue/.depend.mak +++ b/cpp/test/Ice/defaultValue/.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" \ diff --git a/cpp/test/Ice/dispatcher/.depend.mak b/cpp/test/Ice/dispatcher/.depend.mak index 7a554e0119e..5f13f091b96 100755 --- a/cpp/test/Ice/dispatcher/.depend.mak +++ b/cpp/test/Ice/dispatcher/.depend.mak @@ -20,6 +20,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" \ @@ -28,6 +29,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" \ @@ -62,7 +64,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" \ @@ -71,6 +73,7 @@ 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" \ @@ -78,7 +81,6 @@ Test.obj: \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Endpoint.h" \ "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -101,6 +103,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" \ @@ -109,6 +112,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" \ @@ -149,7 +153,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" \ @@ -163,6 +167,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" \ @@ -174,7 +179,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" \ @@ -197,7 +201,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" \ @@ -230,6 +233,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" \ @@ -238,6 +242,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" \ @@ -278,7 +283,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" \ @@ -292,6 +297,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" \ @@ -303,7 +309,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" \ @@ -326,7 +331,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" \ @@ -368,6 +372,7 @@ Dispatcher.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -376,6 +381,7 @@ Dispatcher.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" \ @@ -405,6 +411,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" \ @@ -413,6 +420,7 @@ TestI.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" \ @@ -447,7 +455,7 @@ TestI.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" \ @@ -456,6 +464,7 @@ TestI.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" \ @@ -482,7 +491,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" \ @@ -504,7 +512,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" \ @@ -536,6 +543,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" \ @@ -544,6 +552,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" \ @@ -584,7 +593,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" \ @@ -598,6 +607,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" \ @@ -609,7 +619,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" \ @@ -632,7 +641,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" \ @@ -666,6 +674,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" \ @@ -674,6 +683,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" \ @@ -714,7 +724,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" \ @@ -728,6 +738,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" \ @@ -739,7 +750,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" \ @@ -762,7 +772,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/dispatcher/AllTests.cpp b/cpp/test/Ice/dispatcher/AllTests.cpp index aa6f8397739..5427ba0639b 100644 --- a/cpp/test/Ice/dispatcher/AllTests.cpp +++ b/cpp/test/Ice/dispatcher/AllTests.cpp @@ -116,7 +116,7 @@ allTests(const Ice::CommunicatorPtr& communicator) Test::TestIntfControllerPrx testController = Test::TestIntfControllerPrx::uncheckedCast(obj); -#ifdef ICE_CPP11 +#ifdef ICE_CPP11_COMPILER cout << "testing C++11 dispatcher... " << flush; #else cout << "testing dispatcher... " << flush; diff --git a/cpp/test/Ice/dispatcher/Client.cpp b/cpp/test/Ice/dispatcher/Client.cpp index 930fe5d4fe4..4292b7a3398 100644 --- a/cpp/test/Ice/dispatcher/Client.cpp +++ b/cpp/test/Ice/dispatcher/Client.cpp @@ -44,7 +44,7 @@ main(int argc, char* argv[]) // initData.properties->setProperty("Ice.TCP.SndSize", "50000"); -#ifdef ICE_CPP11 +#ifdef ICE_CPP11_COMPILER Ice::DispatcherPtr dispatcher = new Dispatcher(); initData.dispatcher = Ice::newDispatcher( [=](const Ice::DispatcherCallPtr& call, const Ice::ConnectionPtr& conn) diff --git a/cpp/test/Ice/dispatcher/Collocated.cpp b/cpp/test/Ice/dispatcher/Collocated.cpp index eea3f48adcf..34b5b235515 100644 --- a/cpp/test/Ice/dispatcher/Collocated.cpp +++ b/cpp/test/Ice/dispatcher/Collocated.cpp @@ -52,7 +52,7 @@ main(int argc, char* argv[]) { Ice::InitializationData initData; initData.properties = Ice::createProperties(argc, argv); -#ifdef ICE_CPP11 +#ifdef ICE_CPP11_COMPILER Ice::DispatcherPtr dispatcher = new Dispatcher(); initData.dispatcher = Ice::newDispatcher( [=](const Ice::DispatcherCallPtr& call, const Ice::ConnectionPtr& conn) diff --git a/cpp/test/Ice/dispatcher/Server.cpp b/cpp/test/Ice/dispatcher/Server.cpp index e5ef74693ef..2f320a0f868 100644 --- a/cpp/test/Ice/dispatcher/Server.cpp +++ b/cpp/test/Ice/dispatcher/Server.cpp @@ -60,7 +60,7 @@ main(int argc, char* argv[]) // initData.properties->setProperty("Ice.TCP.RcvSize", "50000"); -#ifdef ICE_CPP11 +#ifdef ICE_CPP11_COMPILER Ice::DispatcherPtr dispatcher = new Dispatcher(); initData.dispatcher = Ice::newDispatcher( [=](const Ice::DispatcherCallPtr& call, const Ice::ConnectionPtr& conn) diff --git a/cpp/test/Ice/echo/.depend.mak b/cpp/test/Ice/echo/.depend.mak index 788529b791c..8d75489e052 100755 --- a/cpp/test/Ice/echo/.depend.mak +++ b/cpp/test/Ice/echo/.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\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -96,6 +98,7 @@ BlobjectI.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" \ @@ -104,6 +107,7 @@ BlobjectI.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" \ @@ -144,7 +148,7 @@ BlobjectI.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" \ @@ -158,6 +162,7 @@ BlobjectI.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" \ @@ -169,7 +174,6 @@ BlobjectI.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" \ @@ -192,7 +196,6 @@ BlobjectI.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" \ @@ -219,6 +222,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" \ @@ -227,6 +231,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" \ @@ -267,7 +272,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" \ @@ -281,6 +286,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" \ @@ -292,7 +298,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" \ @@ -315,7 +320,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" \ diff --git a/cpp/test/Ice/enums/.depend.mak b/cpp/test/Ice/enums/.depend.mak index bc9acb90c91..40de27ede41 100755 --- a/cpp/test/Ice/enums/.depend.mak +++ b/cpp/test/Ice/enums/.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\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -96,6 +98,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" \ @@ -104,6 +107,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" \ @@ -144,7 +148,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" \ @@ -158,6 +162,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" \ @@ -169,7 +174,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" \ @@ -192,7 +196,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" \ @@ -224,6 +227,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" \ @@ -232,6 +236,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" \ @@ -272,7 +277,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" \ @@ -286,6 +291,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" \ @@ -297,7 +303,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" \ @@ -320,7 +325,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" \ @@ -352,6 +356,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" \ @@ -360,6 +365,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" \ @@ -400,7 +406,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" \ @@ -414,6 +420,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" \ @@ -425,7 +432,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" \ @@ -448,7 +454,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" \ @@ -476,6 +481,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" \ @@ -484,6 +490,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" \ @@ -524,7 +531,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" \ @@ -538,6 +545,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" \ @@ -549,7 +557,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" \ @@ -572,7 +579,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" \ diff --git a/cpp/test/Ice/enums/AllTests.cpp b/cpp/test/Ice/enums/AllTests.cpp index dafb05cb46b..bb531fb4019 100644 --- a/cpp/test/Ice/enums/AllTests.cpp +++ b/cpp/test/Ice/enums/AllTests.cpp @@ -15,60 +15,61 @@ using namespace std; using namespace Test; -TestIntfPrx +TestIntfPrxPtr allTests(const Ice::CommunicatorPtr& communicator) { string ref = "test:default -p 12010"; - Ice::ObjectPrx obj = communicator->stringToProxy(ref); + Ice::ObjectPrxPtr obj = communicator->stringToProxy(ref); test(obj); - TestIntfPrx proxy = TestIntfPrx::checkedCast(obj); + TestIntfPrxPtr proxy = ICE_CHECKED_CAST(TestIntfPrx, obj); test(proxy); cout << "testing enum values... " << flush; - test(static_cast<int>(benum1) == 0); - test(static_cast<int>(benum2) == 1); - test(static_cast<int>(benum3) == ByteConst1); - test(static_cast<int>(benum4) == ByteConst1 + 1); - test(static_cast<int>(benum5) == ShortConst1); - test(static_cast<int>(benum6) == ShortConst1 + 1); - test(static_cast<int>(benum7) == IntConst1); - test(static_cast<int>(benum8) == IntConst1 + 1); - test(static_cast<int>(benum9) == LongConst1); - test(static_cast<int>(benum10) == LongConst1 + 1); - test(static_cast<int>(benum11) == ByteConst2); - - test(static_cast<int>(senum1) == 3); - test(static_cast<int>(senum2) == 4); - test(static_cast<int>(senum3) == ByteConst1); - test(static_cast<int>(senum4) == ByteConst1 + 1); - test(static_cast<int>(senum5) == ShortConst1); - test(static_cast<int>(senum6) == ShortConst1 + 1); - test(static_cast<int>(senum7) == IntConst1); - test(static_cast<int>(senum8) == IntConst1 + 1); - test(static_cast<int>(senum9) == LongConst1); - test(static_cast<int>(senum10) == LongConst1 + 1); - test(static_cast<int>(senum11) == ShortConst2); - - test(static_cast<int>(ienum1) == 0); - test(static_cast<int>(ienum2) == 1); - test(static_cast<int>(ienum3) == ByteConst1); - test(static_cast<int>(ienum4) == ByteConst1 + 1); - test(static_cast<int>(ienum5) == ShortConst1); - test(static_cast<int>(ienum6) == ShortConst1 + 1); - test(static_cast<int>(ienum7) == IntConst1); - test(static_cast<int>(ienum8) == IntConst1 + 1); - test(static_cast<int>(ienum9) == LongConst1); - test(static_cast<int>(ienum10) == LongConst1 + 1); - test(static_cast<int>(ienum11) == IntConst2); - test(static_cast<int>(ienum12) == LongConst2); - - test(static_cast<int>(red) == 0); - test(static_cast<int>(green) == 1); - test(static_cast<int>(blue) == 2); + test(static_cast<int>(ICE_ENUM(ByteEnum, benum1)) == 0); + test(static_cast<int>(ICE_ENUM(ByteEnum, benum2)) == 1); + test(static_cast<int>(ICE_ENUM(ByteEnum, benum3)) == ByteConst1); + test(static_cast<int>(ICE_ENUM(ByteEnum, benum4)) == ByteConst1 + 1); + test(static_cast<int>(ICE_ENUM(ByteEnum, benum5)) == ShortConst1); + test(static_cast<int>(ICE_ENUM(ByteEnum, benum6)) == ShortConst1 + 1); + test(static_cast<int>(ICE_ENUM(ByteEnum, benum7)) == IntConst1); + test(static_cast<int>(ICE_ENUM(ByteEnum, benum8)) == IntConst1 + 1); + test(static_cast<int>(ICE_ENUM(ByteEnum, benum9)) == LongConst1); + test(static_cast<int>(ICE_ENUM(ByteEnum, benum10)) == LongConst1 + 1); + test(static_cast<int>(ICE_ENUM(ByteEnum, benum11)) == ByteConst2); + + test(static_cast<int>(ICE_ENUM(ShortEnum, senum1)) == 3); + test(static_cast<int>(ICE_ENUM(ShortEnum, senum2)) == 4); + test(static_cast<int>(ICE_ENUM(ShortEnum, senum3)) == ByteConst1); + test(static_cast<int>(ICE_ENUM(ShortEnum, senum4)) == ByteConst1 + 1); + test(static_cast<int>(ICE_ENUM(ShortEnum, senum5)) == ShortConst1); + test(static_cast<int>(ICE_ENUM(ShortEnum, senum6)) == ShortConst1 + 1); + test(static_cast<int>(ICE_ENUM(ShortEnum, senum7)) == IntConst1); + test(static_cast<int>(ICE_ENUM(ShortEnum, senum8)) == IntConst1 + 1); + test(static_cast<int>(ICE_ENUM(ShortEnum, senum9)) == LongConst1); + test(static_cast<int>(ICE_ENUM(ShortEnum, senum10)) == LongConst1 + 1); + test(static_cast<int>(ICE_ENUM(ShortEnum, senum11)) == ShortConst2); + + test(static_cast<int>(ICE_ENUM(IntEnum, ienum1)) == 0); + test(static_cast<int>(ICE_ENUM(IntEnum, ienum2)) == 1); + test(static_cast<int>(ICE_ENUM(IntEnum, ienum3)) == ByteConst1); + test(static_cast<int>(ICE_ENUM(IntEnum, ienum4)) == ByteConst1 + 1); + test(static_cast<int>(ICE_ENUM(IntEnum, ienum5)) == ShortConst1); + test(static_cast<int>(ICE_ENUM(IntEnum, ienum6)) == ShortConst1 + 1); + test(static_cast<int>(ICE_ENUM(IntEnum, ienum7)) == IntConst1); + test(static_cast<int>(ICE_ENUM(IntEnum, ienum8)) == IntConst1 + 1); + test(static_cast<int>(ICE_ENUM(IntEnum, ienum9)) == LongConst1); + test(static_cast<int>(ICE_ENUM(IntEnum, ienum10)) == LongConst1 + 1); + test(static_cast<int>(ICE_ENUM(IntEnum, ienum11)) == IntConst2); + test(static_cast<int>(ICE_ENUM(IntEnum, ienum12)) == LongConst2); + + test(static_cast<int>(ICE_ENUM(SimpleEnum, red)) == 0); + test(static_cast<int>(ICE_ENUM(SimpleEnum, green)) == 1); + test(static_cast<int>(ICE_ENUM(SimpleEnum, blue)) == 2); cout << "ok" << endl; +#ifndef ICE_CPP11_MAPPING cout << "testing enum streaming... " << flush; Ice::OutputStreamPtr out; @@ -77,59 +78,73 @@ allTests(const Ice::CommunicatorPtr& communicator) const bool encoding_1_0 = communicator->getProperties()->getProperty("Ice.Default.EncodingVersion") == "1.0"; out = Ice::createOutputStream(communicator); - out->write(benum11); + out->write(ICE_ENUM(ByteEnum, benum11)); out->finished(bytes); test(bytes.size() == 1); // ByteEnum should require one byte out = Ice::createOutputStream(communicator); - out->write(senum11); + out->write(ICE_ENUM(ShortEnum, senum11)); out->finished(bytes); test(bytes.size() == (encoding_1_0 ? 2 : 5)); out = Ice::createOutputStream(communicator); - out->write(ienum11); + out->write(ICE_ENUM(IntEnum, ienum11)); out->finished(bytes); test(bytes.size() == (encoding_1_0 ? 4 : 5)); out = Ice::createOutputStream(communicator); - out->write(blue); + out->write(ICE_ENUM(SimpleEnum, blue)); out->finished(bytes); test(bytes.size() == 1); // SimpleEnum should require one byte cout << "ok" << endl; +#endif cout << "testing enum operations... " << flush; ByteEnum byteEnum; - test(proxy->opByte(benum1, byteEnum) == benum1); - test(byteEnum == benum1); - test(proxy->opByte(benum11, byteEnum) == benum11); - test(byteEnum == benum11); + test(proxy->opByte(ICE_ENUM(ByteEnum, benum1), byteEnum) == ICE_ENUM(ByteEnum, benum1)); + test(byteEnum == ICE_ENUM(ByteEnum, benum1)); + test(proxy->opByte(ICE_ENUM(ByteEnum, benum11), byteEnum) == ICE_ENUM(ByteEnum, benum11)); + test(byteEnum == ICE_ENUM(ByteEnum, benum11)); ShortEnum shortEnum; - test(proxy->opShort(senum1, shortEnum) == senum1); - test(shortEnum == senum1); - test(proxy->opShort(senum11, shortEnum) == senum11); - test(shortEnum == senum11); + test(proxy->opShort(ICE_ENUM(ShortEnum, senum1), shortEnum) == ICE_ENUM(ShortEnum, senum1)); + test(shortEnum == ICE_ENUM(ShortEnum, senum1)); + test(proxy->opShort(ICE_ENUM(ShortEnum, senum11), shortEnum) == ICE_ENUM(ShortEnum, senum11)); + test(shortEnum == ICE_ENUM(ShortEnum, senum11)); IntEnum intEnum; - test(proxy->opInt(ienum1, intEnum) == ienum1); - test(intEnum == ienum1); - test(proxy->opInt(ienum11, intEnum) == ienum11); - test(intEnum == ienum11); - test(proxy->opInt(ienum12, intEnum) == ienum12); - test(intEnum == ienum12); + test(proxy->opInt(ICE_ENUM(IntEnum, ienum1), intEnum) == ICE_ENUM(IntEnum, ienum1)); + test(intEnum == ICE_ENUM(IntEnum, ienum1)); + test(proxy->opInt(ICE_ENUM(IntEnum, ienum11), intEnum) == ICE_ENUM(IntEnum, ienum11)); + test(intEnum == ICE_ENUM(IntEnum, ienum11)); + test(proxy->opInt(ICE_ENUM(IntEnum, ienum12), intEnum) == ICE_ENUM(IntEnum, ienum12)); + test(intEnum == ICE_ENUM(IntEnum, ienum12)); SimpleEnum s; - test(proxy->opSimple(green, s) == green); - test(s == green); + test(proxy->opSimple(ICE_ENUM(SimpleEnum, green), s) == ICE_ENUM(SimpleEnum, green)); + test(s == ICE_ENUM(SimpleEnum, green)); cout << "ok" << endl; cout << "testing enum sequences operations... " << flush; { - ByteEnum values[] = { benum1, benum2, benum3, benum4, benum5, benum6, benum7, benum8, benum9, benum10, benum11}; + ByteEnum values[] = + { + ICE_ENUM(ByteEnum, benum1), + ICE_ENUM(ByteEnum, benum2), + ICE_ENUM(ByteEnum, benum3), + ICE_ENUM(ByteEnum, benum4), + ICE_ENUM(ByteEnum, benum5), + ICE_ENUM(ByteEnum, benum6), + ICE_ENUM(ByteEnum, benum7), + ICE_ENUM(ByteEnum, benum8), + ICE_ENUM(ByteEnum, benum9), + ICE_ENUM(ByteEnum, benum10), + ICE_ENUM(ByteEnum, benum11) + }; ByteEnumSeq b1(&values[0], &values[0] + sizeof(values) / sizeof(ByteEnum)); ByteEnumSeq b2; @@ -143,7 +158,20 @@ allTests(const Ice::CommunicatorPtr& communicator) } { - ShortEnum values[] = { senum1, senum2, senum3, senum4, senum5, senum6, senum7, senum8, senum9, senum10, senum11}; + ShortEnum values[] = + { + ICE_ENUM(ShortEnum, senum1), + ICE_ENUM(ShortEnum, senum2), + ICE_ENUM(ShortEnum, senum3), + ICE_ENUM(ShortEnum, senum4), + ICE_ENUM(ShortEnum, senum5), + ICE_ENUM(ShortEnum, senum6), + ICE_ENUM(ShortEnum, senum7), + ICE_ENUM(ShortEnum, senum8), + ICE_ENUM(ShortEnum, senum9), + ICE_ENUM(ShortEnum, senum10), + ICE_ENUM(ShortEnum, senum11) + }; ShortEnumSeq s1(&values[0], &values[0] + sizeof(values) / sizeof(ShortEnum)); ShortEnumSeq s2; @@ -157,7 +185,20 @@ allTests(const Ice::CommunicatorPtr& communicator) } { - IntEnum values[] = { ienum1, ienum2, ienum3, ienum4, ienum5, ienum6, ienum7, ienum8, ienum9, ienum10, ienum11}; + IntEnum values[] = + { + ICE_ENUM(IntEnum, ienum1), + ICE_ENUM(IntEnum, ienum2), + ICE_ENUM(IntEnum, ienum3), + ICE_ENUM(IntEnum, ienum4), + ICE_ENUM(IntEnum, ienum5), + ICE_ENUM(IntEnum, ienum6), + ICE_ENUM(IntEnum, ienum7), + ICE_ENUM(IntEnum, ienum8), + ICE_ENUM(IntEnum, ienum9), + ICE_ENUM(IntEnum, ienum10), + ICE_ENUM(IntEnum, ienum11) + }; IntEnumSeq i1(&values[0], &values[0] + sizeof(values) / sizeof(IntEnum)); IntEnumSeq i2; @@ -171,7 +212,12 @@ allTests(const Ice::CommunicatorPtr& communicator) } { - SimpleEnum values[] = { red, green, blue }; + SimpleEnum values[] = + { + ICE_ENUM(SimpleEnum, red), + ICE_ENUM(SimpleEnum, green), + ICE_ENUM(SimpleEnum, blue) + }; SimpleEnumSeq s1(&values[0], &values[0] + sizeof(values) / sizeof(SimpleEnum)); SimpleEnumSeq s2; diff --git a/cpp/test/Ice/enums/Client.cpp b/cpp/test/Ice/enums/Client.cpp index f0a9a201dd6..408f6519364 100644 --- a/cpp/test/Ice/enums/Client.cpp +++ b/cpp/test/Ice/enums/Client.cpp @@ -19,8 +19,8 @@ using namespace Test; int run(int, char**, const Ice::CommunicatorPtr& communicator) { - TestIntfPrx allTests(const Ice::CommunicatorPtr&); - TestIntfPrx t = allTests(communicator); + TestIntfPrxPtr allTests(const Ice::CommunicatorPtr&); + TestIntfPrxPtr t = allTests(communicator); t->shutdown(); return EXIT_SUCCESS; } diff --git a/cpp/test/Ice/enums/Server.cpp b/cpp/test/Ice/enums/Server.cpp index 046e9f232bb..9b06cae40ff 100644 --- a/cpp/test/Ice/enums/Server.cpp +++ b/cpp/test/Ice/enums/Server.cpp @@ -20,8 +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 obj = new TestIntfI; - adapter->add(obj, communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(TestIntfI), communicator->stringToIdentity("test")); adapter->activate(); TEST_READY diff --git a/cpp/test/Ice/exceptions/.depend.mak b/cpp/test/Ice/exceptions/.depend.mak index 0bbe33d23ea..4523ae2327e 100755 --- a/cpp/test/Ice/exceptions/.depend.mak +++ b/cpp/test/Ice/exceptions/.depend.mak @@ -21,6 +21,7 @@ ExceptionsI.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" \ @@ -29,6 +30,7 @@ ExceptionsI.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" \ @@ -63,7 +65,7 @@ ExceptionsI.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" \ @@ -72,13 +74,13 @@ ExceptionsI.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\BuiltinSequences.h" \ Test.obj: \ @@ -95,6 +97,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" \ @@ -103,6 +106,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" \ @@ -137,7 +141,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" \ @@ -146,13 +150,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\BuiltinSequences.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\Outgoing.h" \ @@ -177,6 +181,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" \ @@ -185,6 +190,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" \ @@ -225,7 +231,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" \ @@ -239,6 +245,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" \ @@ -250,7 +257,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" \ @@ -273,7 +279,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" \ @@ -305,6 +310,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" \ @@ -313,6 +319,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" \ @@ -353,7 +360,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" \ @@ -367,6 +374,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" \ @@ -378,7 +386,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" \ @@ -401,7 +408,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" \ @@ -433,6 +439,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" \ @@ -441,6 +448,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" \ @@ -481,7 +489,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" \ @@ -495,6 +503,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" \ @@ -506,7 +515,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" \ @@ -529,7 +537,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" \ @@ -562,6 +569,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" \ @@ -570,6 +578,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" \ @@ -610,7 +619,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" \ @@ -624,6 +633,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" \ @@ -635,7 +645,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" \ @@ -658,7 +667,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" \ @@ -689,6 +697,7 @@ TestAMD.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" \ @@ -697,6 +706,7 @@ TestAMD.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" \ @@ -731,7 +741,7 @@ TestAMD.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" \ @@ -740,6 +750,7 @@ TestAMD.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" \ @@ -747,7 +758,6 @@ TestAMD.obj: \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\Outgoing.h" \ @@ -772,6 +782,7 @@ TestAMDI.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" \ @@ -780,6 +791,7 @@ TestAMDI.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" \ @@ -820,7 +832,7 @@ TestAMDI.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" \ @@ -834,6 +846,7 @@ TestAMDI.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" \ @@ -845,7 +858,6 @@ TestAMDI.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" \ @@ -868,7 +880,6 @@ TestAMDI.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" \ @@ -901,6 +912,7 @@ ServerAMD.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" \ @@ -909,6 +921,7 @@ ServerAMD.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" \ @@ -949,7 +962,7 @@ ServerAMD.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" \ @@ -963,6 +976,7 @@ ServerAMD.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" \ @@ -974,7 +988,6 @@ ServerAMD.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" \ @@ -997,7 +1010,6 @@ ServerAMD.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" \ @@ -1030,6 +1042,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" \ @@ -1038,6 +1051,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" \ @@ -1078,7 +1092,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" \ @@ -1092,6 +1106,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" \ @@ -1103,7 +1118,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" \ @@ -1126,7 +1140,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/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp index 75221df2c92..562fb63a935 100644 --- a/cpp/test/Ice/exceptions/AllTests.cpp +++ b/cpp/test/Ice/exceptions/AllTests.cpp @@ -14,7 +14,7 @@ using namespace std; using namespace Test; -namespace +namespace { const bool printException = false; } @@ -28,9 +28,15 @@ class ServantLocatorI : virtual public Ice::ServantLocator { public: +#ifdef ICE_CPP11_MAPPING + virtual shared_ptr<Ice::Object> locate(const Ice::Current&, shared_ptr<void>&) { return nullptr; } + virtual void finished(const Ice::Current&, const shared_ptr<Ice::Object>&, const shared_ptr<void>&) {} + virtual void deactivate(const string&) {} +#else virtual Ice::ObjectPtr locate(const Ice::Current&, Ice::LocalObjectPtr&) { return 0; } virtual void finished(const Ice::Current&, const Ice::ObjectPtr&, const Ice::LocalObjectPtr&) {} virtual void deactivate(const string&) {} +#endif }; class ObjectFactoryI : virtual public Ice::ObjectFactory @@ -394,7 +400,7 @@ endsWith(const string& s, const string& findme) return false; } -ThrowerPrx +ThrowerPrxPtr allTests(const Ice::CommunicatorPtr& communicator) { cout << "testing ice_print()/what()... " << flush; @@ -449,10 +455,10 @@ allTests(const Ice::CommunicatorPtr& communicator) test(os.str() == "Test::E"); test(ex.data == "E"); } - + // // Test custom ice_print - // + // { F ex("F"); ostringstream os; @@ -498,7 +504,7 @@ allTests(const Ice::CommunicatorPtr& communicator) // Expected } - string host = communicator->getProperties()->getPropertyAsIntWithDefault("Ice.IPv6", 0) == 0 ? + string host = communicator->getProperties()->getPropertyAsIntWithDefault("Ice.IPv6", 0) == 0 ? "127.0.0.1" : "\"0:0:0:0:0:0:0:1\""; communicator->getProperties()->setProperty("TestAdapter0.Endpoints", "default -h " + host); first = communicator->createObjectAdapter("TestAdapter0"); @@ -540,11 +546,11 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "testing servant registration exceptions... " << flush; { - string host = communicator->getProperties()->getPropertyAsIntWithDefault("Ice.IPv6", 0) == 0 ? + string host = communicator->getProperties()->getPropertyAsIntWithDefault("Ice.IPv6", 0) == 0 ? "127.0.0.1" : "\"0:0:0:0:0:0:0:1\""; communicator->getProperties()->setProperty("TestAdapter1.Endpoints", "default -h " + host); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter1"); - Ice::ObjectPtr obj = new EmptyI; + Ice::ObjectPtr obj = ICE_MAKE_SHARED(EmptyI); adapter->add(obj, communicator->stringToIdentity("x")); try { @@ -573,7 +579,7 @@ allTests(const Ice::CommunicatorPtr& communicator) printer << ex; } } - + try { adapter->add(0, communicator->stringToIdentity("x")); @@ -609,11 +615,11 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "testing servant locator registrations exceptions... " << flush; { - string host = communicator->getProperties()->getPropertyAsIntWithDefault("Ice.IPv6", 0) == 0 ? + string host = communicator->getProperties()->getPropertyAsIntWithDefault("Ice.IPv6", 0) == 0 ? "127.0.0.1" : "\"0:0:0:0:0:0:0:1\""; communicator->getProperties()->setProperty("TestAdapter2.Endpoints", "default -h " + host); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter2"); - Ice::ServantLocatorPtr loc = new ServantLocatorI; + Ice::ServantLocatorPtr loc = ICE_MAKE_SHARED(ServantLocatorI); adapter->addServantLocator(loc, "x"); try { @@ -630,6 +636,27 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "testing object factory registration exception... " << flush; { +#ifdef ICE_CPP11_MAPPING + communicator->addObjectFactory( + [](const std::string&) + { + return nullptr; + }, + "x"); + try + { + communicator->addObjectFactory( + [](const std::string&) + { + return nullptr; + }, + "x"); + test(false); + } + catch(const Ice::AlreadyRegisteredException&) + { + } +#else Ice::ObjectFactoryPtr of = new ObjectFactoryI; communicator->addObjectFactory(of, "x"); try @@ -640,19 +667,24 @@ allTests(const Ice::CommunicatorPtr& communicator) catch(const Ice::AlreadyRegisteredException&) { } +#endif } cout << "ok" << endl; cout << "testing stringToProxy... " << flush; string ref = "thrower: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; - ThrowerPrx thrower = ThrowerPrx::checkedCast(base); + ThrowerPrxPtr thrower = ICE_CHECKED_CAST(ThrowerPrx, base); test(thrower); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(thrower, base)); +#else test(thrower == base); +#endif cout << "ok" << endl; cout << "catching exact types... " << flush; @@ -943,8 +975,8 @@ allTests(const Ice::CommunicatorPtr& communicator) cerr << ex << endl; test(false); } - - ThrowerPrx thrower2 = ThrowerPrx::uncheckedCast(communicator->stringToProxy("thrower:default -p 12011")); + + ThrowerPrxPtr thrower2 = ICE_UNCHECKED_CAST(ThrowerPrx, communicator->stringToProxy("thrower:default -p 12011")); try { thrower2->throwMemoryLimitException(Ice::ByteSeq(2 * 1024 * 1024)); // 2MB (no limits) @@ -952,7 +984,7 @@ allTests(const Ice::CommunicatorPtr& communicator) catch(const Ice::MemoryLimitException&) { } - ThrowerPrx thrower3 = ThrowerPrx::uncheckedCast(communicator->stringToProxy("thrower:default -p 12012")); + ThrowerPrxPtr thrower3 = ICE_UNCHECKED_CAST(ThrowerPrx, communicator->stringToProxy("thrower:default -p 12012")); try { thrower3->throwMemoryLimitException(Ice::ByteSeq(1024)); // 1KB limit @@ -970,7 +1002,7 @@ allTests(const Ice::CommunicatorPtr& communicator) Ice::Identity id = communicator->stringToIdentity("does not exist"); try { - ThrowerPrx thrower2 = ThrowerPrx::uncheckedCast(thrower->ice_identity(id)); + ThrowerPrxPtr thrower2 = ICE_UNCHECKED_CAST(ThrowerPrx, thrower->ice_identity(id)); thrower2->throwAasA(1); // thrower2->ice_ping(); test(false); @@ -990,7 +1022,11 @@ allTests(const Ice::CommunicatorPtr& communicator) try { - ThrowerPrx thrower2 = ThrowerPrx::uncheckedCast(thrower, "no such facet"); +#ifdef ICE_CPP11_MAPPING + ThrowerPrxPtr thrower2 = Ice::uncheckedCast<ThrowerPrx>(thrower, "no such facet"); +#else + ThrowerPrxPtr thrower2 = ThrowerPrx::uncheckedCast(thrower, "no such facet"); +#endif try { thrower2->ice_ping(); @@ -1012,7 +1048,7 @@ allTests(const Ice::CommunicatorPtr& communicator) try { - WrongOperationPrx thrower2 = WrongOperationPrx::uncheckedCast(thrower); + WrongOperationPrxPtr thrower2 = ICE_UNCHECKED_CAST(WrongOperationPrx, thrower); thrower2->noSuchOperation(); test(false); } @@ -1102,62 +1138,219 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "ok" << endl; cout << "catching exact types with new AMI mapping... " << flush; - +#ifdef ICE_CPP11_MAPPING + { + auto f = thrower->throwAasA_async(1); + try + { + f.get(); + test(false); + } + catch(const A& ex) + { + test(ex.aMem == 1); + } + catch(const Ice::Exception&) + { + test(false); + } + catch(...) + { + test(false); + } + } + { + auto f = thrower->throwAorDasAorD_async(1); + try + { + f.get(); + test(false); + } + catch(const A& ex) + { + test(ex.aMem == 1); + } + catch(...) + { + test(false); + } + } + { + auto f = thrower->throwAorDasAorD_async(-1); + try + { + f.get(); + test(false); + } + catch(const D& ex) + { + test(ex.dMem == -1); + } + catch(...) + { + test(false); + } + } + { + auto f = thrower->throwBasB_async(1, 2); + try + { + f.get(); + test(false); + } + catch(const B& ex) + { + test(ex.aMem == 1); + test(ex.bMem == 2); + } + catch(...) + { + test(false); + } + } + { + auto f = thrower->throwCasC_async(1, 2, 3); + try + { + f.get(); + test(false); + } + catch(const C& ex) + { + test(ex.aMem == 1); + test(ex.bMem == 2); + test(ex.cMem == 3); + } + catch(...) + { + test(false); + } + } + { + auto f = thrower->throwModA_async(1, 2); + try + { + f.get(); + } + catch(const A& ex) + { + test(ex.aMem == 1); + } + catch(const Ice::OperationNotExistException&) + { + // + // This operation is not supported in Java. + // + } + catch(...) + { + test(false); + } + } +#else { CallbackPtr cb = new Callback; - Callback_Thrower_throwAasAPtr callback = + Callback_Thrower_throwAasAPtr callback = newCallback_Thrower_throwAasA(cb, &Callback::response, &Callback::exception_AasA); thrower->begin_throwAasA(1, callback); cb->check(); } - { CallbackPtr cb = new Callback; - Callback_Thrower_throwAorDasAorDPtr callback = + Callback_Thrower_throwAorDasAorDPtr callback = newCallback_Thrower_throwAorDasAorD(cb, &Callback::response, &Callback::exception_AorDasAorD); thrower->begin_throwAorDasAorD(1, callback); cb->check(); } - { CallbackPtr cb = new Callback; - Callback_Thrower_throwAorDasAorDPtr callback = + Callback_Thrower_throwAorDasAorDPtr callback = newCallback_Thrower_throwAorDasAorD(cb, &Callback::response, &Callback::exception_AorDasAorD); thrower->begin_throwAorDasAorD(-1, callback); cb->check(); } - { CallbackPtr cb = new Callback; - Callback_Thrower_throwBasBPtr callback = + Callback_Thrower_throwBasBPtr callback = newCallback_Thrower_throwBasB(cb, &Callback::response, &Callback::exception_BasB); thrower->begin_throwBasB(1, 2, callback); cb->check(); } - { CallbackPtr cb = new Callback; - Callback_Thrower_throwCasCPtr callback = + Callback_Thrower_throwCasCPtr callback = newCallback_Thrower_throwCasC(cb, &Callback::response, &Callback::exception_CasC); thrower->begin_throwCasC(1, 2, 3, callback); cb->check(); } - { CallbackPtr cb = new Callback; - Callback_Thrower_throwModAPtr callback = + Callback_Thrower_throwModAPtr callback = newCallback_Thrower_throwModA(cb, &Callback::response, &Callback::exception_ModA); thrower->begin_throwModA(1, 2, callback); cb->check(); } - +#endif cout << "ok" << endl; cout << "catching derived types with new AMI mapping... " << flush; +#ifdef ICE_CPP11_MAPPING + { + auto f = thrower->throwBasA_async(1, 2); + try + { + f.get(); + } + catch(const B& ex) + { + test(ex.aMem == 1); + test(ex.bMem == 2); + } + catch(...) + { + test(false); + } + } { + auto f = thrower->throwCasA_async(1, 2, 3); + try + { + f.get(); + } + catch(const C& ex) + { + test(ex.aMem == 1); + test(ex.bMem == 2); + test(ex.cMem == 3); + } + catch(...) + { + test(false); + } + } + + { + auto f = thrower->throwCasB_async(1, 2, 3); + try + { + f.get(); + } + catch(const C& ex) + { + test(ex.aMem == 1); + test(ex.bMem == 2); + test(ex.cMem == 3); + } + catch(...) + { + test(false); + } + } +#else + { CallbackPtr cb = new Callback; - Callback_Thrower_throwBasAPtr callback = + Callback_Thrower_throwBasAPtr callback = newCallback_Thrower_throwBasA(cb, &Callback::response, &Callback::exception_BasA); thrower->begin_throwBasA(1, 2, callback); cb->check(); @@ -1165,7 +1358,7 @@ allTests(const Ice::CommunicatorPtr& communicator) { CallbackPtr cb = new Callback; - Callback_Thrower_throwCasAPtr callback = + Callback_Thrower_throwCasAPtr callback = newCallback_Thrower_throwCasA(cb, &Callback::response, &Callback::exception_CasA); thrower->begin_throwCasA(1, 2, 3, callback); cb->check(); @@ -1173,21 +1366,74 @@ allTests(const Ice::CommunicatorPtr& communicator) { CallbackPtr cb = new Callback; - Callback_Thrower_throwCasBPtr callback = + Callback_Thrower_throwCasBPtr callback = newCallback_Thrower_throwCasB(cb, &Callback::response, &Callback::exception_CasB); thrower->begin_throwCasB(1, 2, 3, callback); cb->check(); } - +#endif cout << "ok" << endl; if(thrower->supportsUndeclaredExceptions()) { cout << "catching unknown user exception with new AMI mapping... " << flush; +#ifdef ICE_CPP11_MAPPING + { + auto f = thrower->throwUndeclaredA_async(1); + try + { + f.get(); + test(false); + } + catch(const Ice::UnknownUserException&) + { + } + catch(const Ice::Exception& ex) + { + cout << ex << endl; + cout << ex.ice_stackTrace() << endl; + test(false); + } + catch(...) + { + test(false); + } + } + + { + auto f = thrower->throwUndeclaredB_async(1, 2); + try + { + f.get(); + test(false); + } + catch(const Ice::UnknownUserException&) + { + } + catch(...) + { + test(false); + } + } { + auto f = thrower->throwUndeclaredC_async(1, 2, 3); + try + { + f.get(); + } + catch(const Ice::UnknownUserException&) + { + } + catch(...) + { + test(false); + } + } +#else + { CallbackPtr cb = new Callback; - Callback_Thrower_throwUndeclaredAPtr callback = + Callback_Thrower_throwUndeclaredAPtr callback = newCallback_Thrower_throwUndeclaredA(cb, &Callback::response, &Callback::exception_UndeclaredA); thrower->begin_throwUndeclaredA(1, callback); cb->check(); @@ -1203,25 +1449,43 @@ allTests(const Ice::CommunicatorPtr& communicator) { CallbackPtr cb = new Callback; - Callback_Thrower_throwUndeclaredCPtr callback = + Callback_Thrower_throwUndeclaredCPtr callback = newCallback_Thrower_throwUndeclaredC(cb, &Callback::response, &Callback::exception_UndeclaredC); thrower->begin_throwUndeclaredC(1, 2, 3, callback); cb->check(); } - +#endif cout << "ok" << endl; } cout << "catching object not exist exception with new AMI mapping... " << flush; { +#ifdef ICE_CPP11_MAPPING + id = communicator->stringToIdentity("does not exist"); + shared_ptr<ThrowerPrx> thrower2 = Ice::uncheckedCast<ThrowerPrx>(thrower->ice_identity(id)); + auto f = thrower2->throwAasA_async(1); + try + { + f.get(); + } + catch(const Ice::ObjectNotExistException& ex) + { + test(ex.id == id); + } + catch(...) + { + test(false); + } +#else id = communicator->stringToIdentity("does not exist"); ThrowerPrx thrower2 = ThrowerPrx::uncheckedCast(thrower->ice_identity(id)); CallbackPtr cb = new Callback(communicator); - Callback_Thrower_throwAasAPtr callback = + Callback_Thrower_throwAasAPtr callback = newCallback_Thrower_throwAasA(cb, &Callback::response, &Callback::exception_AasAObjectNotExist); thrower2->begin_throwAasA(1, callback); cb->check(); +#endif } cout << "ok" << endl; @@ -1229,12 +1493,25 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "catching facet not exist exception with new AMI mapping... " << flush; { +#ifdef ICE_CPP11_MAPPING + shared_ptr<ThrowerPrx> thrower2 = Ice::uncheckedCast<ThrowerPrx>(thrower, "no such facet"); + auto f = thrower2->throwAasA_async(1); + try + { + f.get(); + } + catch(const Ice::FacetNotExistException& ex) + { + test(ex.facet == "no such facet"); + } +#else ThrowerPrx thrower2 = ThrowerPrx::uncheckedCast(thrower, "no such facet"); CallbackPtr cb = new Callback; - Callback_Thrower_throwAasAPtr callback = + Callback_Thrower_throwAasAPtr callback = newCallback_Thrower_throwAasA(cb, &Callback::response, &Callback::exception_AasAFacetNotExist); thrower2->begin_throwAasA(1, callback); cb->check(); +#endif } cout << "ok" << endl; @@ -1242,22 +1519,74 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "catching operation not exist exception with new AMI mapping... " << flush; { +#ifdef ICE_CPP11_MAPPING + shared_ptr<WrongOperationPrx> thrower4 = Ice::uncheckedCast<WrongOperationPrx>(thrower); + auto f = thrower4->noSuchOperation_async(); + try + { + f.get(); + } + catch(const Ice::OperationNotExistException& ex) + { + test(ex.operation == "noSuchOperation"); + } + catch(...) + { + test(false); + } +#else CallbackPtr cb = new Callback; - Callback_WrongOperation_noSuchOperationPtr callback = - newCallback_WrongOperation_noSuchOperation(cb, &Callback::response, + Callback_WrongOperation_noSuchOperationPtr callback = + newCallback_WrongOperation_noSuchOperation(cb, &Callback::response, &Callback::exception_noSuchOperation); WrongOperationPrx thrower4 = WrongOperationPrx::uncheckedCast(thrower); thrower4->begin_noSuchOperation(callback); cb->check(); +#endif } cout << "ok" << endl; cout << "catching unknown local exception with new AMI mapping... " << flush; +#ifdef ICE_CPP11_MAPPING + { + auto f = thrower->throwLocalException_async(); + try + { + f.get(); + test(false); + } + catch(const Ice::UnknownLocalException&) + { + } + catch(...) + { + test(false); + } + } { + auto f = thrower->throwLocalExceptionIdempotent_async(); + try + { + f.get(); + test(false); + } + catch(const Ice::UnknownLocalException&) + { + } + catch(const Ice::OperationNotExistException&) + { + } + catch(...) + { + test(false); + } + } +#else + { CallbackPtr cb = new Callback; - Callback_Thrower_throwLocalExceptionPtr callback = + Callback_Thrower_throwLocalExceptionPtr callback = newCallback_Thrower_throwLocalException(cb, &Callback::response, &Callback::exception_LocalException); thrower->begin_throwLocalException(callback); cb->check(); @@ -1265,23 +1594,40 @@ allTests(const Ice::CommunicatorPtr& communicator) { CallbackPtr cb = new Callback; - Callback_Thrower_throwLocalExceptionIdempotentPtr callback = - newCallback_Thrower_throwLocalExceptionIdempotent(cb, &Callback::response, + Callback_Thrower_throwLocalExceptionIdempotentPtr callback = + newCallback_Thrower_throwLocalExceptionIdempotent(cb, &Callback::response, &Callback::exception_LocalException); thrower->begin_throwLocalExceptionIdempotent(callback); cb->check(); } - +#endif cout << "ok" << endl; cout << "catching unknown non-Ice exception with new AMI mapping... " << flush; { +#ifdef ICE_CPP11_MAPPING + auto f = thrower->throwNonIceException_async(); + try + { + f.get(); + test(false); + } + catch(const Ice::UnknownException&) + { + } + catch(...) + { + test(false); + } + +#else CallbackPtr cb = new Callback; - Callback_Thrower_throwNonIceExceptionPtr callback = + Callback_Thrower_throwNonIceExceptionPtr callback = newCallback_Thrower_throwNonIceException(cb, &Callback::response, &Callback::exception_NonIceException); thrower->begin_throwNonIceException(callback); cb->check(); +#endif } cout << "ok" << endl; diff --git a/cpp/test/Ice/exceptions/Client.cpp b/cpp/test/Ice/exceptions/Client.cpp index aa287561706..dd0dc524185 100644 --- a/cpp/test/Ice/exceptions/Client.cpp +++ b/cpp/test/Ice/exceptions/Client.cpp @@ -19,8 +19,8 @@ using namespace Test; int run(int, char**, const Ice::CommunicatorPtr& communicator) { - ThrowerPrx allTests(const Ice::CommunicatorPtr&); - ThrowerPrx thrower = allTests(communicator); + ThrowerPrxPtr allTests(const Ice::CommunicatorPtr&); + ThrowerPrxPtr thrower = allTests(communicator); thrower->shutdown(); return EXIT_SUCCESS; } diff --git a/cpp/test/Ice/exceptions/Collocated.cpp b/cpp/test/Ice/exceptions/Collocated.cpp index 394d21a7a8a..a7b0f9d88ff 100644 --- a/cpp/test/Ice/exceptions/Collocated.cpp +++ b/cpp/test/Ice/exceptions/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 ThrowerI(); + Ice::ObjectPtr object = ICE_MAKE_SHARED(ThrowerI); adapter->add(object, communicator->stringToIdentity("thrower")); - ThrowerPrx allTests(const Ice::CommunicatorPtr&); + ThrowerPrxPtr allTests(const Ice::CommunicatorPtr&); allTests(communicator); return EXIT_SUCCESS; diff --git a/cpp/test/Ice/exceptions/Server.cpp b/cpp/test/Ice/exceptions/Server.cpp index 40d6d640055..5b956649eb7 100644 --- a/cpp/test/Ice/exceptions/Server.cpp +++ b/cpp/test/Ice/exceptions/Server.cpp @@ -21,7 +21,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectAdapterPtr adapter2 = communicator->createObjectAdapter("TestAdapter2"); Ice::ObjectAdapterPtr adapter3 = communicator->createObjectAdapter("TestAdapter3"); - Ice::ObjectPtr object = new ThrowerI(); + Ice::ObjectPtr object = ICE_MAKE_SHARED(ThrowerI); adapter->add(object, communicator->stringToIdentity("thrower")); adapter2->add(object, communicator->stringToIdentity("thrower")); adapter3->add(object, communicator->stringToIdentity("thrower")); diff --git a/cpp/test/Ice/exceptions/ServerAMD.cpp b/cpp/test/Ice/exceptions/ServerAMD.cpp index 0049294407f..4bcc7bc89cb 100644 --- a/cpp/test/Ice/exceptions/ServerAMD.cpp +++ b/cpp/test/Ice/exceptions/ServerAMD.cpp @@ -21,7 +21,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectAdapterPtr adapter2 = communicator->createObjectAdapter("TestAdapter2"); Ice::ObjectAdapterPtr adapter3 = communicator->createObjectAdapter("TestAdapter3"); - Ice::ObjectPtr object = new ThrowerI(); + Ice::ObjectPtr object = ICE_MAKE_SHARED(ThrowerI); adapter->add(object, communicator->stringToIdentity("thrower")); adapter2->add(object, communicator->stringToIdentity("thrower")); adapter3->add(object, communicator->stringToIdentity("thrower")); diff --git a/cpp/test/Ice/exceptions/TestAMDI.cpp b/cpp/test/Ice/exceptions/TestAMDI.cpp index b0af853f56b..46646fbc721 100644 --- a/cpp/test/Ice/exceptions/TestAMDI.cpp +++ b/cpp/test/Ice/exceptions/TestAMDI.cpp @@ -28,6 +28,395 @@ ThrowerI::ThrowerI() { } +#ifdef ICE_CPP11_MAPPING +void +ThrowerI::shutdown_async(function<void ()> response, + function<void (const exception_ptr&)>, + const Ice::Current& current) +{ + current.adapter->getCommunicator()->shutdown(); + response(); +} + +void +ThrowerI::supportsUndeclaredExceptions_async(function<void (bool)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + response(true); +} + +void +ThrowerI::supportsAssertException_async(function<void (bool)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + response(false); +} + +void +ThrowerI::throwAasA_async(int a, + function<void ()>, + function<void (const exception_ptr&)> exception, + const Ice::Current&) +{ + try + { + A ex; + ex.aMem = a; + throw ex; + } + catch(...) + { + exception(current_exception()); + } +} + +void +ThrowerI::throwAorDasAorD_async(int a, + function<void ()>, + function<void (const exception_ptr&)> exception, + const Ice::Current&) +{ + try + { + if(a > 0) + { + A ex; + ex.aMem = a; + throw ex; + } + else + { + D ex; + ex.dMem = a; + throw ex; + } + } + catch(...) + { + exception(current_exception()); + } +} + +void +ThrowerI::throwBasA_async(int a, int b, + function<void ()>, + function<void (const exception_ptr&)> exception, + const Ice::Current&) +{ + try + { + B ex; + ex.aMem = a; + ex.bMem = b; + throw ex; + } + catch(...) + { + exception(current_exception()); + } +} + +void +ThrowerI::throwCasA_async(int a, int b, int c, + function<void ()>, + function<void (const exception_ptr&)> exception, + const Ice::Current&) +{ + try + { + C ex; + ex.aMem = a; + ex.bMem = b; + ex.cMem = c; + throw ex; + } + catch(...) + { + exception(current_exception()); + } +} + +void +ThrowerI::throwBasB_async(int a, int b, + function<void ()>, + function<void (const exception_ptr&)> exception, + const Ice::Current&) +{ + try + { + B ex; + ex.aMem = a; + ex.bMem = b; + throw ex; + } + catch(...) + { + exception(current_exception()); + } +} + +void +ThrowerI::throwCasB_async(int a, int b, int c, + function<void ()>, + function<void (const exception_ptr&)> exception, + const Ice::Current&) +{ + try + { + C ex; + ex.aMem = a; + ex.bMem = b; + ex.cMem = c; + throw ex; + } + catch(...) + { + exception(current_exception()); + } +} + +void +ThrowerI::throwCasC_async(int a, int b, int c, + function<void ()>, + function<void (const exception_ptr&)> exception, + const Ice::Current&) +{ + try + { + C ex; + ex.aMem = a; + ex.bMem = b; + ex.cMem = c; + throw ex; + } + catch(...) + { + exception(current_exception()); + } +} + +void +ThrowerI::throwModA_async(int a, int a2, + function<void ()>, + function<void (const exception_ptr&)> exception, + const Ice::Current&) +{ + Mod::A ex; + ex.aMem = a; + ex.a2Mem = a2; + throw ex; +} + +void +ThrowerI::throwUndeclaredA_async(int a, + function<void ()>, + function<void (const exception_ptr&)> exception, + const Ice::Current&) +{ + try + { + A ex; + ex.aMem = a; + throw ex; + } + catch(...) + { + exception(current_exception()); + } +} + +void +ThrowerI::throwUndeclaredB_async(int a, int b, + function<void ()>, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + B ex; + ex.aMem = a; + ex.bMem = b; + throw ex; +} + +void +ThrowerI::throwUndeclaredC_async(int a, int b, int c, + function<void ()>, + function<void (const exception_ptr&)> exception, + const Ice::Current&) +{ + try + { + C ex; + ex.aMem = a; + ex.bMem = b; + ex.cMem = c; + throw ex; + } + catch(...) + { + exception(current_exception()); + } +} + +void +ThrowerI::throwLocalException_async(function<void ()>, + function<void (const exception_ptr&)> exception, + const Ice::Current&) +{ + try + { + throw Ice::TimeoutException(__FILE__, __LINE__); + } + catch(...) + { + exception(current_exception()); + } +} + +void +ThrowerI::throwNonIceException_async(function<void ()>, + function<void (const exception_ptr&)> exception, + const Ice::Current&) +{ + try + { + throw int(12345); + } + catch(...) + { + exception(current_exception()); + } +} + +void +ThrowerI::throwAssertException_async(function<void ()>, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + assert(false); // No supported in C++ +} + +void +ThrowerI::throwMemoryLimitException_async(const Ice::ByteSeq&, + function<void (const Ice::ByteSeq&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + response(Ice::ByteSeq(1024 * 20)); // 20 KB. +} + +void +ThrowerI::throwLocalExceptionIdempotent_async(function<void ()>, + function<void (const exception_ptr&)> exception, + const Ice::Current&) +{ + try + { + throw Ice::TimeoutException(__FILE__, __LINE__); + } + catch(...) + { + exception(current_exception()); + } + +} + +void +ThrowerI::throwAfterResponse_async(function<void ()> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + response(); + + throw std::string(); +} + +void +ThrowerI::throwAfterException_async(function<void ()>, + function<void (const exception_ptr&)> exception, + const Ice::Current&) +{ + try + { + throw A(12345); + } + catch(...) + { + exception(current_exception()); + } + throw std::string(); +} + +void +ThrowerI::throwE_async(function<void ()>, + function<void (const exception_ptr&)> exception, + const Ice::Current&) +{ + try + { + throw E("E"); + } + catch(...) + { + exception(current_exception()); + } +} + +void +ThrowerI::throwF_async(function<void ()>, + function<void (const exception_ptr&)> exception, + const Ice::Current&) +{ + try + { + throw F("F"); + } + catch(...) + { + exception(current_exception()); + } +} + +void +ThrowerI::throwG_async(function<void ()>, + function<void (const exception_ptr&)> exception, + const Ice::Current&) +{ + try + { + throw G(__FILE__, __LINE__, "G"); + } + catch(const G& ex) + { + ostringstream os; + ex.ice_print(os); + test(endsWith(os.str(), "Test::G")); + test(ex.data == "G"); + exception(current_exception()); + } +} + +void +ThrowerI::throwH_async(function<void ()>, + function<void (const exception_ptr&)> exception, + const Ice::Current&) +{ + try + { + throw H(__FILE__, __LINE__, "H"); + } + catch(const H& ex) + { + ostringstream os; + ex.ice_print(os); + test(endsWith(os.str(), "Test::H data:'H'")); + test(ex.data == "H"); + exception(current_exception()); + } +} +#else + void ThrowerI::shutdown_async(const AMD_Thrower_shutdownPtr& cb, const Ice::Current& current) @@ -271,3 +660,4 @@ ThrowerI::throwH_async(const Test::AMD_Thrower_throwHPtr& cb, const Ice::Current cb->ice_exception(ex); } } +#endif diff --git a/cpp/test/Ice/exceptions/TestAMDI.h b/cpp/test/Ice/exceptions/TestAMDI.h index 9247d7abe10..bbc244e6d5a 100644 --- a/cpp/test/Ice/exceptions/TestAMDI.h +++ b/cpp/test/Ice/exceptions/TestAMDI.h @@ -21,6 +21,119 @@ public: ThrowerI(); +#ifdef ICE_CPP11_MAPPING + virtual void shutdown_async(std::function<void ()>, + std::function<void (const std::exception_ptr&)>, + const Ice::Current&); + + virtual void supportsUndeclaredExceptions_async(std::function<void (bool)>, + std::function<void (const std::exception_ptr&)>, + const Ice::Current&); + + virtual void supportsAssertException_async(std::function<void (bool)>, + std::function<void (const std::exception_ptr&)>, + const Ice::Current&); + + virtual void throwAasA_async(int, + std::function<void ()>, + std::function<void (const std::exception_ptr&)>, + const Ice::Current&); + + virtual void throwAorDasAorD_async(int, + std::function<void ()>, + std::function<void (const std::exception_ptr&)>, + const Ice::Current&); + + virtual void throwBasA_async(int, int, + std::function<void ()>, + std::function<void (const std::exception_ptr&)>, + const Ice::Current&); + + virtual void throwCasA_async(int, int, int, + std::function<void ()>, + std::function<void (const std::exception_ptr&)>, + const Ice::Current&); + + virtual void throwBasB_async(int, int, + std::function<void ()>, + std::function<void (const std::exception_ptr&)>, + const Ice::Current&); + + virtual void throwCasB_async(int, int, int, + std::function<void ()>, + std::function<void (const std::exception_ptr&)>, + const Ice::Current&); + + virtual void throwCasC_async(int, int, int, + std::function<void ()>, + std::function<void (const std::exception_ptr&)>, + const Ice::Current&); + + virtual void throwModA_async(int, int, + std::function<void ()>, + std::function<void (const std::exception_ptr&)>, + const Ice::Current&); + + virtual void throwUndeclaredA_async(int, + std::function<void ()>, + std::function<void (const std::exception_ptr&)>, + const Ice::Current&); + + virtual void throwUndeclaredB_async(int, int, + std::function<void ()>, + std::function<void (const std::exception_ptr&)>, + const Ice::Current&); + + virtual void throwUndeclaredC_async(int, int, int, + std::function<void ()>, + std::function<void (const std::exception_ptr&)>, + const Ice::Current&); + + virtual void throwLocalException_async(std::function<void ()>, + std::function<void (const std::exception_ptr&)>, + const Ice::Current&); + + virtual void throwNonIceException_async(std::function<void ()>, + std::function<void (const std::exception_ptr&)>, + const Ice::Current&); + + virtual void throwAssertException_async(std::function<void ()>, + std::function<void (const std::exception_ptr&)>, + const Ice::Current&); + + virtual void throwMemoryLimitException_async(const Ice::ByteSeq&, + std::function<void (const Ice::ByteSeq&)>, + std::function<void (const std::exception_ptr&)>, + const Ice::Current&); + + virtual void throwLocalExceptionIdempotent_async(std::function<void ()>, + std::function<void (const std::exception_ptr&)>, + const Ice::Current&); + + virtual void throwAfterResponse_async(std::function<void ()>, + std::function<void (const std::exception_ptr&)>, + const Ice::Current&); + + virtual void throwAfterException_async(std::function<void ()>, + std::function<void (const std::exception_ptr&)>, + const Ice::Current&); + + virtual void throwE_async(std::function<void ()>, + std::function<void (const std::exception_ptr&)>, + const Ice::Current&); + + virtual void throwF_async(std::function<void ()>, + std::function<void (const std::exception_ptr&)>, + const Ice::Current&); + + virtual void throwG_async(std::function<void ()>, + std::function<void (const std::exception_ptr&)>, + const Ice::Current&); + + virtual void throwH_async(std::function<void ()>, + std::function<void (const std::exception_ptr&)>, + const Ice::Current&); +#else virtual void shutdown_async(const Test::AMD_Thrower_shutdownPtr&, const Ice::Current&); virtual void supportsUndeclaredExceptions_async(const Test::AMD_Thrower_supportsUndeclaredExceptionsPtr&, @@ -71,6 +184,7 @@ public: virtual void throwF_async(const Test::AMD_Thrower_throwFPtr&, const Ice::Current&); virtual void throwG_async(const Test::AMD_Thrower_throwGPtr&, const Ice::Current&); virtual void throwH_async(const Test::AMD_Thrower_throwHPtr&, const Ice::Current&); +#endif }; #endif diff --git a/cpp/test/Ice/facets/.depend.mak b/cpp/test/Ice/facets/.depend.mak index ceff27f3ac2..bf715fbacf8 100755 --- a/cpp/test/Ice/facets/.depend.mak +++ b/cpp/test/Ice/facets/.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\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -96,6 +98,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" \ @@ -104,6 +107,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" \ @@ -144,7 +148,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" \ @@ -158,6 +162,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" \ @@ -169,7 +174,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" \ @@ -192,7 +196,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" \ @@ -224,6 +227,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" \ @@ -232,6 +236,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" \ @@ -272,7 +277,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" \ @@ -286,6 +291,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" \ @@ -297,7 +303,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" \ @@ -320,7 +325,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" \ @@ -352,6 +356,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" \ @@ -360,6 +365,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" \ @@ -400,7 +406,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" \ @@ -414,6 +420,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" \ @@ -425,7 +432,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" \ @@ -448,7 +454,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" \ @@ -476,6 +481,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" \ @@ -484,6 +490,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" \ @@ -524,7 +531,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" \ @@ -538,6 +545,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" \ @@ -549,7 +557,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" \ @@ -572,7 +579,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" \ @@ -605,6 +611,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" \ @@ -613,6 +620,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" \ @@ -653,7 +661,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" \ @@ -667,6 +675,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" \ @@ -678,7 +687,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" \ @@ -701,7 +709,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/faultTolerance/.depend.mak b/cpp/test/Ice/faultTolerance/.depend.mak index 623670c29e2..7fb800b42f0 100755 --- a/cpp/test/Ice/faultTolerance/.depend.mak +++ b/cpp/test/Ice/faultTolerance/.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\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -96,6 +98,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" \ @@ -104,6 +107,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" \ @@ -144,7 +148,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" \ @@ -158,6 +162,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" \ @@ -169,7 +174,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" \ @@ -192,7 +196,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" \ @@ -224,6 +227,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" \ @@ -232,6 +236,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" \ @@ -272,7 +277,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" \ @@ -286,6 +291,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" \ @@ -297,7 +303,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" \ @@ -320,7 +325,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" \ @@ -352,6 +356,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" \ @@ -360,6 +365,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" \ @@ -400,7 +406,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" \ @@ -414,6 +420,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" \ @@ -425,7 +432,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" \ @@ -448,7 +454,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" \ @@ -476,6 +481,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" \ @@ -484,6 +490,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" \ @@ -524,7 +531,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" \ @@ -538,6 +545,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" \ @@ -549,7 +557,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" \ @@ -572,7 +579,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" \ diff --git a/cpp/test/Ice/gc/.depend.mak b/cpp/test/Ice/gc/.depend.mak index 400bae8da2f..e9a93d9a3b7 100755 --- a/cpp/test/Ice/gc/.depend.mak +++ b/cpp/test/Ice/gc/.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" \ @@ -106,6 +108,7 @@ Client.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -114,6 +117,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" \ @@ -148,7 +152,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" \ @@ -161,6 +165,7 @@ Client.obj: \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -172,7 +177,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" \ @@ -195,7 +199,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" \ diff --git a/cpp/test/Ice/hash/.depend.mak b/cpp/test/Ice/hash/.depend.mak index 16250fd0f9b..19071fcf13f 100755 --- a/cpp/test/Ice/hash/.depend.mak +++ b/cpp/test/Ice/hash/.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" \ diff --git a/cpp/test/Ice/hold/.depend.mak b/cpp/test/Ice/hold/.depend.mak index b5cc13a034d..f10f0c6f4b1 100755 --- a/cpp/test/Ice/hold/.depend.mak +++ b/cpp/test/Ice/hold/.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\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -96,6 +98,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" \ @@ -104,6 +107,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" \ @@ -144,7 +148,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" \ @@ -158,6 +162,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" \ @@ -169,7 +174,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" \ @@ -192,7 +196,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" \ @@ -224,6 +227,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" \ @@ -232,6 +236,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" \ @@ -272,7 +277,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" \ @@ -286,6 +291,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" \ @@ -297,7 +303,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" \ @@ -320,7 +325,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" \ @@ -353,6 +357,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" \ @@ -361,6 +366,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" \ @@ -401,7 +407,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" \ @@ -415,6 +421,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" \ @@ -426,7 +433,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" \ @@ -449,7 +455,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" \ @@ -482,6 +487,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" \ @@ -490,6 +496,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" \ @@ -530,7 +537,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" \ @@ -544,6 +551,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" \ @@ -555,7 +563,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" \ @@ -578,7 +585,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" \ diff --git a/cpp/test/Ice/info/.depend.mak b/cpp/test/Ice/info/.depend.mak index d27c1ffb66c..09facf2b454 100755 --- a/cpp/test/Ice/info/.depend.mak +++ b/cpp/test/Ice/info/.depend.mak @@ -21,6 +21,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" \ @@ -29,6 +30,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" \ @@ -63,7 +65,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" \ @@ -72,13 +74,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\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -101,6 +103,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" \ @@ -109,6 +112,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" \ @@ -149,7 +153,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" \ @@ -163,6 +167,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" \ @@ -174,7 +179,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" \ @@ -197,7 +201,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" \ @@ -235,6 +238,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" \ @@ -243,6 +247,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" \ @@ -283,7 +288,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" \ @@ -297,6 +302,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" \ @@ -308,7 +314,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" \ @@ -331,7 +336,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" \ @@ -363,6 +367,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" \ @@ -371,6 +376,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" \ @@ -411,7 +417,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" \ @@ -425,6 +431,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" \ @@ -436,7 +443,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" \ @@ -459,7 +465,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" \ @@ -497,6 +502,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" \ @@ -505,6 +511,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" \ @@ -545,7 +552,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" \ @@ -559,6 +566,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" \ @@ -570,7 +578,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" \ @@ -593,7 +600,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" \ diff --git a/cpp/test/Ice/info/AllTests.cpp b/cpp/test/Ice/info/AllTests.cpp index e07414e7816..cb2678bd4d5 100644 --- a/cpp/test/Ice/info/AllTests.cpp +++ b/cpp/test/Ice/info/AllTests.cpp @@ -20,14 +20,14 @@ allTests(const Ice::CommunicatorPtr& communicator) { cout << "testing proxy endpoint information... " << flush; { - Ice::ObjectPrx p1 = + Ice::ObjectPrxPtr p1 = communicator->stringToProxy("test -t:default -h tcphost -p 10000 -t 1200 -z --sourceAddress 10.10.10.10:" "udp -h udphost -p 10001 --interface eth0 --ttl 5 --sourceAddress 10.10.10.10:" "opaque -e 1.8 -t 100 -v ABCD"); Ice::EndpointSeq endps = p1->ice_getEndpoints(); - Ice::IPEndpointInfoPtr ipEndpoint = Ice::IPEndpointInfoPtr::dynamicCast(endps[0]->getInfo()); + Ice::IPEndpointInfoPtr ipEndpoint = ICE_DYNAMIC_CAST(Ice::IPEndpointInfo, endps[0]->getInfo()); test(ipEndpoint); test(ipEndpoint->host == "tcphost"); test(ipEndpoint->port == 10000); @@ -41,12 +41,12 @@ allTests(const Ice::CommunicatorPtr& communicator) (ipEndpoint->type() == IceSSL::EndpointType && ipEndpoint->secure()) || (ipEndpoint->type() == Ice::WSEndpointType && !ipEndpoint->secure()) || (ipEndpoint->type() == Ice::WSSEndpointType && ipEndpoint->secure())); - test((ipEndpoint->type() == Ice::TCPEndpointType && Ice::TCPEndpointInfoPtr::dynamicCast(ipEndpoint)) || - (ipEndpoint->type() == IceSSL::EndpointType && IceSSL::EndpointInfoPtr::dynamicCast(ipEndpoint)) || - (ipEndpoint->type() == Ice::WSEndpointType && Ice::WSEndpointInfoPtr::dynamicCast(ipEndpoint)) || - (ipEndpoint->type() == Ice::WSSEndpointType && IceSSL::WSSEndpointInfoPtr::dynamicCast(ipEndpoint))); + test((ipEndpoint->type() == Ice::TCPEndpointType && ICE_DYNAMIC_CAST(Ice::TCPEndpointInfo, ipEndpoint)) || + (ipEndpoint->type() == IceSSL::EndpointType && ICE_DYNAMIC_CAST(IceSSL::EndpointInfo, ipEndpoint)) || + (ipEndpoint->type() == Ice::WSEndpointType && ICE_DYNAMIC_CAST(Ice::WSEndpointInfo, ipEndpoint)) || + (ipEndpoint->type() == Ice::WSSEndpointType && ICE_DYNAMIC_CAST(IceSSL::WSSEndpointInfo, ipEndpoint))); - Ice::UDPEndpointInfoPtr udpEndpoint = Ice::UDPEndpointInfoPtr::dynamicCast(endps[1]->getInfo()); + Ice::UDPEndpointInfoPtr udpEndpoint = ICE_DYNAMIC_CAST(Ice::UDPEndpointInfo, endps[1]->getInfo()); test(udpEndpoint); test(udpEndpoint->host == "udphost"); test(udpEndpoint->port == 10001); @@ -61,7 +61,7 @@ allTests(const Ice::CommunicatorPtr& communicator) test(udpEndpoint->datagram()); test(udpEndpoint->type() == Ice::UDPEndpointType); - Ice::OpaqueEndpointInfoPtr opaqueEndpoint = Ice::OpaqueEndpointInfoPtr::dynamicCast(endps[2]->getInfo()); + Ice::OpaqueEndpointInfoPtr opaqueEndpoint = ICE_DYNAMIC_CAST(Ice::OpaqueEndpointInfo, endps[2]->getInfo()); test(opaqueEndpoint); Ice::EncodingVersion rev; rev.major = 1; @@ -81,7 +81,7 @@ allTests(const Ice::CommunicatorPtr& communicator) Ice::EndpointSeq publishedEndpoints = adapter->getPublishedEndpoints(); test(endpoints == publishedEndpoints); - Ice::IPEndpointInfoPtr ipEndpoint = Ice::IPEndpointInfoPtr::dynamicCast(endpoints[0]->getInfo()); + Ice::IPEndpointInfoPtr ipEndpoint = ICE_DYNAMIC_CAST(Ice::IPEndpointInfo, endpoints[0]->getInfo()); test(ipEndpoint); test(ipEndpoint->type() == Ice::TCPEndpointType || ipEndpoint->type() == IceSSL::EndpointType || ipEndpoint->type() == Ice::WSEndpointType || ipEndpoint->type() == Ice::WSSEndpointType); @@ -89,7 +89,7 @@ allTests(const Ice::CommunicatorPtr& communicator) test(ipEndpoint->port > 0); test(ipEndpoint->timeout == 15000); - Ice::UDPEndpointInfoPtr udpEndpoint = Ice::UDPEndpointInfoPtr::dynamicCast(endpoints[1]->getInfo()); + Ice::UDPEndpointInfoPtr udpEndpoint = ICE_DYNAMIC_CAST(Ice::UDPEndpointInfo, endpoints[1]->getInfo()); test(udpEndpoint); test(udpEndpoint->host == "127.0.0.1"); test(udpEndpoint->datagram()); @@ -108,11 +108,11 @@ allTests(const Ice::CommunicatorPtr& communicator) for(Ice::EndpointSeq::const_iterator p = endpoints.begin(); p != endpoints.end(); ++p) { - ipEndpoint = Ice::IPEndpointInfoPtr::dynamicCast((*p)->getInfo()); + ipEndpoint = ICE_DYNAMIC_CAST(Ice::IPEndpointInfo, (*p)->getInfo()); test(ipEndpoint->port == 12020); } - ipEndpoint = Ice::IPEndpointInfoPtr::dynamicCast(publishedEndpoints[0]->getInfo()); + ipEndpoint = ICE_DYNAMIC_CAST(Ice::IPEndpointInfo, publishedEndpoints[0]->getInfo()); test(ipEndpoint->host == "127.0.0.1"); test(ipEndpoint->port == 12020); @@ -120,13 +120,13 @@ allTests(const Ice::CommunicatorPtr& communicator) } cout << "ok" << endl; - Ice::ObjectPrx base = communicator->stringToProxy("test:default -p 12010:udp -p 12010 -c"); - TestIntfPrx testIntf = TestIntfPrx::checkedCast(base); + Ice::ObjectPrxPtr base = communicator->stringToProxy("test:default -p 12010:udp -p 12010 -c"); + TestIntfPrxPtr testIntf = ICE_CHECKED_CAST(TestIntfPrx, base); cout << "test connection endpoint information... " << flush; { Ice::EndpointInfoPtr info = base->ice_getConnection()->getEndpoint()->getInfo(); - Ice::IPEndpointInfoPtr ipinfo = Ice::IPEndpointInfoPtr::dynamicCast(info); + Ice::IPEndpointInfoPtr ipinfo = ICE_DYNAMIC_CAST(Ice::IPEndpointInfo, info); test(ipinfo->port == 12010); test(!ipinfo->compress); test(ipinfo->host == defaultHost); @@ -142,7 +142,7 @@ allTests(const Ice::CommunicatorPtr& communicator) test(port > 0); info = base->ice_datagram()->ice_getConnection()->getEndpoint()->getInfo(); - Ice::UDPEndpointInfoPtr udp = Ice::UDPEndpointInfoPtr::dynamicCast(info); + Ice::UDPEndpointInfoPtr udp = ICE_DYNAMIC_CAST(Ice::UDPEndpointInfo, info); test(udp); test(udp->port == 12010); test(udp->host == defaultHost); @@ -154,7 +154,7 @@ allTests(const Ice::CommunicatorPtr& communicator) Ice::ConnectionPtr connection = base->ice_getConnection(); connection->setBufferSize(1024, 2048); - Ice::IPConnectionInfoPtr info = Ice::IPConnectionInfoPtr::dynamicCast(connection->getInfo()); + Ice::IPConnectionInfoPtr info = ICE_DYNAMIC_CAST(Ice::IPConnectionInfo, connection->getInfo()); test(info); test(!info->incoming); test(info->adapterName.empty()); @@ -188,13 +188,13 @@ allTests(const Ice::CommunicatorPtr& communicator) { Ice::HeaderDict headers; - Ice::WSConnectionInfoPtr wsinfo = Ice::WSConnectionInfoPtr::dynamicCast(info); + Ice::WSConnectionInfoPtr wsinfo = ICE_DYNAMIC_CAST(Ice::WSConnectionInfo, info); if(wsinfo) { headers = wsinfo->headers; } - IceSSL::WSSConnectionInfoPtr wssinfo = IceSSL::WSSConnectionInfoPtr::dynamicCast(info); + IceSSL::WSSConnectionInfoPtr wssinfo = ICE_DYNAMIC_CAST(IceSSL::WSSConnectionInfo, info); if(wssinfo) { headers = wssinfo->headers; @@ -219,7 +219,7 @@ allTests(const Ice::CommunicatorPtr& communicator) connection = base->ice_datagram()->ice_getConnection(); connection->setBufferSize(2048, 1024); - info = Ice::IPConnectionInfoPtr::dynamicCast(connection->getInfo()); + info = ICE_DYNAMIC_CAST(Ice::IPConnectionInfo, connection->getInfo()); test(!info->incoming); test(info->adapterName.empty()); test(info->localPort > 0); diff --git a/cpp/test/Ice/info/Server.cpp b/cpp/test/Ice/info/Server.cpp index 50c861627a8..b58aa06935d 100644 --- a/cpp/test/Ice/info/Server.cpp +++ b/cpp/test/Ice/info/Server.cpp @@ -20,7 +20,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(new TestI, communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(TestI), communicator->stringToIdentity("test")); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/info/TestI.cpp b/cpp/test/Ice/info/TestI.cpp index 11588b29294..735c098c5b9 100644 --- a/cpp/test/Ice/info/TestI.cpp +++ b/cpp/test/Ice/info/TestI.cpp @@ -38,16 +38,16 @@ TestI::getEndpointInfoAsContext(const Ice::Current& c) os << info->type(); ctx["type"] = os.str(); - Ice::IPEndpointInfoPtr ipinfo = Ice::IPEndpointInfoPtr::dynamicCast(info); + Ice::IPEndpointInfoPtr ipinfo = ICE_DYNAMIC_CAST(Ice::IPEndpointInfo, info); test(info); ctx["host"] = ipinfo->host; os.str(""); os << ipinfo->port; ctx["port"] = os.str(); - if(Ice::UDPEndpointInfoPtr::dynamicCast(ipinfo)) + if(ICE_DYNAMIC_CAST(Ice::UDPEndpointInfo, ipinfo)) { - Ice::UDPEndpointInfoPtr udp = Ice::UDPEndpointInfoPtr::dynamicCast(ipinfo); + Ice::UDPEndpointInfoPtr udp = ICE_DYNAMIC_CAST(Ice::UDPEndpointInfo, ipinfo); ctx["mcastInterface"] = udp->mcastInterface; ctx["mcastTtl"] = udp->mcastTtl; } @@ -64,7 +64,7 @@ TestI::getConnectionInfoAsContext(const Ice::Current& c) ctx["incoming"] = info->incoming ? "true" : "false"; ostringstream os; - Ice::IPConnectionInfoPtr ipinfo = Ice::IPConnectionInfoPtr::dynamicCast(info); + Ice::IPConnectionInfoPtr ipinfo = ICE_DYNAMIC_CAST(Ice::IPConnectionInfo, info); test(ipinfo); ctx["localAddress"] = ipinfo->localAddress; os.str(""); @@ -75,7 +75,7 @@ TestI::getConnectionInfoAsContext(const Ice::Current& c) os << ipinfo->remotePort; ctx["remotePort"] = os.str(); - Ice::WSConnectionInfoPtr wsinfo = Ice::WSConnectionInfoPtr::dynamicCast(info); + Ice::WSConnectionInfoPtr wsinfo = ICE_DYNAMIC_CAST(Ice::WSConnectionInfo, info); if(wsinfo) { for(Ice::HeaderDict::const_iterator p = wsinfo->headers.begin(); p != wsinfo->headers.end(); ++p) @@ -84,7 +84,7 @@ TestI::getConnectionInfoAsContext(const Ice::Current& c) } } - IceSSL::WSSConnectionInfoPtr wssinfo = IceSSL::WSSConnectionInfoPtr::dynamicCast(info); + IceSSL::WSSConnectionInfoPtr wssinfo = ICE_DYNAMIC_CAST(IceSSL::WSSConnectionInfo, info); if(wssinfo) { for(Ice::HeaderDict::const_iterator p = wssinfo->headers.begin(); p != wssinfo->headers.end(); ++p) 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 diff --git a/cpp/test/Ice/interceptor/.depend.mak b/cpp/test/Ice/interceptor/.depend.mak index c0afe11efaf..9e0737a341a 100755 --- a/cpp/test/Ice/interceptor/.depend.mak +++ b/cpp/test/Ice/interceptor/.depend.mak @@ -18,6 +18,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" \ @@ -26,6 +27,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" \ @@ -66,7 +68,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" \ @@ -80,6 +82,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" \ @@ -91,7 +94,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" \ @@ -114,7 +116,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" \ @@ -150,6 +151,7 @@ InterceptorI.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" \ @@ -158,6 +160,7 @@ InterceptorI.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" \ @@ -198,7 +201,7 @@ InterceptorI.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" \ @@ -212,6 +215,7 @@ InterceptorI.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" \ @@ -223,7 +227,6 @@ InterceptorI.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" \ @@ -246,7 +249,6 @@ InterceptorI.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" \ @@ -281,6 +283,7 @@ AMDInterceptorI.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" \ @@ -289,6 +292,7 @@ AMDInterceptorI.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" \ @@ -329,7 +333,7 @@ AMDInterceptorI.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" \ @@ -343,6 +347,7 @@ AMDInterceptorI.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" \ @@ -354,7 +359,6 @@ AMDInterceptorI.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" \ @@ -377,7 +381,6 @@ AMDInterceptorI.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" \ @@ -409,6 +412,7 @@ MyObjectI.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" \ @@ -417,6 +421,7 @@ MyObjectI.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" \ @@ -457,7 +462,7 @@ MyObjectI.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" \ @@ -471,6 +476,7 @@ MyObjectI.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" \ @@ -482,7 +488,6 @@ MyObjectI.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" \ @@ -505,7 +510,6 @@ MyObjectI.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" \ @@ -536,6 +540,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" \ @@ -544,6 +549,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" \ @@ -578,7 +584,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" \ @@ -587,6 +593,7 @@ 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" \ @@ -594,7 +601,6 @@ Test.obj: \ "$(includedir)\Ice\IncomingAsync.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" \ @@ -619,6 +625,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" \ @@ -627,6 +634,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" \ @@ -667,7 +675,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" \ @@ -681,6 +689,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" \ @@ -692,7 +701,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" \ @@ -715,7 +723,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" \ diff --git a/cpp/test/Ice/invoke/.depend.mak b/cpp/test/Ice/invoke/.depend.mak index 13749586535..888e9a27c13 100755 --- a/cpp/test/Ice/invoke/.depend.mak +++ b/cpp/test/Ice/invoke/.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 @@ BlobjectI.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 @@ BlobjectI.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 @@ BlobjectI.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 @@ BlobjectI.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 @@ BlobjectI.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 @@ BlobjectI.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" \ @@ -483,6 +488,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" \ @@ -491,6 +497,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" \ @@ -531,7 +538,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" \ @@ -545,6 +552,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" \ @@ -556,7 +564,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" \ @@ -579,7 +586,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" \ diff --git a/cpp/test/Ice/invoke/AllTests.cpp b/cpp/test/Ice/invoke/AllTests.cpp index 6af7732fce0..fc7cf33cf60 100644 --- a/cpp/test/Ice/invoke/AllTests.cpp +++ b/cpp/test/Ice/invoke/AllTests.cpp @@ -525,7 +525,7 @@ allTests(const Ice::CommunicatorPtr& communicator) } cout << "ok" << endl; -#ifdef ICE_CPP11 +#ifdef ICE_CPP11_COMPILER cout << "testing asynchronous ice_invoke with C++11 style callbacks... " << flush; { diff --git a/cpp/test/Ice/location/.depend.mak b/cpp/test/Ice/location/.depend.mak index 60da4595b9b..aaf731b95f1 100755 --- a/cpp/test/Ice/location/.depend.mak +++ b/cpp/test/Ice/location/.depend.mak @@ -3,7 +3,7 @@ Test.h: \ Test.ice \ "$(slicedir)/Ice/Locator.ice" \ "$(slicedir)/Ice/Identity.ice" \ - "$(slicedir)/Ice/ProcessF.ice" + "$(slicedir)/Ice/Process.ice" Test.obj: \ Test.cpp \ @@ -19,6 +19,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" \ @@ -27,6 +28,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" \ @@ -61,7 +63,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" \ @@ -70,6 +72,7 @@ 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" \ @@ -77,9 +80,8 @@ Test.obj: \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Locator.h" \ - "$(includedir)\Ice\ProcessF.h" \ + "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Outgoing.h" \ @@ -104,6 +106,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" \ @@ -112,6 +115,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" \ @@ -152,7 +156,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" \ @@ -166,6 +170,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" \ @@ -177,7 +182,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" \ @@ -200,7 +204,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" \ @@ -232,6 +235,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" \ @@ -240,6 +244,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" \ @@ -280,7 +285,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" \ @@ -294,6 +299,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" \ @@ -305,7 +311,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" \ @@ -328,7 +333,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" \ @@ -360,6 +364,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" \ @@ -368,6 +373,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" \ @@ -408,7 +414,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" \ @@ -422,6 +428,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" \ @@ -433,7 +440,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" \ @@ -456,7 +462,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" \ @@ -485,6 +490,7 @@ ServerLocator.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" \ @@ -493,6 +499,7 @@ ServerLocator.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" \ @@ -533,7 +540,7 @@ ServerLocator.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" \ @@ -547,6 +554,7 @@ ServerLocator.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" \ @@ -558,7 +566,6 @@ ServerLocator.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" \ @@ -581,7 +588,6 @@ ServerLocator.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" \ @@ -614,6 +620,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" \ @@ -622,6 +629,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" \ @@ -662,7 +670,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" \ @@ -676,6 +684,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" \ @@ -687,7 +696,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" \ @@ -710,7 +718,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" \ diff --git a/cpp/test/Ice/logger/.depend.mak b/cpp/test/Ice/logger/.depend.mak index 7075e5fc98e..14f054556ec 100755 --- a/cpp/test/Ice/logger/.depend.mak +++ b/cpp/test/Ice/logger/.depend.mak @@ -15,6 +15,7 @@ Client1.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" \ @@ -23,6 +24,7 @@ Client1.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" \ @@ -63,7 +65,7 @@ Client1.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" \ @@ -77,6 +79,7 @@ Client1.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" \ @@ -88,7 +91,6 @@ Client1.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" \ @@ -111,7 +113,6 @@ Client1.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" \ @@ -142,6 +143,7 @@ Client2.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" \ @@ -150,6 +152,7 @@ Client2.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" \ @@ -190,7 +193,7 @@ Client2.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" \ @@ -204,6 +207,7 @@ Client2.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" \ @@ -215,7 +219,6 @@ Client2.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" \ @@ -238,7 +241,6 @@ Client2.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" \ @@ -269,6 +271,7 @@ Client3.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" \ @@ -277,6 +280,7 @@ Client3.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" \ @@ -317,7 +321,7 @@ Client3.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" \ @@ -331,6 +335,7 @@ Client3.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" \ @@ -342,7 +347,6 @@ Client3.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" \ @@ -365,7 +369,6 @@ Client3.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" \ @@ -396,6 +399,7 @@ Client4.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" \ @@ -404,6 +408,7 @@ Client4.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" \ @@ -444,7 +449,7 @@ Client4.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" \ @@ -458,6 +463,7 @@ Client4.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" \ @@ -469,7 +475,6 @@ Client4.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" \ @@ -492,7 +497,6 @@ Client4.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/metrics/.depend.mak b/cpp/test/Ice/metrics/.depend.mak index 4d48ae21728..18aed21adc4 100755 --- a/cpp/test/Ice/metrics/.depend.mak +++ b/cpp/test/Ice/metrics/.depend.mak @@ -19,6 +19,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" \ @@ -27,6 +28,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" \ @@ -61,7 +63,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" \ @@ -70,13 +72,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" \ @@ -101,6 +103,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" \ @@ -109,6 +112,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" \ @@ -149,7 +153,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" \ @@ -163,6 +167,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" \ @@ -174,7 +179,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" \ @@ -197,7 +201,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" \ @@ -230,6 +233,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" \ @@ -238,6 +242,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" \ @@ -278,7 +283,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" \ @@ -292,6 +297,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" \ @@ -303,7 +309,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" \ @@ -326,7 +331,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" \ @@ -359,6 +363,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" \ @@ -367,6 +372,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" \ @@ -407,7 +413,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" \ @@ -421,6 +427,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" \ @@ -432,7 +439,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" \ @@ -455,7 +461,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" \ @@ -483,6 +488,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" \ @@ -491,6 +497,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" \ @@ -531,7 +538,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" \ @@ -545,6 +552,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" \ @@ -556,7 +564,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" \ @@ -579,7 +586,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" \ @@ -610,6 +616,7 @@ TestAMD.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" \ @@ -618,6 +625,7 @@ TestAMD.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" \ @@ -652,7 +660,7 @@ TestAMD.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" \ @@ -661,6 +669,7 @@ TestAMD.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" \ @@ -668,7 +677,6 @@ TestAMD.obj: \ "$(includedir)\Ice\IncomingAsync.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" \ @@ -693,6 +701,7 @@ TestAMDI.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" \ @@ -701,6 +710,7 @@ TestAMDI.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" \ @@ -741,7 +751,7 @@ TestAMDI.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" \ @@ -755,6 +765,7 @@ TestAMDI.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" \ @@ -766,7 +777,6 @@ TestAMDI.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" \ @@ -789,7 +799,6 @@ TestAMDI.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" \ @@ -817,6 +826,7 @@ ServerAMD.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" \ @@ -825,6 +835,7 @@ ServerAMD.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" \ @@ -865,7 +876,7 @@ ServerAMD.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" \ @@ -879,6 +890,7 @@ ServerAMD.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" \ @@ -890,7 +902,6 @@ ServerAMD.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" \ @@ -913,7 +924,6 @@ ServerAMD.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" \ @@ -946,6 +956,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" \ @@ -954,6 +965,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" \ @@ -994,7 +1006,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" \ @@ -1008,6 +1020,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" \ @@ -1019,7 +1032,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" \ @@ -1042,7 +1054,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/networkProxy/.depend.mak b/cpp/test/Ice/networkProxy/.depend.mak index 5ea151ca1a6..3e6789ff9c6 100755 --- a/cpp/test/Ice/networkProxy/.depend.mak +++ b/cpp/test/Ice/networkProxy/.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\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -96,6 +98,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" \ @@ -104,6 +107,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" \ @@ -144,7 +148,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" \ @@ -158,6 +162,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" \ @@ -169,7 +174,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" \ @@ -192,7 +196,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" \ @@ -224,6 +227,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" \ @@ -232,6 +236,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" \ @@ -272,7 +277,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" \ @@ -286,6 +291,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" \ @@ -297,7 +303,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" \ @@ -320,7 +325,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" \ @@ -352,6 +356,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" \ @@ -360,6 +365,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" \ @@ -400,7 +406,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" \ @@ -414,6 +420,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" \ @@ -425,7 +432,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" \ @@ -448,7 +454,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" \ diff --git a/cpp/test/Ice/objects/.depend.mak b/cpp/test/Ice/objects/.depend.mak index c845ec47617..35104594691 100755 --- a/cpp/test/Ice/objects/.depend.mak +++ b/cpp/test/Ice/objects/.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 @@ 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" \ @@ -106,6 +109,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" \ @@ -146,7 +150,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" \ @@ -160,6 +164,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" \ @@ -171,7 +176,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" \ @@ -194,7 +198,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" \ @@ -222,6 +225,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" \ @@ -230,6 +234,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" \ @@ -270,7 +275,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" \ @@ -284,6 +289,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" \ @@ -295,7 +301,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" \ @@ -318,7 +323,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" \ @@ -351,6 +355,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" \ @@ -359,6 +364,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" \ @@ -399,7 +405,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" \ @@ -413,6 +419,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" \ @@ -424,7 +431,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" \ @@ -447,7 +453,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" \ @@ -479,6 +484,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" \ @@ -487,6 +493,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" \ @@ -527,7 +534,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" \ @@ -541,6 +548,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" \ @@ -552,7 +560,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" \ @@ -575,7 +582,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" \ @@ -608,6 +614,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" \ @@ -616,6 +623,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" \ @@ -656,7 +664,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" \ @@ -670,6 +678,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" \ @@ -681,7 +690,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" \ @@ -704,7 +712,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/objects/AllTests.cpp b/cpp/test/Ice/objects/AllTests.cpp index ea7feee2778..c1115c698c2 100644 --- a/cpp/test/Ice/objects/AllTests.cpp +++ b/cpp/test/Ice/objects/AllTests.cpp @@ -26,9 +26,9 @@ void testUOE(const Ice::CommunicatorPtr& communicator) { string ref = "uoet:default -p 12010"; - Ice::ObjectPrx base = communicator->stringToProxy(ref); + Ice::ObjectPrxPtr base = communicator->stringToProxy(ref); test(base); - UnexpectedObjectExceptionTestPrx uoet = UnexpectedObjectExceptionTestPrx::uncheckedCast(base); + UnexpectedObjectExceptionTestPrxPtr uoet = ICE_UNCHECKED_CAST(UnexpectedObjectExceptionTestPrx, base); test(uoet); try { @@ -51,30 +51,34 @@ testUOE(const Ice::CommunicatorPtr& communicator) } } -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 << "testing constructor, copy constructor, and assignment operator... " << flush; - BasePtr ba1 = new Base; + BasePtr ba1 = ICE_MAKE_SHARED(Base); test(ba1->theS.str == ""); test(ba1->str == ""); S s; s.str = "hello"; - BasePtr ba2 = new Base(s, "hi"); + BasePtr ba2 = ICE_MAKE_SHARED(Base, s, "hi"); test(ba2->theS.str == "hello"); test(ba2->str == "hi"); @@ -82,7 +86,7 @@ allTests(const Ice::CommunicatorPtr& communicator) test(ba1->theS.str == "hello"); test(ba1->str == "hi"); - BasePtr bp1 = new Base(); + BasePtr bp1 = ICE_MAKE_SHARED(Base); *bp1 = *ba2; test(bp1->theS.str == "hello"); test(bp1->str == "hi"); @@ -91,11 +95,15 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "testing ice_clone..." << flush; - BasePtr bp2 = BasePtr::dynamicCast(bp1->ice_clone()); + BasePtr bp2 = ICE_DYNAMIC_CAST(Base, bp1->ice_clone()); test(bp1->theS.str == bp2->theS.str); test(bp1->str == bp2->str); - AbstractBasePtr abp1 = new AbstractBaseI; +#ifndef ICE_CPP11_MAPPING + // + // With C++11 mapping value classes are never abstracts. + // + AbstractBasePtr abp1 = new AbstractBaseI(); try { abp1->ice_clone(); @@ -104,6 +112,7 @@ allTests(const Ice::CommunicatorPtr& communicator) catch(const Ice::CloneNotImplementedException&) { } +#endif cout << "ok" << endl; cout << "getting B1... " << flush; @@ -128,29 +137,42 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "checking consistency... " << flush; test(b1 != b2); +#ifdef ICE_CPP11_MAPPING + test(b1 != dynamic_pointer_cast<B>(c)); + test(b1 != dynamic_pointer_cast<B>(d)); + test(b2 != dynamic_pointer_cast<B>(c)); + test(b2 != dynamic_pointer_cast<B>(d)); + test(c != dynamic_pointer_cast<C>(d)); +#else test(b1 != c); test(b1 != d); test(b2 != c); test(b2 != d); test(c != d); +#endif test(b1->theB == b1); - test(b1->theC == 0); - test(BPtr::dynamicCast(b1->theA)); - test(BPtr::dynamicCast(b1->theA)->theA == b1->theA); - test(BPtr::dynamicCast(b1->theA)->theB == b1); - test(CPtr::dynamicCast(BPtr::dynamicCast(b1->theA)->theC)); - test(CPtr::dynamicCast(BPtr::dynamicCast(b1->theA)->theC)->theB == b1->theA); + test(b1->theC == ICE_NULLPTR); + test(ICE_DYNAMIC_CAST(B, b1->theA)); + test(ICE_DYNAMIC_CAST(B, b1->theA)->theA == b1->theA); + test(ICE_DYNAMIC_CAST(B, b1->theA)->theB == b1); + test(ICE_DYNAMIC_CAST(C, ICE_DYNAMIC_CAST(B, b1->theA)->theC)); + test(ICE_DYNAMIC_CAST(C, ICE_DYNAMIC_CAST(B, b1->theA)->theC)->theB == b1->theA); +#ifdef ICE_CPP11_MAPPING + test(b1->preMarshalInvoked); + test(b1->theA->preMarshalInvoked); + test(dynamic_pointer_cast<B>(b1->theA)->theC->preMarshalInvoked); +#else test(b1->preMarshalInvoked); test(b1->postUnmarshalInvoked()); test(b1->theA->preMarshalInvoked); test(b1->theA->postUnmarshalInvoked()); test(BPtr::dynamicCast(b1->theA)->theC->preMarshalInvoked); test(BPtr::dynamicCast(b1->theA)->theC->postUnmarshalInvoked()); - +#endif // More tests possible for b2 and d, but I think this is already sufficient. test(b2->theA == b2); - test(d->theC == 0); + test(d->theC == ICE_NULLPTR); cout << "ok" << endl; cout << "getting B1, B2, C, and D all at once... " << flush; @@ -162,6 +184,29 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "ok" << endl; cout << "checking consistency... " << flush; +#ifdef ICE_CPP11_MAPPING + test(b1 != b2); + test(b1 != dynamic_pointer_cast<B>(c)); + test(b1 != dynamic_pointer_cast<B>(d)); + test(b2 != dynamic_pointer_cast<B>(c)); + test(b2 != dynamic_pointer_cast<B>(d)); + test(c != dynamic_pointer_cast<C>(d)); + test(b1->theA == dynamic_pointer_cast<B>(b2)); + test(b1->theB == dynamic_pointer_cast<B>(b1)); + test(b1->theC == nullptr); + test(b2->theA == b2); + test(b2->theB == b1); + test(b2->theC == dynamic_pointer_cast<C>(c)); + test(c->theB == b2); + test(d->theA == dynamic_pointer_cast<A>(b1)); + test(d->theB == dynamic_pointer_cast<B>(b2)); + test(d->theC == nullptr); + + test(d->preMarshalInvoked); + test(d->theA->preMarshalInvoked); + test(d->theB->preMarshalInvoked); + test(d->theB->theC->preMarshalInvoked); +#else test(b1 != b2); test(b1 != c); test(b1 != d); @@ -170,15 +215,15 @@ allTests(const Ice::CommunicatorPtr& communicator) test(c != d); test(b1->theA == b2); test(b1->theB == b1); - test(b1->theC == 0); + test(b1->theC == ICE_NULLPTR); test(b2->theA == b2); test(b2->theB == b1); test(b2->theC == c); test(c->theB == b2); test(d->theA == b1); test(d->theB == b2); - test(d->theC == 0); - + test(d->theC == ICE_NULLPTR); + test(d->preMarshalInvoked); test(d->postUnmarshalInvoked()); test(d->theA->preMarshalInvoked); @@ -187,28 +232,44 @@ allTests(const Ice::CommunicatorPtr& communicator) test(d->theB->postUnmarshalInvoked()); test(d->theB->theC->preMarshalInvoked); test(d->theB->theC->postUnmarshalInvoked()); - +#endif cout << "ok" << endl; cout << "testing protected members... " << flush; + EPtr e = initial->getE(); - test(e->checkValues()); FPtr f = initial->getF(); +#ifndef ICE_CPP11_MAPPING + test(e->checkValues()); test(f->checkValues()); test(f->e2->checkValues()); +#endif cout << "ok" << endl; cout << "getting I, J and H... " << flush; +#ifdef ICE_CPP11_MAPPING + shared_ptr<Ice::Value> i = initial->getI(); + test(i->ice_id() == "::Test::I"); + shared_ptr<Ice::Value> j = initial->getJ(); + test(j->ice_id() == "::Test::J"); + shared_ptr<Ice::Value> h = initial->getH(); + test(h && dynamic_pointer_cast<H>(h)); +#else IPtr i = initial->getI(); test(i); IPtr j = initial->getJ(); test(j && JPtr::dynamicCast(j)); IPtr h = initial->getH(); test(h && HPtr::dynamicCast(h)); +#endif cout << "ok" << endl; cout << "getting D1... " << flush; - D1Ptr d1 = new D1(new A1("a1"), new A1("a2"), new A1("a3"), new A1("a4")); + D1Ptr d1 = ICE_MAKE_SHARED(D1, + ICE_MAKE_SHARED(A1, "a1"), + ICE_MAKE_SHARED(A1, "a2"), + ICE_MAKE_SHARED(A1, "a3"), + ICE_MAKE_SHARED(A1, "a4")); d1 = initial->getD1(d1); test(d1->a1->name == "a1"); test(d1->a2->name == "a2"); @@ -242,7 +303,7 @@ allTests(const Ice::CommunicatorPtr& communicator) retS = initial->opBaseSeq(inS, outS); inS.resize(1); - inS[0] = new Base(); + inS[0] = ICE_MAKE_SHARED(Base); retS = initial->opBaseSeq(inS, outS); test(retS.size() == 1 && outS.size() == 1); cout << "ok" << endl; @@ -257,9 +318,12 @@ allTests(const Ice::CommunicatorPtr& communicator) } cout << "ok" << endl; +#ifdef ICE_CPP11_MAPPING + // TODO +#else cout << "testing UnexpectedObjectException... " << flush; testUOE(communicator); cout << "ok" << endl; - +#endif return initial; } diff --git a/cpp/test/Ice/objects/Client.cpp b/cpp/test/Ice/objects/Client.cpp index 303d79031af..471f63de90e 100644 --- a/cpp/test/Ice/objects/Client.cpp +++ b/cpp/test/Ice/objects/Client.cpp @@ -16,6 +16,16 @@ DEFINE_TEST("client") using namespace std; using namespace Test; +#ifdef ICE_CPP11_MAPPING +template<typename T> +function<shared_ptr<T>(const string&)> makeFactory() +{ + return [](const string&) + { + return make_shared<T>(); + }; +} +#else class MyObjectFactory : public Ice::ObjectFactory { public: @@ -64,10 +74,21 @@ public: // Nothing to do } }; +#endif int run(int, char**, const Ice::CommunicatorPtr& communicator) { +#ifdef ICE_CPP11_MAPPING + communicator->addObjectFactory(makeFactory<BI>(), "::Test::B"); + communicator->addObjectFactory(makeFactory<CI>(), "::Test::C"); + communicator->addObjectFactory(makeFactory<DI>(), "::Test::D"); + communicator->addObjectFactory(makeFactory<EI>(), "::Test::E"); + communicator->addObjectFactory(makeFactory<FI>(), "::Test::F"); + communicator->addObjectFactory(makeFactory<II>(), "::Test::I"); + communicator->addObjectFactory(makeFactory<JI>(), "::Test::J"); + communicator->addObjectFactory(makeFactory<HI>(), "::Test::H"); +#else Ice::ObjectFactoryPtr factory = new MyObjectFactory; communicator->addObjectFactory(factory, "::Test::B"); communicator->addObjectFactory(factory, "::Test::C"); @@ -77,9 +98,10 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) communicator->addObjectFactory(factory, "::Test::I"); communicator->addObjectFactory(factory, "::Test::J"); communicator->addObjectFactory(factory, "::Test::H"); +#endif - 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/objects/Collocated.cpp b/cpp/test/Ice/objects/Collocated.cpp index 781c216a855..0d2f8562fa9 100644 --- a/cpp/test/Ice/objects/Collocated.cpp +++ b/cpp/test/Ice/objects/Collocated.cpp @@ -16,6 +16,16 @@ DEFINE_TEST("collocated") using namespace std; using namespace Test; +#ifdef ICE_CPP11_MAPPING +template<typename T> +function<shared_ptr<T>(const string&)> makeFactory() +{ + return [](const string&) + { + return make_shared<T>(); + }; +} +#else class MyObjectFactory : public Ice::ObjectFactory { public: @@ -64,10 +74,21 @@ public: // Nothing to do } }; +#endif int run(int, char**, const Ice::CommunicatorPtr& communicator) { +#ifdef ICE_CPP11_MAPPING + communicator->addObjectFactory(makeFactory<BI>(), "::Test::B"); + communicator->addObjectFactory(makeFactory<CI>(), "::Test::C"); + communicator->addObjectFactory(makeFactory<DI>(), "::Test::D"); + communicator->addObjectFactory(makeFactory<EI>(), "::Test::E"); + communicator->addObjectFactory(makeFactory<FI>(), "::Test::F"); + communicator->addObjectFactory(makeFactory<II>(), "::Test::I"); + communicator->addObjectFactory(makeFactory<JI>(), "::Test::J"); + communicator->addObjectFactory(makeFactory<HI>(), "::Test::H"); +#else Ice::ObjectFactoryPtr factory = new MyObjectFactory; communicator->addObjectFactory(factory, "::Test::B"); communicator->addObjectFactory(factory, "::Test::C"); @@ -77,17 +98,19 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) communicator->addObjectFactory(factory, "::Test::I"); communicator->addObjectFactory(factory, "::Test::J"); communicator->addObjectFactory(factory, "::Test::H"); +#endif communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - InitialPtr initial = new InitialI(adapter); - adapter->add(initial, communicator->stringToIdentity("initial")); + adapter->add(ICE_MAKE_SHARED(InitialI, adapter), communicator->stringToIdentity("initial")); +#ifndef ICE_CPP11_MAPPING UnexpectedObjectExceptionTestIPtr uoet = new UnexpectedObjectExceptionTestI; adapter->add(uoet, communicator->stringToIdentity("uoet")); - InitialPrx allTests(const Ice::CommunicatorPtr&); - allTests(communicator); +#endif + InitialPrxPtr allTests(const Ice::CommunicatorPtr&); + InitialPrxPtr initial = allTests(communicator); // We must call shutdown even in the collocated case for cyclic dependency cleanup - initial->shutdown(Ice::Current()); + initial->shutdown(); return EXIT_SUCCESS; } diff --git a/cpp/test/Ice/objects/Server.cpp b/cpp/test/Ice/objects/Server.cpp index f1a1a197d39..0098cb34953 100644 --- a/cpp/test/Ice/objects/Server.cpp +++ b/cpp/test/Ice/objects/Server.cpp @@ -16,6 +16,16 @@ DEFINE_TEST("server") using namespace std; using namespace Test; +#ifdef ICE_CPP11_MAPPING +template<typename T> +function<shared_ptr<T>(const string&)> makeFactory() +{ + return [](const string&) + { + return make_shared<T>(); + }; +} +#else class MyObjectFactory : public Ice::ObjectFactory { public: @@ -44,21 +54,32 @@ public: // Nothing to do } }; +#endif int run(int, char**, const Ice::CommunicatorPtr& communicator) { +#ifdef ICE_CPP11_MAPPING + communicator->addObjectFactory(makeFactory<II>(), "::Test::I"); + communicator->addObjectFactory(makeFactory<JI>(), "::Test::J"); + communicator->addObjectFactory(makeFactory<HI>(), "::Test::H"); +#else Ice::ObjectFactoryPtr factory = new MyObjectFactory; communicator->addObjectFactory(factory, "::Test::I"); communicator->addObjectFactory(factory, "::Test::J"); communicator->addObjectFactory(factory, "::Test::H"); +#endif communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - InitialPtr initial = new InitialI(adapter); - adapter->add(initial, communicator->stringToIdentity("initial")); + adapter->add(ICE_MAKE_SHARED(InitialI, adapter), communicator->stringToIdentity("initial")); + +#ifdef ICE_CPP11_MAPPING + //TODO +#else UnexpectedObjectExceptionTestIPtr uoet = new UnexpectedObjectExceptionTestI; adapter->add(uoet, communicator->stringToIdentity("uoet")); +#endif adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/objects/TestI.cpp b/cpp/test/Ice/objects/TestI.cpp index 5c4814ffab2..42d6ab7c553 100644 --- a/cpp/test/Ice/objects/TestI.cpp +++ b/cpp/test/Ice/objects/TestI.cpp @@ -11,6 +11,7 @@ #include <TestI.h> using namespace Test; +using namespace std; BI::BI() : _postUnmarshalInvoked(false) @@ -116,10 +117,12 @@ InitialI::InitialI(const Ice::ObjectAdapterPtr& adapter) : _e(new EI), _f(new FI(_e)) { +#ifndef ICE_CPP11_MAPPING _b1->ice_collectable(true); _b2->ice_collectable(true); _c->ice_collectable(true); _d->ice_collectable(true); +#endif _b1->theA = _b2; // Cyclic reference to another B _b1->theB = _b1; // Self reference. @@ -204,6 +207,18 @@ InitialI::getAll(BPtr& b1, BPtr& b2, CPtr& c, DPtr& d, const Ice::Current&) d = _d; } +#ifdef ICE_CPP11_MAPPING +shared_ptr<Ice::Value> +InitialI::getI(const Ice::Current&) +{ + return make_shared<II>(); +} + +void +InitialI::setI(const shared_ptr<Ice::Value>&, const Ice::Current&) +{ +} +#else IPtr InitialI::getI(const Ice::Current&) { @@ -214,6 +229,7 @@ void InitialI::setI(const IPtr&, const Ice::Current&) { } +#endif BaseSeq InitialI::opBaseSeq(const BaseSeq& inSeq, BaseSeq& outSeq, const Ice::Current&) @@ -225,19 +241,19 @@ InitialI::opBaseSeq(const BaseSeq& inSeq, BaseSeq& outSeq, const Ice::Current&) CompactPtr InitialI::getCompact(const Ice::Current&) { - return new CompactExt(); + return ICE_MAKE_SHARED(CompactExt); } Test::Inner::APtr InitialI::getInnerA(const Ice::Current&) { - return new Inner::A(_b1); + return ICE_MAKE_SHARED(Inner::A, _b1); } Test::Inner::Sub::APtr InitialI::getInnerSubA(const Ice::Current&) { - return new Inner::Sub::A(new Inner::A(_b1)); + return ICE_MAKE_SHARED(Inner::Sub::A, ICE_MAKE_SHARED(Inner::A, _b1)); } void @@ -256,6 +272,19 @@ InitialI::throwInnerSubEx(const Ice::Current&) throw ex; } +#ifdef ICE_CPP11_MAPPING +shared_ptr<Ice::Value> +InitialI::getJ(const Ice::Current&) +{ + return make_shared<JI>(); +} + +shared_ptr<Ice::Value> +InitialI::getH(const Ice::Current&) +{ + return make_shared<HI>(); +} +#else IPtr InitialI::getJ(const Ice::Current&) { @@ -267,6 +296,7 @@ InitialI::getH(const Ice::Current&) { return new HI(); } +#endif D1Ptr InitialI::getD1(const Test::D1Ptr& d1, const Ice::Current&) @@ -277,9 +307,15 @@ InitialI::getD1(const Test::D1Ptr& d1, const Ice::Current&) void InitialI::throwEDerived(const Ice::Current&) { - throw EDerived(new A1("a1"), new A1("a2"), new A1("a3"), new A1("a4")); + throw EDerived(ICE_MAKE_SHARED(A1, "a1"), + ICE_MAKE_SHARED(A1, "a2"), + ICE_MAKE_SHARED(A1, "a3"), + ICE_MAKE_SHARED(A1, "a4")); } +#ifdef ICE_CPP11_MAPPING +// TODO +#else bool UnexpectedObjectExceptionTestI::ice_invoke(const std::vector<Ice::Byte>&, std::vector<Ice::Byte>& outParams, @@ -288,10 +324,11 @@ UnexpectedObjectExceptionTestI::ice_invoke(const std::vector<Ice::Byte>&, Ice::CommunicatorPtr communicator = current.adapter->getCommunicator(); Ice::OutputStreamPtr out = Ice::createOutputStream(communicator); out->startEncapsulation(current.encoding, Ice::DefaultFormat); - AlsoEmptyPtr ae = new AlsoEmpty; + AlsoEmptyPtr ae = ICE_MAKE_SHARED(AlsoEmpty); out->write(ae); out->writePendingObjects(); out->endEncapsulation(); out->finished(outParams); return true; } +#endif
\ No newline at end of file diff --git a/cpp/test/Ice/objects/TestI.h b/cpp/test/Ice/objects/TestI.h index 127d5ad821e..ffe39565048 100644 --- a/cpp/test/Ice/objects/TestI.h +++ b/cpp/test/Ice/objects/TestI.h @@ -79,6 +79,15 @@ public: virtual bool checkValues(const Ice::Current&); }; +#ifdef ICE_CPP11_MAPPING +class II : public ::Ice::InterfaceByValue<Test::I> +{ +}; + +class JI : public ::Ice::InterfaceByValue<Test::J> +{ +}; +#else class II : public Test::I { }; @@ -86,12 +95,18 @@ class II : public Test::I class JI : public Test::J { }; +#endif class HI : public Test::H { }; -class InitialI : public Test::Initial +class InitialI : +#ifdef ICE_CPP11_MAPPING + public Test::InitialDisp +#else + public Test::Initial +#endif { public: @@ -105,15 +120,25 @@ public: virtual Test::EPtr getE(const Ice::Current&); virtual Test::FPtr getF(const Ice::Current&); virtual void getAll(Test::BPtr&, Test::BPtr&, Test::CPtr&, Test::DPtr&, const Ice::Current&); + +#ifdef ICE_CPP11_MAPPING + virtual ::std::shared_ptr<::Ice::Value> getI(const Ice::Current&); + virtual ::std::shared_ptr<::Ice::Value> getJ(const Ice::Current&); + virtual ::std::shared_ptr<::Ice::Value> getH(const Ice::Current&); +#else virtual Test::IPtr getI(const Ice::Current&); virtual Test::IPtr getJ(const Ice::Current&); virtual Test::IPtr getH(const Ice::Current&); - +#endif + virtual Test::D1Ptr getD1(const Test::D1Ptr&, const Ice::Current&); virtual void throwEDerived(const Ice::Current&); +#ifdef ICE_CPP11_MAPPING + virtual void setI(const ::std::shared_ptr<::Ice::Value>&, const Ice::Current&); +#else virtual void setI(const Test::IPtr&, const Ice::Current&); - +#endif virtual Test::BaseSeq opBaseSeq(const Test::BaseSeq&, Test::BaseSeq&, const Ice::Current&); virtual Test::CompactPtr getCompact(const Ice::Current&); diff --git a/cpp/test/Ice/operations/.depend.mak b/cpp/test/Ice/operations/.depend.mak index d10167dde9f..e1f09c8229c 100755 --- a/cpp/test/Ice/operations/.depend.mak +++ b/cpp/test/Ice/operations/.depend.mak @@ -29,6 +29,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" \ @@ -37,6 +38,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" \ @@ -71,7 +73,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" \ @@ -80,13 +82,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" \ @@ -111,6 +113,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" \ @@ -119,6 +122,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" \ @@ -159,7 +163,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" \ @@ -173,6 +177,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" \ @@ -184,7 +189,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" \ @@ -207,7 +211,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" \ @@ -239,6 +242,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" \ @@ -247,6 +251,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" \ @@ -287,7 +292,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" \ @@ -301,6 +306,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" \ @@ -312,7 +318,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" \ @@ -335,7 +340,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" \ @@ -367,6 +371,7 @@ Twoways.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" \ @@ -375,6 +380,7 @@ Twoways.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" \ @@ -415,7 +421,7 @@ Twoways.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" \ @@ -429,6 +435,7 @@ Twoways.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" \ @@ -440,7 +447,6 @@ Twoways.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" \ @@ -463,7 +469,6 @@ Twoways.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" \ @@ -472,6 +477,7 @@ Twoways.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -495,6 +501,7 @@ Oneways.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" \ @@ -503,6 +510,7 @@ Oneways.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" \ @@ -543,7 +551,7 @@ Oneways.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" \ @@ -557,6 +565,7 @@ Oneways.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" \ @@ -568,7 +577,6 @@ Oneways.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" \ @@ -591,7 +599,6 @@ Oneways.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" \ @@ -623,6 +630,7 @@ TwowaysAMI.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" \ @@ -631,6 +639,7 @@ TwowaysAMI.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" \ @@ -671,7 +680,7 @@ TwowaysAMI.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" \ @@ -685,6 +694,7 @@ TwowaysAMI.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" \ @@ -696,7 +706,6 @@ TwowaysAMI.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" \ @@ -719,7 +728,6 @@ TwowaysAMI.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" \ @@ -751,6 +759,7 @@ OnewaysAMI.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" \ @@ -759,6 +768,7 @@ OnewaysAMI.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" \ @@ -799,7 +809,7 @@ OnewaysAMI.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" \ @@ -813,6 +823,7 @@ OnewaysAMI.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" \ @@ -824,7 +835,6 @@ OnewaysAMI.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" \ @@ -847,7 +857,6 @@ OnewaysAMI.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" \ @@ -879,6 +888,7 @@ BatchOneways.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" \ @@ -887,6 +897,7 @@ BatchOneways.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" \ @@ -927,7 +938,7 @@ BatchOneways.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" \ @@ -941,6 +952,7 @@ BatchOneways.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" \ @@ -952,7 +964,6 @@ BatchOneways.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" \ @@ -975,7 +986,6 @@ BatchOneways.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" \ @@ -1007,6 +1017,7 @@ BatchOnewaysAMI.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" \ @@ -1015,6 +1026,7 @@ BatchOnewaysAMI.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" \ @@ -1055,7 +1067,7 @@ BatchOnewaysAMI.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" \ @@ -1069,6 +1081,7 @@ BatchOnewaysAMI.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" \ @@ -1080,7 +1093,6 @@ BatchOnewaysAMI.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" \ @@ -1103,7 +1115,6 @@ BatchOnewaysAMI.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" \ @@ -1135,6 +1146,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" \ @@ -1143,6 +1155,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" \ @@ -1183,7 +1196,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" \ @@ -1197,6 +1210,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" \ @@ -1208,7 +1222,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" \ @@ -1231,7 +1244,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" \ @@ -1264,6 +1276,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" \ @@ -1272,6 +1285,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" \ @@ -1312,7 +1326,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" \ @@ -1326,6 +1340,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" \ @@ -1337,7 +1352,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" \ @@ -1360,7 +1374,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" \ @@ -1391,6 +1404,7 @@ TestAMD.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" \ @@ -1399,6 +1413,7 @@ TestAMD.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" \ @@ -1433,7 +1448,7 @@ TestAMD.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" \ @@ -1442,6 +1457,7 @@ TestAMD.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" \ @@ -1449,7 +1465,6 @@ TestAMD.obj: \ "$(includedir)\Ice\IncomingAsync.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" \ @@ -1474,6 +1489,7 @@ TestAMDI.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" \ @@ -1482,6 +1498,7 @@ TestAMDI.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" \ @@ -1522,7 +1539,7 @@ TestAMDI.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" \ @@ -1536,6 +1553,7 @@ TestAMDI.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" \ @@ -1547,7 +1565,6 @@ TestAMDI.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" \ @@ -1570,7 +1587,6 @@ TestAMDI.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" \ @@ -1603,6 +1619,7 @@ ServerAMD.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" \ @@ -1611,6 +1628,7 @@ ServerAMD.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" \ @@ -1651,7 +1669,7 @@ ServerAMD.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" \ @@ -1665,6 +1683,7 @@ ServerAMD.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" \ @@ -1676,7 +1695,6 @@ ServerAMD.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" \ @@ -1699,7 +1717,6 @@ ServerAMD.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" \ @@ -1732,6 +1749,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" \ @@ -1740,6 +1758,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" \ @@ -1780,7 +1799,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" \ @@ -1794,6 +1813,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" \ @@ -1805,7 +1825,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" \ @@ -1828,7 +1847,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/operations/AllTests.cpp b/cpp/test/Ice/operations/AllTests.cpp index f4b3a712d6e..45e9f666ba3 100644 --- a/cpp/test/Ice/operations/AllTests.cpp +++ b/cpp/test/Ice/operations/AllTests.cpp @@ -14,45 +14,45 @@ using namespace std; -Test::MyClassPrx +Test::MyClassPrxPtr allTests(const Ice::CommunicatorPtr& communicator) { string ref = "test:default -p 12010"; - Ice::ObjectPrx base = communicator->stringToProxy(ref); - Test::MyClassPrx cl = Test::MyClassPrx::checkedCast(base); - Test::MyDerivedClassPrx derived = Test::MyDerivedClassPrx::checkedCast(cl); + Ice::ObjectPrxPtr base = communicator->stringToProxy(ref); + Test::MyClassPrxPtr cl = ICE_CHECKED_CAST(Test::MyClassPrx, base); + Test::MyDerivedClassPrxPtr derived = ICE_CHECKED_CAST(Test::MyDerivedClassPrx, cl); cout << "testing twoway operations... " << flush; - void twoways(const Ice::CommunicatorPtr&, const Test::MyClassPrx&); + void twoways(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr&); twoways(communicator, cl); twoways(communicator, derived); derived->opDerived(); cout << "ok" << endl; cout << "testing oneway operations... " << flush; - void oneways(const Ice::CommunicatorPtr&, const Test::MyClassPrx&); + void oneways(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr&); oneways(communicator, cl); cout << "ok" << endl; cout << "testing twoway operations with AMI... " << flush; - void twowaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrx&); + void twowaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr&); twowaysAMI(communicator, cl); twowaysAMI(communicator, derived); cout << "ok" << endl; cout << "testing oneway operations with AMI... " << flush; - void onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrx&); + void onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr&); onewaysAMI(communicator, cl); cout << "ok" << endl; cout << "testing batch oneway operations... " << flush; - void batchOneways(const Test::MyClassPrx&); + void batchOneways(const Test::MyClassPrxPtr&); batchOneways(cl); batchOneways(derived); cout << "ok" << endl; cout << "testing batch AMI oneway operations... " << flush; - void batchOnewaysAMI(const Test::MyClassPrx&); + void batchOnewaysAMI(const Test::MyClassPrxPtr&); batchOnewaysAMI(cl); batchOnewaysAMI(derived); cout << "ok" << endl; diff --git a/cpp/test/Ice/operations/BatchOneways.cpp b/cpp/test/Ice/operations/BatchOneways.cpp index 8d6bfffad21..05e2f391dde 100644 --- a/cpp/test/Ice/operations/BatchOneways.cpp +++ b/cpp/test/Ice/operations/BatchOneways.cpp @@ -39,7 +39,11 @@ public: if(_size + request.getSize() > 25000) { +#ifdef ICE_CPP11_MAPPING + request.getProxy()->ice_flushBatchRequests_async(); +#else request.getProxy()->begin_ice_flushBatchRequests(); +#endif _size = 18; // header } @@ -70,16 +74,16 @@ private: int _size; int _lastRequestSize; }; -typedef IceUtil::Handle<BatchRequestInterceptorI> BatchRequestInterceptorIPtr; +ICE_DEFINE_PTR(BatchRequestInterceptorIPtr, BatchRequestInterceptorI); } void -batchOneways(const Test::MyClassPrx& p) +batchOneways(const Test::MyClassPrxPtr& p) { const Test::ByteS bs1(10 * 1024); - Test::MyClassPrx batch = Test::MyClassPrx::uncheckedCast(p->ice_batchOneway()); + Test::MyClassPrxPtr batch = ICE_UNCHECKED_CAST(Test::MyClassPrx, p->ice_batchOneway()); batch->ice_flushBatchRequests(); // Empty flush @@ -106,8 +110,8 @@ batchOneways(const Test::MyClassPrx& p) if(batch->ice_getConnection()) { - Test::MyClassPrx batch1 = Test::MyClassPrx::uncheckedCast(p->ice_batchOneway()); - Test::MyClassPrx batch2 = Test::MyClassPrx::uncheckedCast(p->ice_batchOneway()); + Test::MyClassPrxPtr batch1 = ICE_UNCHECKED_CAST(Test::MyClassPrx, p->ice_batchOneway()); + Test::MyClassPrxPtr batch2 = ICE_UNCHECKED_CAST(Test::MyClassPrx, p->ice_batchOneway()); batch1->ice_ping(); batch2->ice_ping(); @@ -127,7 +131,7 @@ batchOneways(const Test::MyClassPrx& p) Ice::Identity identity; identity.name = "invalid"; - Ice::ObjectPrx batch3 = batch->ice_identity(identity); + Ice::ObjectPrxPtr batch3 = batch->ice_identity(identity); batch3->ice_ping(); batch3->ice_flushBatchRequests(); @@ -141,9 +145,9 @@ batchOneways(const Test::MyClassPrx& p) { Ice::InitializationData initData; initData.properties = p->ice_getCommunicator()->getProperties()->clone(); - BatchRequestInterceptorIPtr interceptor = new BatchRequestInterceptorI; + BatchRequestInterceptorIPtr interceptor = ICE_MAKE_SHARED(BatchRequestInterceptorI); -#ifdef ICE_CPP11 +#ifdef ICE_CPP11_COMPILER // Ensure lambda factory method works. initData.batchRequestInterceptor = Ice::newBatchRequestInterceptor( [=](const Ice::BatchRequest& request, int count, int size) @@ -155,8 +159,8 @@ batchOneways(const Test::MyClassPrx& p) #endif Ice::CommunicatorPtr ic = Ice::initialize(initData); - Test::MyClassPrx batch = - Test::MyClassPrx::uncheckedCast(ic->stringToProxy(p->ice_toString()))->ice_batchOneway(); + Test::MyClassPrxPtr batch = + ICE_UNCHECKED_CAST(Test::MyClassPrx, ic->stringToProxy(p->ice_toString()))->ice_batchOneway(); test(interceptor->count() == 0); batch->ice_ping(); diff --git a/cpp/test/Ice/operations/BatchOnewaysAMI.cpp b/cpp/test/Ice/operations/BatchOnewaysAMI.cpp index 876a60eac52..ed7ad110e23 100644 --- a/cpp/test/Ice/operations/BatchOnewaysAMI.cpp +++ b/cpp/test/Ice/operations/BatchOnewaysAMI.cpp @@ -91,11 +91,67 @@ public: } void -batchOnewaysAMI(const Test::MyClassPrx& p) +batchOnewaysAMI(const Test::MyClassPrxPtr& p) { const Test::ByteS bs1(10 * 1024); + Test::MyClassPrxPtr batch = ICE_UNCHECKED_CAST(Test::MyClassPrx, p->ice_batchOneway()); +#ifdef ICE_CPP11_MAPPING + + promise<void> prom; + batch->ice_flushBatchRequests_async(nullptr, + [&](bool sentSynchronously) + { + test(sentSynchronously); + prom.set_value(); + }); // Empty flush + prom.get_future().get(); + + for(int i = 0 ; i < 30 ; ++i) + { + batch->opByteSOneway_async(bs1, nullptr, [](exception_ptr){ test(false); }); + } + + int count = 0; + while(count < 27) // 3 * 9 requests auto-flushed. + { + count += p->opByteSOnewayCallCount(); + IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(10)); + } + + if(batch->ice_getConnection()) + { + shared_ptr<Test::MyClassPrx> batch1 = Ice::uncheckedCast<Test::MyClassPrx>(p->ice_batchOneway()); + shared_ptr<Test::MyClassPrx> batch2 = Ice::uncheckedCast<Test::MyClassPrx>(p->ice_batchOneway()); + + batch1->ice_ping_async().get(); + batch2->ice_ping_async().get(); + batch1->ice_flushBatchRequests_async().get(); + batch1->ice_getConnection()->close(false); + batch1->ice_ping_async().get(); + batch2->ice_ping_async().get(); + + batch1->ice_getConnection(); + batch2->ice_getConnection(); + + batch1->ice_ping_async().get(); + batch1->ice_getConnection()->close(false); + + batch1->ice_ping_async().get(); + batch2->ice_ping_async().get(); + } - Test::MyClassPrx batch = Test::MyClassPrx::uncheckedCast(p->ice_batchOneway()); + Ice::Identity identity; + identity.name = "invalid"; + auto batch3 = batch->ice_identity(identity); + batch3->ice_ping_async(); + batch3->ice_flushBatchRequests_async().get(); + + // Make sure that a bogus batch request doesn't cause troubles to other ones. + batch3->ice_ping_async(); + batch->ice_ping_async(); + batch->ice_flushBatchRequests_async().get(); + batch->ice_ping_async(); +#else batch->end_ice_flushBatchRequests(batch->begin_ice_flushBatchRequests()); // Empty flush test(batch->begin_ice_flushBatchRequests()->isSent()); // Empty flush @@ -149,4 +205,5 @@ batchOnewaysAMI(const Test::MyClassPrx& p) batch->begin_ice_ping(); batch->end_ice_flushBatchRequests(batch->begin_ice_flushBatchRequests()); batch->begin_ice_ping(); +#endif } diff --git a/cpp/test/Ice/operations/Client.cpp b/cpp/test/Ice/operations/Client.cpp index 0d97cd27f87..fea475d97df 100644 --- a/cpp/test/Ice/operations/Client.cpp +++ b/cpp/test/Ice/operations/Client.cpp @@ -18,8 +18,8 @@ using namespace std; int run(int, char**, const Ice::CommunicatorPtr& communicator, const Ice::InitializationData&) { - Test::MyClassPrx allTests(const Ice::CommunicatorPtr&); - Test::MyClassPrx myClass = allTests(communicator); + Test::MyClassPrxPtr allTests(const Ice::CommunicatorPtr&); + Test::MyClassPrxPtr myClass = allTests(communicator); #ifndef ICE_OS_WINRT cout << "testing server shutdown... " << flush; diff --git a/cpp/test/Ice/operations/Collocated.cpp b/cpp/test/Ice/operations/Collocated.cpp index 0ce4663448c..d7efae4e203 100644 --- a/cpp/test/Ice/operations/Collocated.cpp +++ b/cpp/test/Ice/operations/Collocated.cpp @@ -22,12 +22,12 @@ run(int, char**, const Ice::CommunicatorPtr& communicator, communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); communicator->getProperties()->setProperty("TestAdapter.AdapterId", "test"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - Ice::ObjectPrx prx = adapter->add(new MyDerivedClassI, communicator->stringToIdentity("test")); + Ice::ObjectPrxPtr prx = adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), communicator->stringToIdentity("test")); //adapter->activate(); // Don't activate OA to ensure collocation is used. test(!prx->ice_getConnection()); - Test::MyClassPrx allTests(const Ice::CommunicatorPtr&); + Test::MyClassPrxPtr allTests(const Ice::CommunicatorPtr&); allTests(communicator); return EXIT_SUCCESS; diff --git a/cpp/test/Ice/operations/Makefile.mak b/cpp/test/Ice/operations/Makefile.mak index d4d9038ca2f..dd451321bf9 100644 --- a/cpp/test/Ice/operations/Makefile.mak +++ b/cpp/test/Ice/operations/Makefile.mak @@ -64,7 +64,7 @@ OBJS = $(COBJS) \ !include $(top_srcdir)/config/Make.rules.mak -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -Zm200 -bigobj +CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -Zm200 -bigobj /wd4503 !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT).pdb diff --git a/cpp/test/Ice/operations/Oneways.cpp b/cpp/test/Ice/operations/Oneways.cpp index 47353bb3a10..4d86964b59f 100644 --- a/cpp/test/Ice/operations/Oneways.cpp +++ b/cpp/test/Ice/operations/Oneways.cpp @@ -14,9 +14,9 @@ using namespace std; void -oneways(const Ice::CommunicatorPtr&, const Test::MyClassPrx& proxy) +oneways(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr& proxy) { - Test::MyClassPrx p = Test::MyClassPrx::uncheckedCast(proxy->ice_oneway()); + Test::MyClassPrxPtr p = ICE_UNCHECKED_CAST(Test::MyClassPrx, proxy->ice_oneway()); { p->ice_ping(); @@ -28,7 +28,11 @@ oneways(const Ice::CommunicatorPtr&, const Test::MyClassPrx& proxy) p->ice_isA("dummy"); test(false); } +#ifdef ICE_CPP11_MAPPING + catch(const IceUtil::IllegalArgumentException&) +#else catch(const Ice::TwowayOnlyException&) +#endif { } } @@ -39,7 +43,11 @@ oneways(const Ice::CommunicatorPtr&, const Test::MyClassPrx& proxy) p->ice_id(); test(false); } +#ifdef ICE_CPP11_MAPPING + catch(const IceUtil::IllegalArgumentException&) +#else catch(const Ice::TwowayOnlyException&) +#endif { } } @@ -50,7 +58,11 @@ oneways(const Ice::CommunicatorPtr&, const Test::MyClassPrx& proxy) p->ice_ids(); test(false); } +#ifdef ICE_CPP11_MAPPING + catch(const IceUtil::IllegalArgumentException&) +#else catch(const Ice::TwowayOnlyException&) +#endif { } } @@ -75,7 +87,11 @@ oneways(const Ice::CommunicatorPtr&, const Test::MyClassPrx& proxy) p->opByte(Ice::Byte(0xff), Ice::Byte(0x0f), b); test(false); } +#ifdef ICE_CPP11_MAPPING + catch(const IceUtil::IllegalArgumentException&) +#else catch(const Ice::TwowayOnlyException&) +#endif { } } diff --git a/cpp/test/Ice/operations/OnewaysAMI.cpp b/cpp/test/Ice/operations/OnewaysAMI.cpp index ee48f534b0b..c4342818256 100644 --- a/cpp/test/Ice/operations/OnewaysAMI.cpp +++ b/cpp/test/Ice/operations/OnewaysAMI.cpp @@ -80,22 +80,43 @@ typedef IceUtil::Handle<Callback> CallbackPtr; } void -onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrx& proxy) +onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr& proxy) { - Test::MyClassPrx p = Test::MyClassPrx::uncheckedCast(proxy->ice_oneway()); + Test::MyClassPrxPtr p = ICE_UNCHECKED_CAST(Test::MyClassPrx, proxy->ice_oneway()); { CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->ice_ping_async( + nullptr, + [](exception_ptr) + { + test(false); + }, + [&](bool sent) + { + cb->sent(sent); + }); +#else Ice::Callback_Object_ice_pingPtr callback = Ice::newCallback_Object_ice_ping(cb, &Callback::noException, &Callback::sent); p->begin_ice_ping(callback); +#endif cb->check(); } { try { +#ifdef ICE_CPP11_MAPPING + p->ice_isA_async(Test::MyClass::ice_staticId(), + [&](bool) + { + test(false); + }); +#else p->begin_ice_isA(Test::MyClass::ice_staticId()); +#endif test(false); } catch(const IceUtil::IllegalArgumentException&) @@ -106,7 +127,15 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrx& proxy) { try { +#ifdef ICE_CPP11_MAPPING + p->ice_id_async( + [&](string) + { + test(false); + }); +#else p->begin_ice_id(); +#endif test(false); } catch(const IceUtil::IllegalArgumentException&) @@ -117,7 +146,14 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrx& proxy) { try { +#ifdef ICE_CPP11_MAPPING + p->ice_ids_async( + [&](vector<string>) + { + }); +#else p->begin_ice_ids(); +#endif test(false); } catch(const IceUtil::IllegalArgumentException&) @@ -127,51 +163,104 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrx& proxy) { CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opVoid_async( + nullptr, + [](exception_ptr) + { + test(false); + }, + [&](bool sent) + { + cb->sent(sent); + }); +#else Test::Callback_MyClass_opVoidPtr callback = Test::newCallback_MyClass_opVoid(cb, &Callback::noException, &Callback::sent); p->begin_opVoid(callback); +#endif cb->check(); } { CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opIdempotent_async( + nullptr, + [](exception_ptr) + { + test(false); + }, + [&](bool sent) + { + cb->sent(sent); + }); +#else Test::Callback_MyClass_opIdempotentPtr callback = Test::newCallback_MyClass_opIdempotent(cb, &Callback::noException, &Callback::sent); p->begin_opIdempotent(callback); +#endif cb->check(); } { CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opNonmutating_async( + nullptr, + [](exception_ptr) + { + test(false); + }, + [&](bool sent) + { + cb->sent(sent); + }); +#else Test::Callback_MyClass_opNonmutatingPtr callback = Test::newCallback_MyClass_opNonmutating(cb, &Callback::noException, &Callback::sent); p->begin_opNonmutating(callback); +#endif cb->check(); } { try { +#ifdef ICE_CPP11_MAPPING + p->opByte_async(Ice::Byte(0xff), Ice::Byte(0x0f), + [](Ice::Byte, Ice::Byte) + { + test(false); + }); +#else p->begin_opByte(Ice::Byte(0xff), Ice::Byte(0x0f)); +#endif test(false); } catch(const IceUtil::IllegalArgumentException&) { } } -#ifdef ICE_CPP11 +#ifdef ICE_CPP11_COMPILER +# ifndef ICE_CPP11_MAPPING { CallbackPtr cb = new Callback; p->begin_ice_ping(nullptr, [=](const Ice::Exception& ex){ cb->noException(ex); }, [=](bool sent){ cb->sent(sent); }); cb->check(); - } + } +# endif { try { +# ifdef ICE_CPP11_MAPPING + p->ice_isA_async(Test::MyClass::ice_staticId()); +# else p->begin_ice_isA(Test::MyClass::ice_staticId(), [=](bool){ test(false); }); +# endif test(false); } catch(const IceUtil::IllegalArgumentException&) @@ -182,7 +271,11 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrx& proxy) { try { +# ifdef ICE_CPP11_MAPPING + p->ice_id_async(); +# else p->begin_ice_id([=](const string&){ test(false); }); +# endif test(false); } catch(const IceUtil::IllegalArgumentException&) @@ -193,7 +286,11 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrx& proxy) { try { +# ifdef ICE_CPP11_MAPPING + p->ice_ids_async(); +# else p->begin_ice_ids([=](const Ice::StringSeq&){ test(false); }); +# endif test(false); } catch(const IceUtil::IllegalArgumentException&) @@ -201,6 +298,7 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrx& proxy) } } +# ifndef ICE_CPP11_MAPPING { CallbackPtr cb = new Callback; p->begin_opVoid(nullptr, @@ -235,5 +333,6 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrx& proxy) { } } +# endif #endif } diff --git a/cpp/test/Ice/operations/Server.cpp b/cpp/test/Ice/operations/Server.cpp index 6d589352eb4..19e60a7d2df 100644 --- a/cpp/test/Ice/operations/Server.cpp +++ b/cpp/test/Ice/operations/Server.cpp @@ -20,7 +20,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(new MyDerivedClassI, communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), communicator->stringToIdentity("test")); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/operations/ServerAMD.cpp b/cpp/test/Ice/operations/ServerAMD.cpp index e42550569fa..76f24555c2b 100644 --- a/cpp/test/Ice/operations/ServerAMD.cpp +++ b/cpp/test/Ice/operations/ServerAMD.cpp @@ -20,7 +20,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(new MyDerivedClassI, communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), communicator->stringToIdentity("test")); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/operations/TestAMDI.cpp b/cpp/test/Ice/operations/TestAMDI.cpp index 5b64dbfb58b..770e9570e04 100644 --- a/cpp/test/Ice/operations/TestAMDI.cpp +++ b/cpp/test/Ice/operations/TestAMDI.cpp @@ -13,58 +13,919 @@ #include <functional> #include <iterator> +using namespace Ice; +using namespace Test; + +using namespace std; + +MyDerivedClassI::MyDerivedClassI() : _opByteSOnewayCallCount(0) +{ +} + +bool +MyDerivedClassI::ice_isA(const std::string& id, const Ice::Current& current) const +{ + test(current.mode == ICE_ENUM(OperationMode, Nonmutating)); +#ifdef ICE_CPP11_MAPPING + return Test::MyDerivedClassDisp::ice_isA(id, current); +#else + return Test::MyDerivedClass::ice_isA(id, current); +#endif +} + +void +MyDerivedClassI::ice_ping(const Ice::Current& current) const +{ + test(current.mode == ICE_ENUM(OperationMode, Nonmutating)); +#ifdef ICE_CPP11_MAPPING + Test::MyDerivedClassDisp::ice_ping(current); +#else + Test::MyDerivedClass::ice_ping(current); +#endif +} + +std::vector<std::string> +MyDerivedClassI::ice_ids(const Ice::Current& current) const +{ + test(current.mode == ICE_ENUM(OperationMode, Nonmutating)); +#ifdef ICE_CPP11_MAPPING + return Test::MyDerivedClassDisp::ice_ids(current); +#else + return Test::MyDerivedClass::ice_ids(current); +#endif +} + +const std::string& +MyDerivedClassI::ice_id(const Ice::Current& current) const +{ + test(current.mode == ICE_ENUM(OperationMode, Nonmutating)); +#ifdef ICE_CPP11_MAPPING + return Test::MyDerivedClassDisp::ice_id(current); +#else + return Test::MyDerivedClass::ice_id(current); +#endif +} + +#ifdef ICE_CPP11_MAPPING + class Thread_opVoid : public IceUtil::Thread { public: - Thread_opVoid(const Test::AMD_MyClass_opVoidPtr& cb) : - _cb(cb) + Thread_opVoid(function<void ()> response) : + _response(move(response)) { } virtual void run() { - _cb->ice_response(); + _response(); } private: - const Test::AMD_MyClass_opVoidPtr _cb; + function<void ()> _response; }; -MyDerivedClassI::MyDerivedClassI() : _opByteSOnewayCallCount(0) +void +MyDerivedClassI::shutdown_async(function<void ()> response, + function<void (const exception_ptr&)>, + const Ice::Current& current) { + { + IceUtil::Mutex::Lock sync(_opVoidMutex); + if(_opVoidThread) + { + _opVoidThread->getThreadControl().join(); + _opVoidThread = 0; + } + } + + current.adapter->getCommunicator()->shutdown(); + response(); } -bool -MyDerivedClassI::ice_isA(const std::string& id, const Ice::Current& current) const +void +MyDerivedClassI::delay_async(Ice::Int ms, function<void ()> response, + function<void (const exception_ptr&)>, + const Ice::Current&) { - test(current.mode == Ice::Nonmutating); - return Test::MyDerivedClass::ice_isA(id, current); + IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(ms)); + response(); } void -MyDerivedClassI::ice_ping(const Ice::Current& current) const +MyDerivedClassI::opVoid_async(function<void ()> response, + function<void (const exception_ptr&)>, + const Ice::Current& current) { - test(current.mode == Ice::Nonmutating); - Test::MyDerivedClass::ice_ping(current); + test(current.mode == OperationMode::Normal); + + IceUtil::Mutex::Lock sync(_opVoidMutex); + if(_opVoidThread) + { + _opVoidThread->getThreadControl().join(); + _opVoidThread = 0; + } + + _opVoidThread = new Thread_opVoid(response); + _opVoidThread->start(); } -std::vector<std::string> -MyDerivedClassI::ice_ids(const Ice::Current& current) const + +void +MyDerivedClassI::opByte_async(Ice::Byte p1, + Ice::Byte p2, + function<void (Ice::Byte, Ice::Byte)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) { - test(current.mode == Ice::Nonmutating); - return Test::MyDerivedClass::ice_ids(current); + response(p1, p1 ^ p2); } -const std::string& -MyDerivedClassI::ice_id(const Ice::Current& current) const +void +MyDerivedClassI::opBool_async(bool p1, + bool p2, + function<void (bool, bool)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) { - test(current.mode == Ice::Nonmutating); - return Test::MyDerivedClass::ice_id(current); + response(p2, p1); +} + + +void +MyDerivedClassI::opShortIntLong_async(short p1, + int p2, + long long int p3, + function<void (long long int, short, int, long long int)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + response(p3, p1, p2, p3); +} + + +void +MyDerivedClassI::opFloatDouble_async(float p1, + double p2, + function<void (double, float, double)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + response(p2, p1, p2); +} + +void +MyDerivedClassI::opString_async(const string& p1, + const string& p2, + function<void (const string&, const string&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + response(p1 + " " + p2, p2 + " " + p1); +} + + +void +MyDerivedClassI::opMyEnum_async(Test::MyEnum p1, + function<void (Test::MyEnum, Test::MyEnum)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + response(MyEnum::enum3, p1); +} + +void +MyDerivedClassI::opMyClass_async(const shared_ptr<Test::MyClassPrx>& p1, + function<void (const shared_ptr<Test::MyClassPrx>&, + const shared_ptr<Test::MyClassPrx>&, + const shared_ptr<Test::MyClassPrx>&)> response, + function<void (const exception_ptr&)>, + const Ice::Current& current) +{ + auto p2 = p1; + auto p3 = uncheckedCast<Test::MyClassPrx>(current.adapter->createProxy( + current.adapter->getCommunicator()->stringToIdentity("noSuchIdentity"))); + response(uncheckedCast<Test::MyClassPrx>(current.adapter->createProxy(current.id)), p2, p3); } void +MyDerivedClassI::opStruct_async(const Test::Structure& p1, + const Test::Structure& p2, + function<void (const Test::Structure&, const Test::Structure&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + Test::Structure p3 = p1; + p3.s.s = "a new string"; + response(p2, p3); +} + +void +MyDerivedClassI::opByteS_async(const Test::ByteS& p1, + const Test::ByteS& p2, + function<void (const Test::ByteS&, const Test::ByteS&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + Test::ByteS p3; + p3.resize(p1.size()); + std::reverse_copy(p1.begin(), p1.end(), p3.begin()); + Test::ByteS r = p1; + std::copy(p2.begin(), p2.end(), std::back_inserter(r)); + response(r, p3); +} + +void +MyDerivedClassI::opBoolS_async(const Test::BoolS& p1, + const Test::BoolS& p2, + function<void (const Test::BoolS&, const Test::BoolS&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + Test::BoolS p3 = p1; + std::copy(p2.begin(), p2.end(), std::back_inserter(p3)); + Test::BoolS r; + r.resize(p1.size()); + std::reverse_copy(p1.begin(), p1.end(), r.begin()); + response(r, p3); +} + +void +MyDerivedClassI::opShortIntLongS_async(const Test::ShortS& p1, + const Test::IntS& p2, + const Test::LongS& p3, + function<void (const Test::LongS&, + const Test::ShortS&, + const Test::IntS&, + const Test::LongS&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + Test::ShortS p4 = p1; + Test::IntS p5; + p5.resize(p2.size()); + std::reverse_copy(p2.begin(), p2.end(), p5.begin()); + Test::LongS p6 = p3; + std::copy(p3.begin(), p3.end(), std::back_inserter(p6)); + response(p3, p4, p5, p6); +} + +void +MyDerivedClassI::opFloatDoubleS_async(const Test::FloatS& p1, + const Test::DoubleS& p2, + function<void (const Test::DoubleS&, + const Test::FloatS&, + const Test::DoubleS&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + Test::FloatS p3 = p1; + Test::DoubleS p4; + p4.resize(p2.size()); + std::reverse_copy(p2.begin(), p2.end(), p4.begin()); + Test::DoubleS r = p2; + std::copy(p1.begin(), p1.end(), std::back_inserter(r)); + response(r, p3, p4); +} + +void +MyDerivedClassI::opStringS_async(const Test::StringS& p1, + const Test::StringS& p2, + function<void (const Test::StringS&, const Test::StringS&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + Test::StringS p3 = p1; + std::copy(p2.begin(), p2.end(), std::back_inserter(p3)); + Test::StringS r; + r.resize(p1.size()); + std::reverse_copy(p1.begin(), p1.end(), r.begin()); + response(r, p3); +} + +void +MyDerivedClassI::opByteSS_async(const Test::ByteSS& p1, + const Test::ByteSS& p2, + function<void (const Test::ByteSS&, const Test::ByteSS&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + Test::ByteSS p3; + p3.resize(p1.size()); + std::reverse_copy(p1.begin(), p1.end(), p3.begin()); + Test::ByteSS r = p1; + std::copy(p2.begin(), p2.end(), std::back_inserter(r)); + response(r, p3); +} + +void +MyDerivedClassI::opBoolSS_async(const Test::BoolSS& p1, + const Test::BoolSS& p2, + function<void (const Test::BoolSS&, const Test::BoolSS&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + auto p3 = p1; + std::copy(p2.begin(), p2.end(), std::back_inserter(p3)); + Test::BoolSS r; + r.resize(p1.size()); + std::reverse_copy(p1.begin(), p1.end(), r.begin()); + response(r, p3); +} + +void +MyDerivedClassI::opShortIntLongSS_async(const Test::ShortSS& p1, + const Test::IntSS& p2, + const Test::LongSS& p3, + function<void (const Test::LongSS&, + const Test::ShortSS&, + const Test::IntSS&, + const Test::LongSS&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + auto p4 = p1; + Test::IntSS p5; + p5.resize(p2.size()); + std::reverse_copy(p2.begin(), p2.end(), p5.begin()); + auto p6 = p3; + std::copy(p3.begin(), p3.end(), std::back_inserter(p6)); + response(p3, p4, p5, p6); +} + +void +MyDerivedClassI::opFloatDoubleSS_async(const Test::FloatSS& p1, + const Test::DoubleSS& p2, + function<void (const Test::DoubleSS&, + const Test::FloatSS&, + const Test::DoubleSS&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + Test::FloatSS p3 = p1; + Test::DoubleSS p4; + p4.resize(p2.size()); + std::reverse_copy(p2.begin(), p2.end(), p4.begin()); + Test::DoubleSS r = p2; + std::copy(p2.begin(), p2.end(), std::back_inserter(r)); + response(r, p3, p4); +} + +void +MyDerivedClassI::opStringSS_async(const Test::StringSS& p1, + const Test::StringSS& p2, + function<void (const Test::StringSS&, const Test::StringSS&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + Test::StringSS p3 = p1; + std::copy(p2.begin(), p2.end(), std::back_inserter(p3)); + Test::StringSS r; + r.resize(p2.size()); + std::reverse_copy(p2.begin(), p2.end(), r.begin()); + response(r, p3); +} + +void +MyDerivedClassI::opStringSSS_async(const Test::StringSSS& p1, const Test::StringSSS& p2, + function<void (const Test::StringSSS&, const Test::StringSSS&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + Test::StringSSS p3 = p1; + std::copy(p2.begin(), p2.end(), std::back_inserter(p3)); + Test::StringSSS r; + r.resize(p2.size()); + std::reverse_copy(p2.begin(), p2.end(), r.begin()); + response(r, p3); +} + +void +MyDerivedClassI::opByteBoolD_async(const Test::ByteBoolD& p1, const Test::ByteBoolD& p2, + function<void (const Test::ByteBoolD&, const Test::ByteBoolD&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + Test::ByteBoolD p3 = p1; + Test::ByteBoolD r = p1; + std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end())); + response(r, p3); +} + +void +MyDerivedClassI::opShortIntD_async(const Test::ShortIntD& p1, const Test::ShortIntD& p2, + function<void (const Test::ShortIntD&, const Test::ShortIntD&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + Test::ShortIntD p3 = p1; + Test::ShortIntD r = p1; + std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end())); + response(r, p3); +} + +void +MyDerivedClassI::opLongFloatD_async(const Test::LongFloatD& p1, const Test::LongFloatD& p2, + function<void (const Test::LongFloatD&, const Test::LongFloatD&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + Test::LongFloatD p3 = p1; + Test::LongFloatD r = p1; + std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end())); + response(r, p3); +} + +void +MyDerivedClassI::opStringStringD_async(const Test::StringStringD& p1, const Test::StringStringD& p2, + function<void (const Test::StringStringD&, const Test::StringStringD&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + Test::StringStringD p3 = p1; + Test::StringStringD r = p1; + std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end())); + response(r, p3); +} + +void +MyDerivedClassI::opStringMyEnumD_async(const Test::StringMyEnumD& p1, const Test::StringMyEnumD& p2, + function<void (const Test::StringMyEnumD&, const Test::StringMyEnumD&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + Test::StringMyEnumD p3 = p1; + Test::StringMyEnumD r = p1; + std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end())); + response(r, p3); +} + +void +MyDerivedClassI::opMyEnumStringD_async(const Test::MyEnumStringD& p1, const Test::MyEnumStringD& p2, + function<void (const Test::MyEnumStringD&, const Test::MyEnumStringD&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + Test::MyEnumStringD p3 = p1; + Test::MyEnumStringD r = p1; + std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end())); + response(r, p3); +} + +void +MyDerivedClassI::opMyStructMyEnumD_async(const Test::MyStructMyEnumD& p1, const Test::MyStructMyEnumD& p2, + function<void (const Test::MyStructMyEnumD&, + const Test::MyStructMyEnumD&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + Test::MyStructMyEnumD p3 = p1; + Test::MyStructMyEnumD r = p1; + std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end())); + response(r, p3); +} + +void +MyDerivedClassI::opByteBoolDS_async(const Test::ByteBoolDS& p1, + const Test::ByteBoolDS& p2, + function<void (const Test::ByteBoolDS&, const Test::ByteBoolDS&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + Test::ByteBoolDS p3 = p2; + std::copy(p1.begin(), p1.end(), std::back_inserter(p3)); + Test::ByteBoolDS r; + r.resize(p1.size()); + std::reverse_copy(p1.begin(), p1.end(), r.begin()); + response(r, p3); +} + +void +MyDerivedClassI::opShortIntDS_async(const Test::ShortIntDS& p1, const Test::ShortIntDS& p2, + function<void (const Test::ShortIntDS&, const Test::ShortIntDS&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + Test::ShortIntDS p3 = p2; + std::copy(p1.begin(), p1.end(), std::back_inserter(p3)); + Test::ShortIntDS r; + r.resize(p1.size()); + std::reverse_copy(p1.begin(), p1.end(), r.begin()); + response(r, p3); +} + +void +MyDerivedClassI::opLongFloatDS_async(const Test::LongFloatDS& p1, + const Test::LongFloatDS& p2, + function<void (const Test::LongFloatDS&, const Test::LongFloatDS&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + Test::LongFloatDS p3 = p2; + std::copy(p1.begin(), p1.end(), std::back_inserter(p3)); + Test::LongFloatDS r; + r.resize(p1.size()); + std::reverse_copy(p1.begin(), p1.end(), r.begin()); + response(r, p3); +} + +void +MyDerivedClassI::opStringStringDS_async(const Test::StringStringDS& p1, + const Test::StringStringDS& p2, + function<void (const Test::StringStringDS&, const Test::StringStringDS&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + Test::StringStringDS p3 = p2; + std::copy(p1.begin(), p1.end(), std::back_inserter(p3)); + Test::StringStringDS r; + r.resize(p1.size()); + std::reverse_copy(p1.begin(), p1.end(), r.begin()); + response(r, p3); +} + +void +MyDerivedClassI::opStringMyEnumDS_async(const Test::StringMyEnumDS& p1, + const Test::StringMyEnumDS& p2, + function<void (const Test::StringMyEnumDS&, const Test::StringMyEnumDS&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + Test::StringMyEnumDS p3 = p2; + std::copy(p1.begin(), p1.end(), std::back_inserter(p3)); + Test::StringMyEnumDS r; + r.resize(p1.size()); + std::reverse_copy(p1.begin(), p1.end(), r.begin()); + response(r, p3); +} + +void +MyDerivedClassI::opMyEnumStringDS_async(const Test::MyEnumStringDS& p1, + const Test::MyEnumStringDS& p2, + function<void (const Test::MyEnumStringDS&, const Test::MyEnumStringDS&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + Test::MyEnumStringDS p3 = p2; + std::copy(p1.begin(), p1.end(), std::back_inserter(p3)); + Test::MyEnumStringDS r; + r.resize(p1.size()); + std::reverse_copy(p1.begin(), p1.end(), r.begin()); + response(r, p3); +} + +void +MyDerivedClassI::opMyStructMyEnumDS_async(const Test::MyStructMyEnumDS& p1, const Test::MyStructMyEnumDS& p2, + function<void (const Test::MyStructMyEnumDS&, + const Test::MyStructMyEnumDS&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + Test::MyStructMyEnumDS p3 = p2; + std::copy(p1.begin(), p1.end(), std::back_inserter(p3)); + Test::MyStructMyEnumDS r; + r.resize(p1.size()); + std::reverse_copy(p1.begin(), p1.end(), r.begin()); + response(r, p3); +} + +void +MyDerivedClassI::opByteByteSD_async(const Test::ByteByteSD& p1, const Test::ByteByteSD& p2, + function<void (const Test::ByteByteSD&, const Test::ByteByteSD&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + Test::ByteByteSD p3 = p2; + Test::ByteByteSD r; + std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end())); + response(r, p3); +} + +void +MyDerivedClassI::opBoolBoolSD_async(const Test::BoolBoolSD& p1, + const Test::BoolBoolSD& p2, + function<void (const Test::BoolBoolSD&, const Test::BoolBoolSD&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + Test::BoolBoolSD p3 = p2; + Test::BoolBoolSD r; + std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end())); + response(r, p3); +} + +void +MyDerivedClassI::opShortShortSD_async(const Test::ShortShortSD& p1, + const Test::ShortShortSD& p2, + function<void (const Test::ShortShortSD&, const Test::ShortShortSD&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + Test::ShortShortSD p3 = p2; + Test::ShortShortSD r; + std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end())); + response(r, p3); +} + +void +MyDerivedClassI::opIntIntSD_async(const Test::IntIntSD& p1, + const Test::IntIntSD& p2, + function<void (const Test::IntIntSD&, const Test::IntIntSD&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + Test::IntIntSD p3 = p2; + Test::IntIntSD r; + std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end())); + response(r, p3); +} + +void +MyDerivedClassI::opLongLongSD_async(const Test::LongLongSD& p1, + const Test::LongLongSD& p2, + function<void (const Test::LongLongSD&, const Test::LongLongSD&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + Test::LongLongSD p3 = p2; + Test::LongLongSD r; + std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end())); + response(r, p3); +} + +void +MyDerivedClassI::opStringFloatSD_async(const Test::StringFloatSD& p1, + const Test::StringFloatSD& p2, + function<void (const Test::StringFloatSD&, const Test::StringFloatSD&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + Test::StringFloatSD p3 = p2; + Test::StringFloatSD r; + std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end())); + response(r, p3); +} + +void +MyDerivedClassI::opStringDoubleSD_async(const Test::StringDoubleSD& p1, + const Test::StringDoubleSD& p2, + function<void (const Test::StringDoubleSD&, + const Test::StringDoubleSD&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + Test::StringDoubleSD p3 = p2; + Test::StringDoubleSD r; + std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end())); + response(r, p3); +} + +void +MyDerivedClassI::opStringStringSD_async(const Test::StringStringSD& p1, const Test::StringStringSD& p2, + function<void (const Test::StringStringSD&, + const Test::StringStringSD&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + Test::StringStringSD p3 = p2; + Test::StringStringSD r; + std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end())); + response(r, p3); +} + +void +MyDerivedClassI::opMyEnumMyEnumSD_async(const Test::MyEnumMyEnumSD& p1, const Test::MyEnumMyEnumSD& p2, + function<void (const Test::MyEnumMyEnumSD&, + const Test::MyEnumMyEnumSD&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + Test::MyEnumMyEnumSD p3 = p2; + Test::MyEnumMyEnumSD r; + std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end())); + response(r, p3); +} + +void +MyDerivedClassI::opIntS_async(const Test::IntS& s, + function<void (const Test::IntS&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + Test::IntS r; + std::transform(s.begin(), s.end(), std::back_inserter(r), std::negate<int>()); + response(r); +} + +void +MyDerivedClassI::opByteSOneway_async(const Test::ByteS&, function<void ()> response, function<void (const exception_ptr&)>, + const Ice::Current&) +{ + IceUtil::Mutex::Lock sync(_mutex); + ++_opByteSOnewayCallCount; + response(); +} + +void +MyDerivedClassI::opByteSOnewayCallCount_async(function<void (int)> response, function<void (const exception_ptr&)>, + const Ice::Current&) +{ + IceUtil::Mutex::Lock sync(_mutex); + response(_opByteSOnewayCallCount); + _opByteSOnewayCallCount = 0; +} + +void +MyDerivedClassI::opContext_async(function<void (const Ice::Context&)> response, + function<void (const exception_ptr&)>, + const Ice::Current& current) +{ + Test::StringStringD r = current.ctx; + response(r); +} + +void +MyDerivedClassI::opDoubleMarshaling_async(Ice::Double p1, + const Test::DoubleS& p2, + function<void ()> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + Ice::Double d = 1278312346.0 / 13.0; + test(p1 == d); + for(unsigned int i = 0; i < p2.size(); ++i) + { + test(p2[i] == d); + } + response(); +} + +void +MyDerivedClassI::opIdempotent_async(function<void ()> response, + function<void (const exception_ptr&)>, + const Ice::Current& current) +{ + test(current.mode == OperationMode::Idempotent); + response(); +} + +void +MyDerivedClassI::opNonmutating_async(function<void ()> response, + function<void (const exception_ptr&)>, + const Ice::Current& current) +{ + test(current.mode == OperationMode::Nonmutating); + response(); +} + +void +MyDerivedClassI::opDerived_async(function<void ()> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + response(); +} + +void +MyDerivedClassI::opByte1_async(Ice::Byte b, + function<void (Ice::Byte)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + response(b); +} + +void +MyDerivedClassI::opShort1_async(Ice::Short s, + function<void (Ice::Short)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + response(s); +} + +void +MyDerivedClassI::opInt1_async(Ice::Int i, + function<void (Ice::Int)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + response(i); +} + +void +MyDerivedClassI::opLong1_async(Ice::Long l, + function<void (Ice::Long)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + response(l); +} + +void +MyDerivedClassI::opFloat1_async(Ice::Float f, + function<void (Ice::Float)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + response(f); +} + +void +MyDerivedClassI::opDouble1_async(Ice::Double d, + function<void (Ice::Double)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + response(d); +} + +void +MyDerivedClassI::opString1_async(const string& s, + function<void (const string&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + response(s); +} + +void +MyDerivedClassI::opStringS1_async(const Test::StringS& seq, + function<void (const Test::StringS&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + response(seq); +} + +void +MyDerivedClassI::opByteBoolD1_async(const Test::ByteBoolD& dict, + function<void (const Test::ByteBoolD&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + response(dict); +} + +void +MyDerivedClassI::opStringS2_async(const Test::StringS& seq, + function<void (const Test::StringS&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + response(seq); +} + +void +MyDerivedClassI::opByteBoolD2_async(const Test::ByteBoolD& dict, + function<void (const Test::ByteBoolD&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + response(dict); +} + +void +MyDerivedClassI::opMyStruct1_async(const Test::MyStruct1& s, + function<void (const Test::MyStruct1&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + response(s); +} + +void +MyDerivedClassI::opMyClass1_async(const shared_ptr<Test::MyClass1>& c, + function<void (const shared_ptr<Test::MyClass1>&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + response(c); +} +#else + +class Thread_opVoid : public IceUtil::Thread +{ +public: + + Thread_opVoid(const Test::AMD_MyClass_opVoidPtr& cb) : + _cb(cb) + { + } + + virtual void run() + { + _cb->ice_response(); + } + +private: + + const Test::AMD_MyClass_opVoidPtr _cb; +}; + +void MyDerivedClassI::shutdown_async(const Test::AMD_MyClass_shutdownPtr& cb, const Ice::Current& current) { { @@ -90,7 +951,7 @@ MyDerivedClassI::delay_async(const Test::AMD_MyClass_delayPtr& cb, Ice::Int ms, void MyDerivedClassI::opVoid_async(const Test::AMD_MyClass_opVoidPtr& cb, const Ice::Current& current) { - test(current.mode == Ice::Normal); + test(current.mode == ICE_ENUM(OperationMode, Normal)); IceUtil::Mutex::Lock sync(_opVoidMutex); if(_opVoidThread) @@ -154,18 +1015,19 @@ MyDerivedClassI::opMyEnum_async(const Test::AMD_MyClass_opMyEnumPtr& cb, Test::MyEnum p1, const Ice::Current&) { - cb->ice_response(Test::enum3, p1); + cb->ice_response(ICE_ENUM(MyEnum, enum3), p1); } void MyDerivedClassI::opMyClass_async(const Test::AMD_MyClass_opMyClassPtr& cb, - const Test::MyClassPrx& p1, + const Test::MyClassPrxPtr& p1, const Ice::Current& current) { - Test::MyClassPrx p2 = p1; - Test::MyClassPrx p3 = Test::MyClassPrx::uncheckedCast(current.adapter->createProxy( - current.adapter->getCommunicator()->stringToIdentity("noSuchIdentity"))); - cb->ice_response(Test::MyClassPrx::uncheckedCast(current.adapter->createProxy(current.id)), p2, p3); + Test::MyClassPrxPtr p2 = p1; + Test::MyClassPrxPtr p3 = ICE_UNCHECKED_CAST( + Test::MyClassPrx, current.adapter->createProxy( + current.adapter->getCommunicator()->stringToIdentity("noSuchIdentity"))); + cb->ice_response(ICE_UNCHECKED_CAST(Test::MyClassPrx, current.adapter->createProxy(current.id)), p2, p3); } void @@ -678,14 +1540,14 @@ MyDerivedClassI::opDoubleMarshaling_async(const Test::AMD_MyClass_opDoubleMarsha void MyDerivedClassI::opIdempotent_async(const Test::AMD_MyClass_opIdempotentPtr& cb, const Ice::Current& current) { - test(current.mode == Ice::Idempotent); + test(current.mode == ICE_ENUM(OperationMode, Idempotent)); cb->ice_response(); } void MyDerivedClassI::opNonmutating_async(const Test::AMD_MyClass_opNonmutatingPtr& cb, const Ice::Current& current) { - test(current.mode == Ice::Nonmutating); + test(current.mode == ICE_ENUM(OperationMode, Nonmutating)); cb->ice_response(); } @@ -776,4 +1638,5 @@ void MyDerivedClassI::opMyClass1_async(const Test::AMD_MyDerivedClass_opMyClass1Ptr& cb, const Test::MyClass1Ptr& c, const Ice::Current&) { cb->ice_response(c); -}
\ No newline at end of file +} +#endif diff --git a/cpp/test/Ice/operations/TestAMDI.h b/cpp/test/Ice/operations/TestAMDI.h index 1eab6d8e75c..92fdd4058f1 100644 --- a/cpp/test/Ice/operations/TestAMDI.h +++ b/cpp/test/Ice/operations/TestAMDI.h @@ -13,7 +13,12 @@ #include <IceUtil/Thread.h> #include <TestAMD.h> -class MyDerivedClassI : public Test::MyDerivedClass +class MyDerivedClassI : +#ifdef ICE_CPP11_MAPPING + public Test::MyDerivedClassDisp +#else + public Test::MyDerivedClass +#endif { public: @@ -27,6 +32,349 @@ public: virtual std::vector<std::string> ice_ids(const Ice::Current&) const; virtual const std::string& ice_id(const Ice::Current&) const; +#ifdef ICE_CPP11_MAPPING + virtual void shutdown_async(::std::function<void ()>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void delay_async(Ice::Int, + ::std::function<void ()>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opVoid_async(::std::function<void ()>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opByte_async(Ice::Byte, Ice::Byte, + ::std::function<void (Ice::Byte, Ice::Byte)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opBool_async(bool, bool, + ::std::function<void (bool, bool)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opShortIntLong_async(short, int, long long int, + ::std::function<void (long long int, short, int, long long int)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opFloatDouble_async(float, double, + ::std::function<void (double, float, double)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opString_async(const std::string&, const std::string&, + ::std::function<void (const ::std::string&, const ::std::string&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opMyEnum_async(Test::MyEnum, + ::std::function<void (Test::MyEnum, Test::MyEnum)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opMyClass_async(const ::std::shared_ptr<Test::MyClassPrx>&, + ::std::function<void (const ::std::shared_ptr<Test::MyClassPrx>&, + const ::std::shared_ptr<Test::MyClassPrx>&, + const ::std::shared_ptr<Test::MyClassPrx>&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opStruct_async(const Test::Structure&, const Test::Structure&, + ::std::function<void (const Test::Structure&, const Test::Structure&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opByteS_async(const Test::ByteS&, const Test::ByteS&, + ::std::function<void (const Test::ByteS&, const Test::ByteS&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opBoolS_async(const Test::BoolS&, const Test::BoolS&, + ::std::function<void (const Test::BoolS&, const Test::BoolS&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opShortIntLongS_async(const Test::ShortS&, const Test::IntS&, const Test::LongS&, + ::std::function<void (const Test::LongS&, + const Test::ShortS&, + const Test::IntS&, + const Test::LongS&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opFloatDoubleS_async(const Test::FloatS&, const Test::DoubleS&, + ::std::function<void (const Test::DoubleS&, + const Test::FloatS&, + const Test::DoubleS&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opStringS_async(const Test::StringS&, const Test::StringS&, + ::std::function<void (const Test::StringS&, const Test::StringS&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opByteSS_async(const Test::ByteSS&, const Test::ByteSS&, + ::std::function<void (const Test::ByteSS&, const Test::ByteSS&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opBoolSS_async(const Test::BoolSS&, const Test::BoolSS&, + ::std::function<void (const Test::BoolSS&, const Test::BoolSS&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opShortIntLongSS_async(const Test::ShortSS&, const Test::IntSS&, const Test::LongSS&, + ::std::function<void (const Test::LongSS&, + const Test::ShortSS&, + const Test::IntSS&, + const Test::LongSS&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opFloatDoubleSS_async(const Test::FloatSS&, const Test::DoubleSS&, + ::std::function<void (const Test::DoubleSS&, + const Test::FloatSS&, + const Test::DoubleSS&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opStringSS_async(const Test::StringSS&, const Test::StringSS&, + ::std::function<void (const Test::StringSS&, const Test::StringSS&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opStringSSS_async(const Test::StringSSS&, const Test::StringSSS&, + ::std::function<void (const Test::StringSSS&, const Test::StringSSS&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opByteBoolD_async(const Test::ByteBoolD&, const Test::ByteBoolD&, + ::std::function<void (const Test::ByteBoolD&, const Test::ByteBoolD&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opShortIntD_async(const Test::ShortIntD&, const Test::ShortIntD&, + ::std::function<void (const Test::ShortIntD&, const Test::ShortIntD&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opLongFloatD_async(const Test::LongFloatD&, const Test::LongFloatD&, + ::std::function<void (const Test::LongFloatD&, const Test::LongFloatD&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opStringStringD_async(const Test::StringStringD&, const Test::StringStringD&, + ::std::function<void (const Test::StringStringD&, const Test::StringStringD&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opStringMyEnumD_async(const Test::StringMyEnumD&, const Test::StringMyEnumD&, + ::std::function<void (const Test::StringMyEnumD&, const Test::StringMyEnumD&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opMyEnumStringD_async(const Test::MyEnumStringD&, const Test::MyEnumStringD&, + ::std::function<void (const Test::MyEnumStringD&, const Test::MyEnumStringD&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opMyStructMyEnumD_async(const Test::MyStructMyEnumD&, const Test::MyStructMyEnumD&, + ::std::function<void (const Test::MyStructMyEnumD&, + const Test::MyStructMyEnumD&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opByteBoolDS_async(const Test::ByteBoolDS&, const Test::ByteBoolDS&, + ::std::function<void (const Test::ByteBoolDS&, const Test::ByteBoolDS&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opShortIntDS_async(const Test::ShortIntDS&, const Test::ShortIntDS&, + ::std::function<void (const Test::ShortIntDS&, const Test::ShortIntDS&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opLongFloatDS_async(const Test::LongFloatDS&, const Test::LongFloatDS&, + ::std::function<void (const Test::LongFloatDS&, const Test::LongFloatDS&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opStringStringDS_async(const Test::StringStringDS&, const Test::StringStringDS&, + ::std::function<void (const Test::StringStringDS&, const Test::StringStringDS&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opStringMyEnumDS_async(const Test::StringMyEnumDS&, const Test::StringMyEnumDS&, + ::std::function<void (const Test::StringMyEnumDS&, + const Test::StringMyEnumDS&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opMyEnumStringDS_async(const Test::MyEnumStringDS&, const Test::MyEnumStringDS&, + ::std::function<void (const Test::MyEnumStringDS&, + const Test::MyEnumStringDS&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opMyStructMyEnumDS_async(const Test::MyStructMyEnumDS&, const Test::MyStructMyEnumDS&, + ::std::function<void (const Test::MyStructMyEnumDS&, + const Test::MyStructMyEnumDS&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opByteByteSD_async(const Test::ByteByteSD&, const Test::ByteByteSD&, + ::std::function<void (const Test::ByteByteSD&, const Test::ByteByteSD&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opBoolBoolSD_async(const Test::BoolBoolSD&, const Test::BoolBoolSD&, + ::std::function<void (const Test::BoolBoolSD&, const Test::BoolBoolSD&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opShortShortSD_async(const Test::ShortShortSD&, const Test::ShortShortSD&, + ::std::function<void (const Test::ShortShortSD&, const Test::ShortShortSD&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opIntIntSD_async(const Test::IntIntSD&, const Test::IntIntSD&, + ::std::function<void (const Test::IntIntSD&, const Test::IntIntSD&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opLongLongSD_async(const Test::LongLongSD&, const Test::LongLongSD&, + ::std::function<void (const Test::LongLongSD&, const Test::LongLongSD&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opStringFloatSD_async(const Test::StringFloatSD&, const Test::StringFloatSD&, + ::std::function<void (const Test::StringFloatSD&, const Test::StringFloatSD&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opStringDoubleSD_async(const Test::StringDoubleSD&, const Test::StringDoubleSD&, + ::std::function<void (const Test::StringDoubleSD&, + const Test::StringDoubleSD&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opStringStringSD_async(const Test::StringStringSD&, const Test::StringStringSD&, + ::std::function<void (const Test::StringStringSD&, + const Test::StringStringSD&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opMyEnumMyEnumSD_async(const Test::MyEnumMyEnumSD&, const Test::MyEnumMyEnumSD&, + ::std::function<void (const Test::MyEnumMyEnumSD&, + const Test::MyEnumMyEnumSD&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opIntS_async(const Test::IntS&, + ::std::function<void (const Test::IntS&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opByteSOneway_async(const Test::ByteS&, + ::std::function<void ()>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opByteSOnewayCallCount_async(::std::function<void (int)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opContext_async(::std::function<void (const Ice::Context&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opDoubleMarshaling_async(Ice::Double, const Test::DoubleS&, + ::std::function<void ()>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opIdempotent_async(::std::function<void ()>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opNonmutating_async(::std::function<void ()>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opDerived_async(::std::function<void ()>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opByte1_async(Ice::Byte, + ::std::function<void (Ice::Byte)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opShort1_async(Ice::Short, + ::std::function<void (Ice::Short)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opInt1_async(Ice::Int, + ::std::function<void (Ice::Int)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opLong1_async(Ice::Long, + ::std::function<void (Ice::Long)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opFloat1_async(Ice::Float, + ::std::function<void (Ice::Float)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opDouble1_async(Ice::Double, + ::std::function<void (Ice::Double)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opString1_async(const std::string&, + ::std::function<void (const ::std::string&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opStringS1_async(const Test::StringS&, + ::std::function<void (const Test::StringS&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opByteBoolD1_async(const Test::ByteBoolD&, + ::std::function<void (const Test::ByteBoolD&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opStringS2_async(const Test::StringS&, + ::std::function<void (const Test::StringS&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opByteBoolD2_async(const Test::ByteBoolD&, + ::std::function<void (const Test::ByteBoolD&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opMyStruct1_async(const Test::MyStruct1&, + ::std::function<void (const Test::MyStruct1&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void opMyClass1_async(const ::std::shared_ptr<Test::MyClass1>&, + ::std::function<void (const ::std::shared_ptr<Test::MyClass1>&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); +#else virtual void shutdown_async(const Test::AMD_MyClass_shutdownPtr&, const Ice::Current&); @@ -61,7 +409,7 @@ public: const Ice::Current&); virtual void opMyClass_async(const Test::AMD_MyClass_opMyClassPtr&, - const Test::MyClassPrx&, + const Test::MyClassPrxPtr&, const Ice::Current&); virtual void opStruct_async(const Test::AMD_MyClass_opStructPtr&, @@ -275,6 +623,7 @@ public: virtual void opMyClass1_async(const Test::AMD_MyDerivedClass_opMyClass1Ptr&, const Test::MyClass1Ptr&, const Ice::Current&); +#endif private: IceUtil::ThreadPtr _opVoidThread; diff --git a/cpp/test/Ice/operations/TestI.cpp b/cpp/test/Ice/operations/TestI.cpp index 22172068ddb..53eb7a290ad 100644 --- a/cpp/test/Ice/operations/TestI.cpp +++ b/cpp/test/Ice/operations/TestI.cpp @@ -14,6 +14,9 @@ #include <functional> #include <iterator> +using namespace Ice; +using namespace Test; + MyDerivedClassI::MyDerivedClassI() : _opByteSOnewayCallCount(0) { } @@ -21,29 +24,45 @@ MyDerivedClassI::MyDerivedClassI() : _opByteSOnewayCallCount(0) bool MyDerivedClassI::ice_isA(const std::string& id, const Ice::Current& current) const { - test(current.mode == Ice::Nonmutating); + test(current.mode == ICE_ENUM(OperationMode, Nonmutating)); +#ifdef ICE_CPP11_MAPPING + return Test::MyDerivedClassDisp::ice_isA(id, current); +#else return Test::MyDerivedClass::ice_isA(id, current); +#endif } void MyDerivedClassI::ice_ping(const Ice::Current& current) const { - test(current.mode == Ice::Nonmutating); - Test::MyDerivedClass::ice_ping(current); + test(current.mode == ICE_ENUM(OperationMode, Nonmutating)); +#ifdef ICE_CPP11_MAPPING + Test::MyDerivedClassDisp::ice_ping(current); +#else + Test::MyDerivedClass::ice_ping(current); +#endif } std::vector<std::string> MyDerivedClassI::ice_ids(const Ice::Current& current) const { - test(current.mode == Ice::Nonmutating); + test(current.mode == ICE_ENUM(OperationMode, Nonmutating)); +#ifdef ICE_CPP11_MAPPING + return Test::MyDerivedClassDisp::ice_ids(current); +#else return Test::MyDerivedClass::ice_ids(current); +#endif } const std::string& MyDerivedClassI::ice_id(const Ice::Current& current) const { - test(current.mode == Ice::Nonmutating); + test(current.mode == ICE_ENUM(OperationMode, Nonmutating)); +#ifdef ICE_CPP11_MAPPING + return Test::MyDerivedClassDisp::ice_id(current); +#else return Test::MyDerivedClass::ice_id(current); +#endif } void @@ -61,7 +80,7 @@ MyDerivedClassI::delay(Ice::Int ms, const Ice::Current&) void MyDerivedClassI::opVoid(const Ice::Current& current) { - test(current.mode == Ice::Normal); + test(current.mode == ICE_ENUM(OperationMode, Normal)); } Ice::Byte @@ -127,19 +146,20 @@ MyDerivedClassI::opMyEnum(Test::MyEnum p1, const Ice::Current&) { p2 = p1; - return Test::enum3; + return ICE_ENUM(MyEnum, enum3); } -Test::MyClassPrx -MyDerivedClassI::opMyClass(const Test::MyClassPrx& p1, - Test::MyClassPrx& p2, - Test::MyClassPrx& p3, +Test::MyClassPrxPtr +MyDerivedClassI::opMyClass(const Test::MyClassPrxPtr& p1, + Test::MyClassPrxPtr& p2, + Test::MyClassPrxPtr& p3, const Ice::Current& current) { p2 = p1; - p3 = Test::MyClassPrx::uncheckedCast(current.adapter->createProxy( + p3 = ICE_UNCHECKED_CAST(Test::MyClassPrx, + current.adapter->createProxy( current.adapter->getCommunicator()->stringToIdentity("noSuchIdentity"))); - return Test::MyClassPrx::uncheckedCast(current.adapter->createProxy(current.id)); + return ICE_UNCHECKED_CAST(Test::MyClassPrx, current.adapter->createProxy(current.id)); } Test::Structure @@ -647,13 +667,13 @@ MyDerivedClassI::opDoubleMarshaling(Ice::Double p1, const Test::DoubleS& p2, con void MyDerivedClassI::opIdempotent(const Ice::Current& current) { - test(current.mode == Ice::Idempotent); + test(current.mode == ICE_ENUM(OperationMode, Idempotent)); } void MyDerivedClassI::opNonmutating(const Ice::Current& current) { - test(current.mode == Ice::Nonmutating); + test(current.mode == ICE_ENUM(OperationMode, Nonmutating)); } void diff --git a/cpp/test/Ice/operations/TestI.h b/cpp/test/Ice/operations/TestI.h index 259e6ff3fc2..9a5dc24fe59 100644 --- a/cpp/test/Ice/operations/TestI.h +++ b/cpp/test/Ice/operations/TestI.h @@ -12,7 +12,12 @@ #include <Test.h> -class MyDerivedClassI : public Test::MyDerivedClass +class MyDerivedClassI : +#ifdef ICE_CPP11_MAPPING + public Test::MyDerivedClassDisp +#else + public Test::MyDerivedClass +#endif { public: @@ -65,9 +70,9 @@ public: Test::MyEnum&, const Ice::Current&); - virtual Test::MyClassPrx opMyClass(const Test::MyClassPrx&, - Test::MyClassPrx&, Test::MyClassPrx&, - const Ice::Current&); + virtual Test::MyClassPrxPtr opMyClass(const Test::MyClassPrxPtr&, + Test::MyClassPrxPtr&, Test::MyClassPrxPtr&, + const Ice::Current&); virtual Test::Structure opStruct(const Test::Structure&, const Test::Structure&, Test::Structure&, diff --git a/cpp/test/Ice/operations/Twoways.cpp b/cpp/test/Ice/operations/Twoways.cpp index 09b42901e8b..50711ad105e 100644 --- a/cpp/test/Ice/operations/Twoways.cpp +++ b/cpp/test/Ice/operations/Twoways.cpp @@ -30,6 +30,7 @@ #endif using namespace std; +using namespace Test; namespace { @@ -38,37 +39,42 @@ class PerThreadContextInvokeThread : public IceUtil::Thread { public: -PerThreadContextInvokeThread(const Test::MyClassPrx& proxy) : _proxy(proxy) -{ -} + PerThreadContextInvokeThread(const Test::MyClassPrxPtr& proxy) : + _proxy(proxy) + { + } -virtual void -run() -{ - Ice::Context ctx = _proxy->ice_getCommunicator()->getImplicitContext()->getContext(); - test(ctx.empty()); - ctx["one"] = "UN"; - _proxy->ice_getCommunicator()->getImplicitContext()->setContext(ctx); - test(_proxy->opContext() == ctx); -} + virtual void + run() + { + Ice::Context ctx = _proxy->ice_getCommunicator()->getImplicitContext()->getContext(); + test(ctx.empty()); + ctx["one"] = "UN"; + _proxy->ice_getCommunicator()->getImplicitContext()->setContext(ctx); + test(_proxy->opContext() == ctx); + } private: - Test::MyClassPrx _proxy; + Test::MyClassPrxPtr _proxy; }; } void -twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) +twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& p) { { p->ice_ping(); } { +#ifdef ICE_CPP11_MAPPING + test(Test::MyClassPrx::ice_staticId() == Test::MyClassDisp::ice_staticId()); +#else test(Test::MyClassPrx::ice_staticId() == Test::MyClass::ice_staticId()); - test(Ice::ObjectPrx::ice_staticId() == Ice::Object::ice_staticId()); +#endif + test(Ice::ObjectPrx::ice_staticId() == Ice::Object::ice_staticId()); } { @@ -170,15 +176,15 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) Test::MyEnum e; Test::MyEnum r; - r = p->opMyEnum(Test::enum2, e); - test(e == Test::enum2); - test(r == Test::enum3); + r = p->opMyEnum(ICE_ENUM(MyEnum, enum2), e); + test(e == ICE_ENUM(MyEnum, enum2)); + test(r == ICE_ENUM(MyEnum, enum3)); } { - Test::MyClassPrx c1; - Test::MyClassPrx c2; - Test::MyClassPrx r; + Test::MyClassPrxPtr c1; + Test::MyClassPrxPtr c2; + Test::MyClassPrxPtr r; r = p->opMyClass(p, c1, c2); test(Ice::proxyIdentityAndFacetEqual(c1, p)); @@ -209,20 +215,24 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) { Test::Structure si1; si1.p = p; - si1.e = Test::enum3; + si1.e = ICE_ENUM(MyEnum, enum3); si1.s.s = "abc"; Test::Structure si2; si2.p = 0; - si2.e = Test::enum2; + si2.e = ICE_ENUM(MyEnum, enum2); si2.s.s = "def"; Test::Structure so; Test::Structure rso = p->opStruct(si1, si2, so); test(rso.p == 0); - test(rso.e == Test::enum2); + test(rso.e == ICE_ENUM(MyEnum, enum2)); test(rso.s.s == "def"); +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(so.p, p)); +#else test(so.p == p); - test(so.e == Test::enum3); +#endif + test(so.e == ICE_ENUM(MyEnum, enum3)); test(so.s.s == "a new string"); so.p->opVoid(); } @@ -731,64 +741,64 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) { Test::StringMyEnumD di1; - di1["abc"] = Test::enum1; - di1[""] = Test::enum2; + di1["abc"] = ICE_ENUM(MyEnum, enum1); + di1[""] = ICE_ENUM(MyEnum, enum2); Test::StringMyEnumD di2; - di2["abc"] = Test::enum1; - di2["qwerty"] = Test::enum3; - di2["Hello!!"] = Test::enum2; + di2["abc"] = ICE_ENUM(MyEnum, enum1); + di2["qwerty"] = ICE_ENUM(MyEnum, enum3); + di2["Hello!!"] = ICE_ENUM(MyEnum, enum2); Test::StringMyEnumD _do; Test::StringMyEnumD ro = p->opStringMyEnumD(di1, di2, _do); test(_do == di1); test(ro.size() == 4); - test(ro["abc"] == Test::enum1); - test(ro["qwerty"] == Test::enum3); - test(ro[""] == Test::enum2); - test(ro["Hello!!"] == Test::enum2); + test(ro["abc"] == ICE_ENUM(MyEnum, enum1)); + test(ro["qwerty"] == ICE_ENUM(MyEnum, enum3)); + test(ro[""] == ICE_ENUM(MyEnum, enum2)); + test(ro["Hello!!"] == ICE_ENUM(MyEnum, enum2)); } { Test::MyEnumStringD di1; - di1[Test::enum1] = "abc"; + di1[ICE_ENUM(MyEnum, enum1)] = "abc"; Test::MyEnumStringD di2; - di2[Test::enum2] = "Hello!!"; - di2[Test::enum3] = "qwerty"; + di2[ICE_ENUM(MyEnum, enum2)] = "Hello!!"; + di2[ICE_ENUM(MyEnum, enum3)] = "qwerty"; Test::MyEnumStringD _do; Test::MyEnumStringD ro = p->opMyEnumStringD(di1, di2, _do); test(_do == di1); test(ro.size() == 3); - test(ro[Test::enum1] == "abc"); - test(ro[Test::enum2] == "Hello!!"); - test(ro[Test::enum3] == "qwerty"); + test(ro[ICE_ENUM(MyEnum, enum1)] == "abc"); + test(ro[ICE_ENUM(MyEnum, enum2)] == "Hello!!"); + test(ro[ICE_ENUM(MyEnum, enum3)] == "qwerty"); } { Test::MyStruct s11 = { 1, 1 }; Test::MyStruct s12 = { 1, 2 }; Test::MyStructMyEnumD di1; - di1[s11] = Test::enum1; - di1[s12] = Test::enum2; + di1[s11] = ICE_ENUM(MyEnum, enum1); + di1[s12] = ICE_ENUM(MyEnum, enum2); Test::MyStruct s22 = { 2, 2 }; Test::MyStruct s23 = { 2, 3 }; Test::MyStructMyEnumD di2; - di2[s11] = Test::enum1; - di2[s22] = Test::enum3; - di2[s23] = Test::enum2; + di2[s11] = ICE_ENUM(MyEnum, enum1); + di2[s22] = ICE_ENUM(MyEnum, enum3); + di2[s23] = ICE_ENUM(MyEnum, enum2); Test::MyStructMyEnumD _do; Test::MyStructMyEnumD ro = p->opMyStructMyEnumD(di1, di2, _do); test(_do == di1); test(ro.size() == 4); - test(ro[s11] == Test::enum1); - test(ro[s12] == Test::enum2); - test(ro[s22] == Test::enum3); - test(ro[s23] == Test::enum2); + test(ro[s11] == ICE_ENUM(MyEnum, enum1)); + test(ro[s12] == ICE_ENUM(MyEnum, enum2)); + test(ro[s22] == ICE_ENUM(MyEnum, enum3)); + test(ro[s23] == ICE_ENUM(MyEnum, enum2)); } { @@ -999,14 +1009,14 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) dsi2.resize(1); Test::StringMyEnumD di1; - di1["abc"] = Test::enum1; - di1[""] = Test::enum2; + di1["abc"] = ICE_ENUM(MyEnum, enum1); + di1[""] = ICE_ENUM(MyEnum, enum2); Test::StringMyEnumD di2; - di2["abc"] = Test::enum1; - di2["qwerty"] = Test::enum3; - di2["Hello!!"] = Test::enum2; + di2["abc"] = ICE_ENUM(MyEnum, enum1); + di2["qwerty"] = ICE_ENUM(MyEnum, enum3); + di2["Hello!!"] = ICE_ENUM(MyEnum, enum2); Test::StringMyEnumD di3; - di3["Goodbye"] = Test::enum1; + di3["Goodbye"] = ICE_ENUM(MyEnum, enum1); dsi1[0] = di1; dsi1[1] = di2; @@ -1019,23 +1029,23 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) test(ro.size() == 2); test(ro[0].size() == 3); - test(ro[0]["abc"] == Test::enum1); - test(ro[0]["qwerty"] == Test::enum3); - test(ro[0]["Hello!!"] == Test::enum2); + test(ro[0]["abc"] == ICE_ENUM(MyEnum, enum1)); + test(ro[0]["qwerty"] == ICE_ENUM(MyEnum, enum3)); + test(ro[0]["Hello!!"] == ICE_ENUM(MyEnum, enum2)); test(ro[1].size() == 2); - test(ro[1]["abc"] == Test::enum1); - test(ro[1][""] == Test::enum2); + test(ro[1]["abc"] == ICE_ENUM(MyEnum, enum1)); + test(ro[1][""] == ICE_ENUM(MyEnum, enum2)); test(_do.size() == 3); test(_do[0].size() == 1); - test(_do[0]["Goodbye"] == Test::enum1); + test(_do[0]["Goodbye"] == ICE_ENUM(MyEnum, enum1)); test(_do[1].size() == 2); - test(_do[1]["abc"] == Test::enum1); - test(_do[1][""] == Test::enum2); + test(_do[1]["abc"] == ICE_ENUM(MyEnum, enum1)); + test(_do[1][""] == ICE_ENUM(MyEnum, enum2)); test(_do[2].size() == 3); - test(_do[2]["abc"] == Test::enum1); - test(_do[2]["qwerty"] == Test::enum3); - test(_do[2]["Hello!!"] == Test::enum2); + test(_do[2]["abc"] == ICE_ENUM(MyEnum, enum1)); + test(_do[2]["qwerty"] == ICE_ENUM(MyEnum, enum3)); + test(_do[2]["Hello!!"] == ICE_ENUM(MyEnum, enum2)); } catch(const Ice::OperationNotExistException&) { @@ -1049,12 +1059,12 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) dsi2.resize(1); Test::MyEnumStringD di1; - di1[Test::enum1] = "abc"; + di1[ICE_ENUM(MyEnum, enum1)] = "abc"; Test::MyEnumStringD di2; - di2[Test::enum2] = "Hello!!"; - di2[Test::enum3] = "qwerty"; + di2[ICE_ENUM(MyEnum, enum2)] = "Hello!!"; + di2[ICE_ENUM(MyEnum, enum3)] = "qwerty"; Test::MyEnumStringD di3; - di3[Test::enum1] = "Goodbye"; + di3[ICE_ENUM(MyEnum, enum1)] = "Goodbye"; dsi1[0] = di1; dsi1[1] = di2; @@ -1067,19 +1077,19 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) test(ro.size() == 2); test(ro[0].size() == 2); - test(ro[0][Test::enum2] == "Hello!!"); - test(ro[0][Test::enum3] == "qwerty"); + test(ro[0][ICE_ENUM(MyEnum, enum2)] == "Hello!!"); + test(ro[0][ICE_ENUM(MyEnum, enum3)] == "qwerty"); test(ro[1].size() == 1); - test(ro[1][Test::enum1] == "abc"); + test(ro[1][ICE_ENUM(MyEnum, enum1)] == "abc"); test(_do.size() == 3); test(_do[0].size() == 1); - test(_do[0][Test::enum1] == "Goodbye"); + test(_do[0][ICE_ENUM(MyEnum, enum1)] == "Goodbye"); test(_do[1].size() == 1); - test(_do[1][Test::enum1] == "abc"); + test(_do[1][ICE_ENUM(MyEnum, enum1)] == "abc"); test(_do[2].size() == 2); - test(_do[2][Test::enum2] == "Hello!!"); - test(_do[2][Test::enum3] == "qwerty"); + test(_do[2][ICE_ENUM(MyEnum, enum2)] == "Hello!!"); + test(_do[2][ICE_ENUM(MyEnum, enum3)] == "qwerty"); } catch(const Ice::OperationNotExistException&) { @@ -1095,18 +1105,18 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) Test::MyStruct s11 = { 1, 1 }; Test::MyStruct s12 = { 1, 2 }; Test::MyStructMyEnumD di1; - di1[s11] = Test::enum1; - di1[s12] = Test::enum2; + di1[s11] = ICE_ENUM(MyEnum, enum1); + di1[s12] = ICE_ENUM(MyEnum, enum2); Test::MyStruct s22 = { 2, 2 }; Test::MyStruct s23 = { 2, 3 }; Test::MyStructMyEnumD di2; - di2[s11] = Test::enum1; - di2[s22] = Test::enum3; - di2[s23] = Test::enum2; + di2[s11] = ICE_ENUM(MyEnum, enum1); + di2[s22] = ICE_ENUM(MyEnum, enum3); + di2[s23] = ICE_ENUM(MyEnum, enum2); Test::MyStructMyEnumD di3; - di3[s23] = Test::enum3; + di3[s23] = ICE_ENUM(MyEnum, enum3); dsi1[0] = di1; dsi1[1] = di2; @@ -1119,23 +1129,23 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) test(ro.size() == 2); test(ro[0].size() == 3); - test(ro[0][s11] == Test::enum1); - test(ro[0][s22] == Test::enum3); - test(ro[0][s23] == Test::enum2); + test(ro[0][s11] == ICE_ENUM(MyEnum, enum1)); + test(ro[0][s22] == ICE_ENUM(MyEnum, enum3)); + test(ro[0][s23] == ICE_ENUM(MyEnum, enum2)); test(ro[1].size() == 2); - test(ro[1][s11] == Test::enum1); - test(ro[1][s12] == Test::enum2); + test(ro[1][s11] == ICE_ENUM(MyEnum, enum1)); + test(ro[1][s12] == ICE_ENUM(MyEnum, enum2)); test(_do.size() == 3); test(_do[0].size() == 1); - test(_do[0][s23] == Test::enum3); + test(_do[0][s23] == ICE_ENUM(MyEnum, enum3)); test(_do[1].size() == 2); - test(_do[1][s11] == Test::enum1); - test(_do[1][s12] == Test::enum2); + test(_do[1][s11] == ICE_ENUM(MyEnum, enum1)); + test(_do[1][s12] == ICE_ENUM(MyEnum, enum2)); test(_do[2].size() == 3); - test(_do[2][s11] == Test::enum1); - test(_do[2][s22] == Test::enum3); - test(_do[2][s23] == Test::enum2); + test(_do[2][s11] == ICE_ENUM(MyEnum, enum1)); + test(_do[2][s22] == ICE_ENUM(MyEnum, enum3)); + test(_do[2][s23] == ICE_ENUM(MyEnum, enum2)); } catch(const Ice::OperationNotExistException&) { @@ -1486,17 +1496,17 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) Test::MyEnumS si2; Test::MyEnumS si3; - si1.push_back(Test::enum1); - si1.push_back(Test::enum1); - si1.push_back(Test::enum2); - si2.push_back(Test::enum1); - si2.push_back(Test::enum2); - si3.push_back(Test::enum3); - si3.push_back(Test::enum3); + si1.push_back(ICE_ENUM(MyEnum, enum1)); + si1.push_back(ICE_ENUM(MyEnum, enum1)); + si1.push_back(ICE_ENUM(MyEnum, enum2)); + si2.push_back(ICE_ENUM(MyEnum, enum1)); + si2.push_back(ICE_ENUM(MyEnum, enum2)); + si3.push_back(ICE_ENUM(MyEnum, enum3)); + si3.push_back(ICE_ENUM(MyEnum, enum3)); - sdi1[Test::enum3] = si1; - sdi1[Test::enum2] = si2; - sdi2[Test::enum1] = si3; + sdi1[ICE_ENUM(MyEnum, enum3)] = si1; + sdi1[ICE_ENUM(MyEnum, enum2)] = si2; + sdi2[ICE_ENUM(MyEnum, enum1)] = si3; try { @@ -1505,16 +1515,16 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) test(_do == sdi2); test(ro.size() == 3); - test(ro[Test::enum3].size() == 3); - test(ro[Test::enum3][0] == Test::enum1); - test(ro[Test::enum3][1] == Test::enum1); - test(ro[Test::enum3][2] == Test::enum2); - test(ro[Test::enum2].size() == 2); - test(ro[Test::enum2][0] == Test::enum1); - test(ro[Test::enum2][1] == Test::enum2); - test(ro[Test::enum1].size() == 2); - test(ro[Test::enum1][0] == Test::enum3); - test(ro[Test::enum1][1] == Test::enum3); + test(ro[ICE_ENUM(MyEnum, enum3)].size() == 3); + test(ro[ICE_ENUM(MyEnum, enum3)][0] == ICE_ENUM(MyEnum, enum1)); + test(ro[ICE_ENUM(MyEnum, enum3)][1] == ICE_ENUM(MyEnum, enum1)); + test(ro[ICE_ENUM(MyEnum, enum3)][2] == ICE_ENUM(MyEnum, enum2)); + test(ro[ICE_ENUM(MyEnum, enum2)].size() == 2); + test(ro[ICE_ENUM(MyEnum, enum2)][0] == ICE_ENUM(MyEnum, enum1)); + test(ro[ICE_ENUM(MyEnum, enum2)][1] == ICE_ENUM(MyEnum, enum2)); + test(ro[ICE_ENUM(MyEnum, enum1)].size() == 2); + test(ro[ICE_ENUM(MyEnum, enum1)][0] == ICE_ENUM(MyEnum, enum3)); + test(ro[ICE_ENUM(MyEnum, enum1)][1] == ICE_ENUM(MyEnum, enum3)); } catch(const Ice::OperationNotExistException&) { @@ -1556,7 +1566,7 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) test(r == ctx); } { - Test::MyClassPrx p2 = Test::MyClassPrx::checkedCast(p->ice_context(ctx)); + Test::MyClassPrxPtr p2 = ICE_CHECKED_CAST(Test::MyClassPrx, p->ice_context(ctx)); test(p2->ice_getContext() == ctx); Test::StringStringD r = p2->opContext(); test(r == ctx); @@ -1585,8 +1595,8 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) ctx["two"] = "TWO"; ctx["three"] = "THREE"; - Test::MyClassPrx p = Test::MyClassPrx::uncheckedCast( - ic->stringToProxy("test:default -p 12010 -t 10000")); + Test::MyClassPrxPtr p = ICE_UNCHECKED_CAST(Test::MyClassPrx, + ic->stringToProxy("test:default -p 12010 -t 10000")); ic->getImplicitContext()->setContext(ctx); test(ic->getImplicitContext()->getContext() == ctx); @@ -1608,7 +1618,7 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) combined.insert(ctx.begin(), ctx.end()); test(combined["one"] == "UN"); - p = Test::MyClassPrx::uncheckedCast(p->ice_context(prxContext)); + p = ICE_UNCHECKED_CAST(Test::MyClassPrx, p->ice_context(prxContext)); ic->getImplicitContext()->setContext(Ice::Context()); test(p->opContext() == prxContext); @@ -1650,7 +1660,7 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) test(p->opDouble1(1.0) == 1.0); test(p->opString1("opString1") == "opString1"); - Test::MyDerivedClassPrx d = Test::MyDerivedClassPrx::uncheckedCast(p); + Test::MyDerivedClassPrxPtr d = ICE_UNCHECKED_CAST(Test::MyDerivedClassPrx, p); Test::MyStruct1 s; s.tesT = "Test::MyStruct1::s"; @@ -1661,7 +1671,7 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) test(s.myClass == 0); test(s.myStruct1 == "Test::MyStruct1::myStruct1"); - Test::MyClass1Ptr c = new Test::MyClass1(); + Test::MyClass1Ptr c = ICE_MAKE_SHARED(Test::MyClass1); c->tesT = "Test::MyClass1::testT"; c->myClass = 0; c->myClass1 = "Test::MyClass1::myClass1"; diff --git a/cpp/test/Ice/operations/TwowaysAMI.cpp b/cpp/test/Ice/operations/TwowaysAMI.cpp index 97ae75e9f6f..f6606431f9a 100644 --- a/cpp/test/Ice/operations/TwowaysAMI.cpp +++ b/cpp/test/Ice/operations/TwowaysAMI.cpp @@ -28,7 +28,7 @@ #endif using namespace std; - +using namespace Test; namespace { @@ -162,12 +162,12 @@ public: void opMyEnum(Test::MyEnum r, Test::MyEnum e) { - test(e == Test::enum2); - test(r == Test::enum3); + test(e == ICE_ENUM(Test::MyEnum, enum2)); + test(r == ICE_ENUM(Test::MyEnum, enum3)); called(); } - void opMyClass(const Test::MyClassPrx& r, const Test::MyClassPrx& c1, const Test::MyClassPrx& c2) + void opMyClass(const Test::MyClassPrxPtr& r, const Test::MyClassPrxPtr& c1, const Test::MyClassPrxPtr& c2) { test(c1->ice_getIdentity() == _communicator->stringToIdentity("test")); test(c2->ice_getIdentity() == _communicator->stringToIdentity("noSuchIdentity")); @@ -195,9 +195,9 @@ public: void opStruct(const Test::Structure& rso, const Test::Structure& so) { test(rso.p == 0); - test(rso.e == Test::enum2); + test(rso.e == ICE_ENUM(Test::MyEnum, enum2)); test(rso.s.s == "def"); - test(so.e == Test::enum3); + test(so.e == ICE_ENUM(Test::MyEnum, enum3)); test(so.s.s == "a new string"); // @@ -502,18 +502,18 @@ public: void opStringMyEnumD(const Test::StringMyEnumD& ro, const Test::StringMyEnumD& _do) { Test::StringMyEnumD di1; - di1["abc"] = Test::enum1; - di1[""] = Test::enum2; + di1["abc"] = ICE_ENUM(Test::MyEnum, enum1); + di1[""] = ICE_ENUM(Test::MyEnum, enum2); test(_do == di1); test(ro.size() == 4); test(ro.find("abc") != ro.end()); - test(ro.find("abc")->second == Test::enum1); + test(ro.find("abc")->second == ICE_ENUM(Test::MyEnum, enum1)); test(ro.find("qwerty") != ro.end()); - test(ro.find("qwerty")->second == Test::enum3); + test(ro.find("qwerty")->second == ICE_ENUM(Test::MyEnum, enum3)); test(ro.find("") != ro.end()); - test(ro.find("")->second == Test::enum2); + test(ro.find("")->second == ICE_ENUM(Test::MyEnum, enum2)); test(ro.find("Hello!!") != ro.end()); - test(ro.find("Hello!!")->second == Test::enum2); + test(ro.find("Hello!!")->second == ICE_ENUM(Test::MyEnum, enum2)); called(); } @@ -522,20 +522,20 @@ public: Test::MyStruct s11 = { 1, 1 }; Test::MyStruct s12 = { 1, 2 }; Test::MyStructMyEnumD di1; - di1[s11] = Test::enum1; - di1[s12] = Test::enum2; + di1[s11] = ICE_ENUM(Test::MyEnum, enum1); + di1[s12] = ICE_ENUM(Test::MyEnum, enum2); test(_do == di1); Test::MyStruct s22 = { 2, 2 }; Test::MyStruct s23 = { 2, 3 }; test(ro.size() == 4); test(ro.find(s11) != ro.end()); - test(ro.find(s11)->second == Test::enum1); + test(ro.find(s11)->second == ICE_ENUM(Test::MyEnum, enum1)); test(ro.find(s12) != ro.end()); - test(ro.find(s12)->second == Test::enum2); + test(ro.find(s12)->second == ICE_ENUM(Test::MyEnum, enum2)); test(ro.find(s22) != ro.end()); - test(ro.find(s22)->second == Test::enum3); + test(ro.find(s22)->second == ICE_ENUM(Test::MyEnum, enum3)); test(ro.find(s23) != ro.end()); - test(ro.find(s23)->second == Test::enum2); + test(ro.find(s23)->second == ICE_ENUM(Test::MyEnum, enum2)); called(); } @@ -680,32 +680,32 @@ public: test(ro.size() == 2); test(ro[0].size() == 3); test(ro[0].find("abc") != ro[0].end()); - test(ro[0].find("abc")->second == Test::enum1); + test(ro[0].find("abc")->second == ICE_ENUM(Test::MyEnum, enum1)); test(ro[0].find("qwerty") != ro[0].end()); - test(ro[0].find("qwerty")->second == Test::enum3); + test(ro[0].find("qwerty")->second == ICE_ENUM(Test::MyEnum, enum3)); test(ro[0].find("Hello!!") != ro[0].end()); - test(ro[0].find("Hello!!")->second == Test::enum2); + test(ro[0].find("Hello!!")->second == ICE_ENUM(Test::MyEnum, enum2)); test(ro[1].size() == 2); test(ro[1].find("abc") != ro[1].end()); - test(ro[1].find("abc")->second == Test::enum1); + test(ro[1].find("abc")->second == ICE_ENUM(Test::MyEnum, enum1)); test(ro[1].find("") != ro[1].end()); - test(ro[1].find("")->second == Test::enum2); + test(ro[1].find("")->second == ICE_ENUM(Test::MyEnum, enum2)); test(_do.size() == 3); test(_do[0].size() == 1); test(_do[0].find("Goodbye") != _do[0].end()); - test(_do[0].find("Goodbye")->second == Test::enum1); + test(_do[0].find("Goodbye")->second == ICE_ENUM(Test::MyEnum, enum1)); test(_do[1].size() == 2); test(_do[1].find("abc") != _do[1].end()); - test(_do[1].find("abc")->second == Test::enum1); + test(_do[1].find("abc")->second == ICE_ENUM(Test::MyEnum, enum1)); test(_do[1].find("") != _do[1].end()); - test(_do[1].find("")->second == Test::enum2); + test(_do[1].find("")->second == ICE_ENUM(Test::MyEnum, enum2)); test(_do[2].size() == 3); test(_do[2].find("abc") != _do[2].end()); - test(_do[2].find("abc")->second == Test::enum1); + test(_do[2].find("abc")->second == ICE_ENUM(Test::MyEnum, enum1)); test(_do[2].find("qwerty") != _do[2].end()); - test(_do[2].find("qwerty")->second == Test::enum3); + test(_do[2].find("qwerty")->second == ICE_ENUM(Test::MyEnum, enum3)); test(_do[2].find("Hello!!") != _do[2].end()); - test(_do[2].find("Hello!!")->second == Test::enum2); + test(_do[2].find("Hello!!")->second == ICE_ENUM(Test::MyEnum, enum2)); called(); } @@ -713,25 +713,25 @@ public: { test(ro.size() == 2); test(ro[0].size() == 2); - test(ro[0].find(Test::enum2) != ro[0].end()); - test(ro[0].find(Test::enum2)->second == "Hello!!"); - test(ro[0].find(Test::enum3) != ro[0].end()); - test(ro[0].find(Test::enum3)->second == "qwerty"); + test(ro[0].find(ICE_ENUM(Test::MyEnum, enum2)) != ro[0].end()); + test(ro[0].find(ICE_ENUM(Test::MyEnum, enum2))->second == "Hello!!"); + test(ro[0].find(ICE_ENUM(Test::MyEnum, enum3)) != ro[0].end()); + test(ro[0].find(ICE_ENUM(Test::MyEnum, enum3))->second == "qwerty"); test(ro[1].size() == 1); - test(ro[1].find(Test::enum1) != ro[1].end()); - test(ro[1].find(Test::enum1)->second == "abc"); + test(ro[1].find(ICE_ENUM(Test::MyEnum, enum1)) != ro[1].end()); + test(ro[1].find(ICE_ENUM(Test::MyEnum, enum1))->second == "abc"); test(_do.size() == 3); test(_do[0].size() == 1); - test(_do[0].find(Test::enum1) != _do[0].end()); - test(_do[0].find(Test::enum1)->second == "Goodbye"); + test(_do[0].find(ICE_ENUM(Test::MyEnum, enum1)) != _do[0].end()); + test(_do[0].find(ICE_ENUM(Test::MyEnum, enum1))->second == "Goodbye"); test(_do[1].size() == 1); - test(_do[1].find(Test::enum1) != _do[1].end()); - test(_do[1].find(Test::enum1)->second == "abc"); + test(_do[1].find(ICE_ENUM(Test::MyEnum, enum1)) != _do[1].end()); + test(_do[1].find(ICE_ENUM(Test::MyEnum, enum1))->second == "abc"); test(_do[2].size() == 2); - test(_do[2].find(Test::enum2) != _do[2].end()); - test(_do[2].find(Test::enum2)->second == "Hello!!"); - test(_do[2].find(Test::enum3) != _do[2].end()); - test(_do[2].find(Test::enum3)->second == "qwerty"); + test(_do[2].find(ICE_ENUM(Test::MyEnum, enum2)) != _do[2].end()); + test(_do[2].find(ICE_ENUM(Test::MyEnum, enum2))->second == "Hello!!"); + test(_do[2].find(ICE_ENUM(Test::MyEnum, enum3)) != _do[2].end()); + test(_do[2].find(ICE_ENUM(Test::MyEnum, enum3))->second == "qwerty"); called(); } @@ -745,32 +745,32 @@ public: test(ro.size() == 2); test(ro[0].size() == 3); test(ro[0].find(s11) != ro[0].end()); - test(ro[0].find(s11)->second == Test::enum1); + test(ro[0].find(s11)->second == ICE_ENUM(Test::MyEnum, enum1)); test(ro[0].find(s22) != ro[0].end()); - test(ro[0].find(s22)->second == Test::enum3); + test(ro[0].find(s22)->second == ICE_ENUM(Test::MyEnum, enum3)); test(ro[0].find(s23) != ro[0].end()); - test(ro[0].find(s23)->second == Test::enum2); + test(ro[0].find(s23)->second == ICE_ENUM(Test::MyEnum, enum2)); test(ro[1].size() == 2); test(ro[1].find(s11) != ro[1].end()); - test(ro[1].find(s11)->second == Test::enum1); + test(ro[1].find(s11)->second == ICE_ENUM(Test::MyEnum, enum1)); test(ro[1].find(s12) != ro[1].end()); - test(ro[1].find(s12)->second == Test::enum2); + test(ro[1].find(s12)->second == ICE_ENUM(Test::MyEnum, enum2)); test(_do.size() == 3); test(_do[0].size() == 1); test(_do[0].find(s23) != _do[0].end()); - test(_do[0].find(s23)->second == Test::enum3); + test(_do[0].find(s23)->second == ICE_ENUM(Test::MyEnum, enum3)); test(_do[1].size() == 2); test(_do[1].find(s11) != _do[1].end()); - test(_do[1].find(s11)->second == Test::enum1); + test(_do[1].find(s11)->second == ICE_ENUM(Test::MyEnum, enum1)); test(_do[1].find(s12) != _do[1].end()); - test(_do[1].find(s12)->second == Test::enum2); + test(_do[1].find(s12)->second == ICE_ENUM(Test::MyEnum, enum2)); test(_do[2].size() == 3); test(_do[2].find(s11) != _do[2].end()); - test(_do[2].find(s11)->second == Test::enum1); + test(_do[2].find(s11)->second == ICE_ENUM(Test::MyEnum, enum1)); test(_do[2].find(s22) != _do[2].end()); - test(_do[2].find(s22)->second == Test::enum3); + test(_do[2].find(s22)->second == ICE_ENUM(Test::MyEnum, enum3)); test(_do[2].find(s23) != _do[2].end()); - test(_do[2].find(s23)->second == Test::enum2); + test(_do[2].find(s23)->second == ICE_ENUM(Test::MyEnum, enum2)); called(); } @@ -963,24 +963,24 @@ public: void opMyEnumMyEnumSD(const Test::MyEnumMyEnumSD& ro, const Test::MyEnumMyEnumSD& _do) { test(_do.size() == 1); - test(_do.find(Test::enum1) != _do.end()); - test(_do.find(Test::enum1)->second.size() == 2); - test(_do.find(Test::enum1)->second[0] == Test::enum3); - test(_do.find(Test::enum1)->second[1] == Test::enum3); + test(_do.find(ICE_ENUM(Test::MyEnum, enum1)) != _do.end()); + test(_do.find(ICE_ENUM(Test::MyEnum, enum1))->second.size() == 2); + test(_do.find(ICE_ENUM(Test::MyEnum, enum1))->second[0] == ICE_ENUM(Test::MyEnum, enum3)); + test(_do.find(ICE_ENUM(Test::MyEnum, enum1))->second[1] == ICE_ENUM(Test::MyEnum, enum3)); test(ro.size() == 3); - test(ro.find(Test::enum3) != ro.end()); - test(ro.find(Test::enum3)->second.size() == 3); - test(ro.find(Test::enum3)->second[0] == Test::enum1); - test(ro.find(Test::enum3)->second[1] == Test::enum1); - test(ro.find(Test::enum3)->second[2] == Test::enum2); - test(ro.find(Test::enum2) != ro.end()); - test(ro.find(Test::enum2)->second.size() == 2); - test(ro.find(Test::enum2)->second[0] == Test::enum1); - test(ro.find(Test::enum2)->second[1] == Test::enum2); - test(ro.find(Test::enum1) != ro.end()); - test(ro.find(Test::enum1)->second.size() == 2); - test(ro.find(Test::enum1)->second[0] == Test::enum3); - test(ro.find(Test::enum1)->second[1] == Test::enum3); + test(ro.find(ICE_ENUM(Test::MyEnum, enum3)) != ro.end()); + test(ro.find(ICE_ENUM(Test::MyEnum, enum3))->second.size() == 3); + test(ro.find(ICE_ENUM(Test::MyEnum, enum3))->second[0] == ICE_ENUM(Test::MyEnum, enum1)); + test(ro.find(ICE_ENUM(Test::MyEnum, enum3))->second[1] == ICE_ENUM(Test::MyEnum, enum1)); + test(ro.find(ICE_ENUM(Test::MyEnum, enum3))->second[2] == ICE_ENUM(Test::MyEnum, enum2)); + test(ro.find(ICE_ENUM(Test::MyEnum, enum2)) != ro.end()); + test(ro.find(ICE_ENUM(Test::MyEnum, enum2))->second.size() == 2); + test(ro.find(ICE_ENUM(Test::MyEnum, enum2))->second[0] == ICE_ENUM(Test::MyEnum, enum1)); + test(ro.find(ICE_ENUM(Test::MyEnum, enum2))->second[1] == ICE_ENUM(Test::MyEnum, enum2)); + test(ro.find(ICE_ENUM(Test::MyEnum, enum1)) != ro.end()); + test(ro.find(ICE_ENUM(Test::MyEnum, enum1))->second.size() == 2); + test(ro.find(ICE_ENUM(Test::MyEnum, enum1))->second[0] == ICE_ENUM(Test::MyEnum, enum3)); + test(ro.find(ICE_ENUM(Test::MyEnum, enum1))->second[1] == ICE_ENUM(Test::MyEnum, enum3)); called(); } @@ -1037,130 +1037,268 @@ typedef IceUtil::Handle<Callback> CallbackPtr; } +#ifdef ICE_CPP11_MAPPING +function<void (exception_ptr)> +makeExceptionClosure(CallbackPtr& cb) +{ + return [&](exception_ptr e) + { + try + { + rethrow_exception(e); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + }; +} +#endif + void -twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) +twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& p) { { CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->ice_ping_async( + [&]() + { + cb->ping(); + }, + makeExceptionClosure(cb)); +#else Ice::Callback_Object_ice_pingPtr callback = Ice::newCallback_Object_ice_ping(cb, &Callback::ping, &Callback::exCB); p->begin_ice_ping(callback); +#endif cb->check(); } { CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->ice_isA_async( + Test::MyClass::ice_staticId(), + [&](bool v) + { + cb->isA(v); + }, + makeExceptionClosure(cb)); +#else Ice::Callback_Object_ice_isAPtr callback = Ice::newCallback_Object_ice_isA(cb, &Callback::isA, &Callback::exCB); - p->begin_ice_isA(Test::MyClass::ice_staticId(), callback); + p->begin_ice_isA(Test::MyClass::ice_staticId(), callback); +#endif cb->check(); } { CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->ice_id_async( + [&](string id) + { + cb->id(move(id)); + }, + makeExceptionClosure(cb)); +#else Ice::Callback_Object_ice_idPtr callback = Ice::newCallback_Object_ice_id(cb, &Callback::id, &Callback::exCB); p->begin_ice_id(callback); +#endif cb->check(); } { CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->ice_ids_async( + [&](vector<string> ids) + { + cb->ids(move(ids)); + }, + makeExceptionClosure(cb)); + +#else Ice::Callback_Object_ice_idsPtr callback = Ice::newCallback_Object_ice_ids(cb, &Callback::ids, &Callback::exCB); p->begin_ice_ids(callback); +#endif cb->check(); } { CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opVoid_async( + [&]() + { + cb->opVoid(); + }, + makeExceptionClosure(cb)); + +#else Test::Callback_MyClass_opVoidPtr callback = Test::newCallback_MyClass_opVoid(cb, &Callback::opVoid, &Callback::exCB); p->begin_opVoid(callback); +#endif cb->check(); } { CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opByte_async(Ice::Byte(0xff), Ice::Byte(0x0f), + [&](Ice::Byte b1, Ice::Byte b2) + { + cb->opByte(b1, b2); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyClass_opBytePtr callback = Test::newCallback_MyClass_opByte(cb, &Callback::opByte, &Callback::exCB); p->begin_opByte(Ice::Byte(0xff), Ice::Byte(0x0f), callback); +#endif cb->check(); } { CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opBool_async(true, false, + [&](bool b1, bool b2) + { + cb->opBool(b1, b2); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyClass_opBoolPtr callback = Test::newCallback_MyClass_opBool(cb, &Callback::opBool, &Callback::exCB); p->begin_opBool(true, false, callback); +#endif cb->check(); } { CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opShortIntLong_async(10, 11, 12, + [&](long long int l1, short s1, int i1, long long int l2) + { + cb->opShortIntLong(l1, s1, i1, l2); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyClass_opShortIntLongPtr callback = Test::newCallback_MyClass_opShortIntLong(cb, &Callback::opShortIntLong, &Callback::exCB); p->begin_opShortIntLong(10, 11, 12, callback); +#endif cb->check(); } { CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opFloatDouble_async(3.14f, 1.1E10, + [&](double d1, float f1, double d2) + { + cb->opFloatDouble(d1, f1, d2); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyClass_opFloatDoublePtr callback = Test::newCallback_MyClass_opFloatDouble(cb, &Callback::opFloatDouble, &Callback::exCB); p->begin_opFloatDouble(Ice::Float(3.14), Ice::Double(1.1E10), callback); +#endif cb->check(); } { CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opString_async("hello", "world", + [&](string s1, string s2) + { + cb->opString(move(s1), move(s2)); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyClass_opStringPtr callback = Test::newCallback_MyClass_opString(cb, &Callback::opString, &Callback::exCB); p->begin_opString("hello", "world", callback); +#endif cb->check(); } { CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opMyEnum_async(MyEnum::enum2, + [&](MyEnum e1, MyEnum e2) + { + cb->opMyEnum(e1, e2); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyClass_opMyEnumPtr callback = Test::newCallback_MyClass_opMyEnum(cb, &Callback::opMyEnum, &Callback::exCB); p->begin_opMyEnum(Test::enum2, callback); +#endif cb->check(); } { CallbackPtr cb = new Callback(communicator); +#ifdef ICE_CPP11_MAPPING + p->opMyClass_async(p, + [&](shared_ptr<MyClassPrx> c1, shared_ptr<MyClassPrx> c2, shared_ptr<MyClassPrx> c3) + { + cb->opMyClass(move(c1), move(c2), move(c3)); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyClass_opMyClassPtr callback = Test::newCallback_MyClass_opMyClass(cb, &Callback::opMyClass, &Callback::exCB); p->begin_opMyClass(p, callback); +#endif cb->check(); } { Test::Structure si1; si1.p = p; - si1.e = Test::enum3; + si1.e = ICE_ENUM(Test::MyEnum, enum3); si1.s.s = "abc"; Test::Structure si2; si2.p = 0; - si2.e = Test::enum2; + si2.e = ICE_ENUM(Test::MyEnum, enum2); si2.s.s = "def"; CallbackPtr cb = new Callback(communicator); +#ifdef ICE_CPP11_MAPPING + p->opStruct_async(si1, si2, + [&](Test::Structure si3, Test::Structure si4) + { + cb->opStruct(move(si3), move(si4)); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyClass_opStructPtr callback = Test::newCallback_MyClass_opStruct(cb, &Callback::opStruct, &Callback::exCB); p->begin_opStruct(si1, si2, callback); +#endif cb->check(); } @@ -1179,10 +1317,19 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) bsi2.push_back(Ice::Byte(0xf4)); CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opByteS_async(bsi1, bsi2, + [&](Test::ByteS bsi3, Test::ByteS bsi4) + { + cb->opByteS(move(bsi3), move(bsi4)); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyClass_opByteSPtr callback = Test::newCallback_MyClass_opByteS(cb, &Callback::opByteS, &Callback::exCB); p->begin_opByteS(bsi1, bsi2, callback); +#endif cb->check(); } @@ -1197,10 +1344,19 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) bsi2.push_back(false); CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opBoolS_async(bsi1, bsi2, + [&](Test::BoolS bsi3, Test::BoolS bsi4) + { + cb->opBoolS(move(bsi3), move(bsi4)); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyClass_opBoolSPtr callback = Test::newCallback_MyClass_opBoolS(cb, &Callback::opBoolS, &Callback::exCB); p->begin_opBoolS(bsi1, bsi2, callback); +#endif cb->check(); } @@ -1223,9 +1379,18 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) lsi.push_back(20); CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opShortIntLongS_async(ssi, isi, lsi, + [&](Test::LongS lsi1, Test::ShortS ssi1, Test::IntS isi1, Test::LongS lsi2) + { + cb->opShortIntLongS(move(lsi1), move(ssi1), move(isi1), move(lsi2)); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyClass_opShortIntLongSPtr callback = Test::newCallback_MyClass_opShortIntLongS(cb, &Callback::opShortIntLongS, &Callback::exCB); p->begin_opShortIntLongS(ssi, isi, lsi, callback); +#endif cb->check(); } @@ -1241,9 +1406,18 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) dsi.push_back(Ice::Double(1.3E10)); CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opFloatDoubleS_async(fsi, dsi, + [&](Test::DoubleS dsi1, Test::FloatS fsi1, Test::DoubleS dsi2) + { + cb->opFloatDoubleS(move(dsi1), move(fsi1), move(dsi2)); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyClass_opFloatDoubleSPtr callback = Test::newCallback_MyClass_opFloatDoubleS(cb, &Callback::opFloatDoubleS, &Callback::exCB); p->begin_opFloatDoubleS(fsi, dsi, callback); +#endif cb->check(); } @@ -1258,10 +1432,19 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) ssi2.push_back("xyz"); CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opStringS_async(ssi1, ssi2, + [&](Test::StringS ssi3, Test::StringS ssi4) + { + cb->opStringS(move(ssi3), move(ssi4)); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyClass_opStringSPtr callback = Test::newCallback_MyClass_opStringS(cb, &Callback::opStringS, &Callback::exCB); p->begin_opStringS(ssi1, ssi2, callback); +#endif cb->check(); } @@ -1281,10 +1464,19 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) bsi2[1].push_back(Ice::Byte(0xf1)); CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opByteSS_async(bsi1, bsi2, + [&](Test::ByteSS bsi3, Test::ByteSS bsi4) + { + cb->opByteSS(move(bsi3), move(bsi4)); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyClass_opByteSSPtr callback = Test::newCallback_MyClass_opByteSS(cb, &Callback::opByteSS, &Callback::exCB); p->begin_opByteSS(bsi1, bsi2, callback); +#endif cb->check(); } @@ -1304,10 +1496,19 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) bsi2[0].push_back(true); CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opBoolSS_async(bsi1, bsi2, + [&](Test::BoolSS bsi3, Test::BoolSS bsi4) + { + cb->opBoolSS(move(bsi3), move(bsi4)); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyClass_opBoolSSPtr callback = Test::newCallback_MyClass_opBoolSS(cb, &Callback::opBoolSS, &Callback::exCB); p->begin_opBoolSS(bsi1, bsi2, callback); +#endif cb->check(); } @@ -1329,10 +1530,19 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) lsi[0].push_back(1729); CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opShortIntLongSS_async(ssi, isi, lsi, + [&](Test::LongSS lsi1, Test::ShortSS ssi1, Test::IntSS isi1, Test::LongSS lsi2) + { + cb->opShortIntLongSS(move(lsi1), move(ssi1), move(isi1), move(lsi2)); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyClass_opShortIntLongSSPtr callback = Test::newCallback_MyClass_opShortIntLongSS(cb, &Callback::opShortIntLongSS, &Callback::exCB); p->begin_opShortIntLongSS(ssi, isi, lsi, callback); +#endif cb->check(); } @@ -1350,9 +1560,18 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) dsi[0].push_back(Ice::Double(1.3E10)); CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opFloatDoubleSS_async(fsi, dsi, + [&](Test::DoubleSS dsi1, Test::FloatSS fsi1, Test::DoubleSS dsi2) + { + cb->opFloatDoubleSS(move(dsi1), move(fsi1), move(dsi2)); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyClass_opFloatDoubleSSPtr callback = Test::newCallback_MyClass_opFloatDoubleSS(cb, &Callback::opFloatDoubleSS, &Callback::exCB); p->begin_opFloatDoubleSS(fsi, dsi, callback); +#endif cb->check(); } @@ -1369,9 +1588,18 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) ssi2[2].push_back("xyz"); CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opStringSS_async(ssi1, ssi2, + [&](Test::StringSS ssi3, Test::StringSS ssi4) + { + cb->opStringSS(move(ssi3), move(ssi4)); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyClass_opStringSSPtr callback = Test::newCallback_MyClass_opStringSS(cb, &Callback::opStringSS, &Callback::exCB); p->begin_opStringSS(ssi1, ssi2, callback); +#endif cb->check(); } @@ -1385,9 +1613,18 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) di2[101] = true; CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opByteBoolD_async(di1, di2, + [&](Test::ByteBoolD di3, Test::ByteBoolD di4) + { + cb->opByteBoolD(move(di3), move(di4)); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyClass_opByteBoolDPtr callback = Test::newCallback_MyClass_opByteBoolD(cb, &Callback::opByteBoolD, &Callback::exCB); p->begin_opByteBoolD(di1, di2, callback); +#endif cb->check(); } @@ -1401,9 +1638,18 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) di2[1101] = 0; CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opShortIntD_async(di1, di2, + [&](Test::ShortIntD di3, Test::ShortIntD di4) + { + cb->opShortIntD(move(di3), move(di4)); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyClass_opShortIntDPtr callback = Test::newCallback_MyClass_opShortIntD(cb, &Callback::opShortIntD, &Callback::exCB); p->begin_opShortIntD(di1, di2, callback); +#endif cb->check(); } @@ -1417,9 +1663,18 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) di2[999999130] = Ice::Float(0.5); CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opLongFloatD_async(di1, di2, + [&](Test::LongFloatD di3, Test::LongFloatD di4) + { + cb->opLongFloatD(move(di3), move(di4)); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyClass_opLongFloatDPtr callback = Test::newCallback_MyClass_opLongFloatD(cb, &Callback::opLongFloatD, &Callback::exCB); p->begin_opLongFloatD(di1, di2, callback); +#endif cb->check(); } @@ -1433,25 +1688,43 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) di2["BAR"] = "abc 0.5"; CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opStringStringD_async(di1, di2, + [&](Test::StringStringD di3, Test::StringStringD di4) + { + cb->opStringStringD(move(di3), move(di4)); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyClass_opStringStringDPtr callback = Test::newCallback_MyClass_opStringStringD(cb, &Callback::opStringStringD, &Callback::exCB); p->begin_opStringStringD(di1, di2, callback); +#endif cb->check(); } { Test::StringMyEnumD di1; - di1["abc"] = Test::enum1; - di1[""] = Test::enum2; + di1["abc"] = ICE_ENUM(Test::MyEnum, enum1); + di1[""] = ICE_ENUM(Test::MyEnum, enum2); Test::StringMyEnumD di2; - di2["abc"] = Test::enum1; - di2["qwerty"] = Test::enum3; - di2["Hello!!"] = Test::enum2; + di2["abc"] = ICE_ENUM(Test::MyEnum, enum1); + di2["qwerty"] = ICE_ENUM(Test::MyEnum, enum3); + di2["Hello!!"] = ICE_ENUM(Test::MyEnum, enum2); CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opStringMyEnumD_async(di1, di2, + [&](Test::StringMyEnumD di3, Test::StringMyEnumD di4) + { + cb->opStringMyEnumD(move(di3), move(di4)); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyClass_opStringMyEnumDPtr callback = Test::newCallback_MyClass_opStringMyEnumD(cb, &Callback::opStringMyEnumD, &Callback::exCB); p->begin_opStringMyEnumD(di1, di2, callback); +#endif cb->check(); } @@ -1459,20 +1732,29 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) Test::MyStruct s11 = { 1, 1 }; Test::MyStruct s12 = { 1, 2 }; Test::MyStructMyEnumD di1; - di1[s11] = Test::enum1; - di1[s12] = Test::enum2; + di1[s11] = ICE_ENUM(Test::MyEnum, enum1); + di1[s12] = ICE_ENUM(Test::MyEnum, enum2); Test::MyStruct s22 = { 2, 2 }; Test::MyStruct s23 = { 2, 3 }; Test::MyStructMyEnumD di2; - di2[s11] = Test::enum1; - di2[s22] = Test::enum3; - di2[s23] = Test::enum2; + di2[s11] = ICE_ENUM(Test::MyEnum, enum1); + di2[s22] = ICE_ENUM(Test::MyEnum, enum3); + di2[s23] = ICE_ENUM(Test::MyEnum, enum2); CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opMyStructMyEnumD_async(di1, di2, + [&](Test::MyStructMyEnumD di3, Test::MyStructMyEnumD di4) + { + cb->opMyStructMyEnumD(move(di3), move(di4)); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyClass_opMyStructMyEnumDPtr callback = Test::newCallback_MyClass_opMyStructMyEnumD(cb, &Callback::opMyStructMyEnumD, &Callback::exCB); p->begin_opMyStructMyEnumD(di1, di2, callback); +#endif cb->check(); } @@ -1498,9 +1780,18 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) dsi2[0] = di3; CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opByteBoolDS_async(dsi1, dsi2, + [&](Test::ByteBoolDS dsi3, Test::ByteBoolDS dsi4) + { + cb->opByteBoolDS(move(dsi3), move(dsi4)); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyClass_opByteBoolDSPtr callback = Test::newCallback_MyClass_opByteBoolDS(cb, &Callback::opByteBoolDS, &Callback::exCB); p->begin_opByteBoolDS(dsi1, dsi2, callback); +#endif cb->check(); } @@ -1525,9 +1816,18 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) dsi2[0] = di3; CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opShortIntDS_async(dsi1, dsi2, + [&](Test::ShortIntDS dsi3, Test::ShortIntDS dsi4) + { + cb->opShortIntDS(move(dsi3), move(dsi4)); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyClass_opShortIntDSPtr callback = Test::newCallback_MyClass_opShortIntDS(cb, &Callback::opShortIntDS, &Callback::exCB); p->begin_opShortIntDS(dsi1, dsi2, callback); +#endif cb->check(); } @@ -1552,9 +1852,18 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) dsi2[0] = di3; CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opLongFloatDS_async(dsi1, dsi2, + [&](Test::LongFloatDS dsi3, Test::LongFloatDS dsi4) + { + cb->opLongFloatDS(move(dsi3), move(dsi4)); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyClass_opLongFloatDSPtr callback = Test::newCallback_MyClass_opLongFloatDS(cb, &Callback::opLongFloatDS, &Callback::exCB); p->begin_opLongFloatDS(dsi1, dsi2, callback); +#endif cb->check(); } @@ -1579,9 +1888,19 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) dsi2[0] = di3; CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opStringStringDS_async(dsi1, dsi2, + [&](Test::StringStringDS dsi3, Test::StringStringDS dsi4) + { + cb->opStringStringDS(move(dsi3), move(dsi4)); + }, + makeExceptionClosure(cb)); + +#else Test::Callback_MyClass_opStringStringDSPtr callback = Test::newCallback_MyClass_opStringStringDS(cb, &Callback::opStringStringDS, &Callback::exCB); p->begin_opStringStringDS(dsi1, dsi2, callback); +#endif cb->check(); } @@ -1592,23 +1911,32 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) dsi2.resize(1); Test::StringMyEnumD di1; - di1["abc"] = Test::enum1; - di1[""] = Test::enum2; + di1["abc"] = ICE_ENUM(Test::MyEnum, enum1); + di1[""] = ICE_ENUM(Test::MyEnum, enum2); Test::StringMyEnumD di2; - di2["abc"] = Test::enum1; - di2["qwerty"] = Test::enum3; - di2["Hello!!"] = Test::enum2; + di2["abc"] = ICE_ENUM(Test::MyEnum, enum1); + di2["qwerty"] = ICE_ENUM(Test::MyEnum, enum3); + di2["Hello!!"] = ICE_ENUM(Test::MyEnum, enum2); Test::StringMyEnumD di3; - di3["Goodbye"] = Test::enum1; + di3["Goodbye"] = ICE_ENUM(Test::MyEnum, enum1); dsi1[0] = di1; dsi1[1] = di2; dsi2[0] = di3; CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opStringMyEnumDS_async(dsi1, dsi2, + [&](Test::StringMyEnumDS dsi3, Test::StringMyEnumDS dsi4) + { + cb->opStringMyEnumDS(move(dsi3), move(dsi4)); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyClass_opStringMyEnumDSPtr callback = Test::newCallback_MyClass_opStringMyEnumDS(cb, &Callback::opStringMyEnumDS, &Callback::exCB); p->begin_opStringMyEnumDS(dsi1, dsi2, callback); +#endif cb->check(); } @@ -1619,21 +1947,30 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) dsi2.resize(1); Test::MyEnumStringD di1; - di1[Test::enum1] = "abc"; + di1[ICE_ENUM(Test::MyEnum, enum1)] = "abc"; Test::MyEnumStringD di2; - di2[Test::enum2] = "Hello!!"; - di2[Test::enum3] = "qwerty"; + di2[ICE_ENUM(Test::MyEnum, enum2)] = "Hello!!"; + di2[ICE_ENUM(Test::MyEnum, enum3)] = "qwerty"; Test::MyEnumStringD di3; - di3[Test::enum1] = "Goodbye"; + di3[ICE_ENUM(Test::MyEnum, enum1)] = "Goodbye"; dsi1[0] = di1; dsi1[1] = di2; dsi2[0] = di3; CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opMyEnumStringDS_async(dsi1, dsi2, + [&](Test::MyEnumStringDS dsi3, Test::MyEnumStringDS dsi4) + { + cb->opMyEnumStringDS(move(dsi3), move(dsi4)); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyClass_opMyEnumStringDSPtr callback = Test::newCallback_MyClass_opMyEnumStringDS(cb, &Callback::opMyEnumStringDS, &Callback::exCB); p->begin_opMyEnumStringDS(dsi1, dsi2, callback); +#endif cb->check(); } @@ -1646,27 +1983,36 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) Test::MyStruct s11 = { 1, 1 }; Test::MyStruct s12 = { 1, 2 }; Test::MyStructMyEnumD di1; - di1[s11] = Test::enum1; - di1[s12] = Test::enum2; + di1[s11] = ICE_ENUM(Test::MyEnum, enum1); + di1[s12] = ICE_ENUM(Test::MyEnum, enum2); Test::MyStruct s22 = { 2, 2 }; Test::MyStruct s23 = { 2, 3 }; Test::MyStructMyEnumD di2; - di2[s11] = Test::enum1; - di2[s22] = Test::enum3; - di2[s23] = Test::enum2; + di2[s11] = ICE_ENUM(Test::MyEnum, enum1); + di2[s22] = ICE_ENUM(Test::MyEnum, enum3); + di2[s23] = ICE_ENUM(Test::MyEnum, enum2); Test::MyStructMyEnumD di3; - di3[s23] = Test::enum3; + di3[s23] = ICE_ENUM(Test::MyEnum, enum3); dsi1[0] = di1; dsi1[1] = di2; dsi2[0] = di3; CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opMyStructMyEnumDS_async(dsi1, dsi2, + [&](Test::MyStructMyEnumDS dsi3, MyStructMyEnumDS dsi4) + { + cb->opMyStructMyEnumDS(move(dsi3), move(dsi4)); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyClass_opMyStructMyEnumDSPtr callback = Test::newCallback_MyClass_opMyStructMyEnumDS(cb, &Callback::opMyStructMyEnumDS, &Callback::exCB); p->begin_opMyStructMyEnumDS(dsi1, dsi2, callback); +#endif cb->check(); } @@ -1689,9 +2035,18 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) sdi2[Ice::Byte(0xf1)] = si3; CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opByteByteSD_async(sdi1, sdi2, + [&](Test::ByteByteSD sdi3, Test::ByteByteSD sdi4) + { + cb->opByteByteSD(move(sdi3), move(sdi4)); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyClass_opByteByteSDPtr callback = Test::newCallback_MyClass_opByteByteSD(cb, &Callback::opByteByteSD, &Callback::exCB); p->begin_opByteByteSD(sdi1, sdi2, callback); +#endif cb->check(); } @@ -1713,9 +2068,18 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) sdi2[false] = si1; CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opBoolBoolSD_async(sdi1, sdi2, + [&](Test::BoolBoolSD sdi3, Test::BoolBoolSD sdi4) + { + cb->opBoolBoolSD(move(sdi3), move(sdi4)); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyClass_opBoolBoolSDPtr callback = Test::newCallback_MyClass_opBoolBoolSD(cb, &Callback::opBoolBoolSD, &Callback::exCB); p->begin_opBoolBoolSD(sdi1, sdi2, callback); +#endif cb->check(); } @@ -1740,9 +2104,18 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) sdi2[4] = si3; CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opShortShortSD_async(sdi1, sdi2, + [&](Test::ShortShortSD sdi3, Test::ShortShortSD sdi4) + { + cb->opShortShortSD(move(sdi3), move(sdi4)); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyClass_opShortShortSDPtr callback = Test::newCallback_MyClass_opShortShortSD(cb, &Callback::opShortShortSD, &Callback::exCB); p->begin_opShortShortSD(sdi1, sdi2, callback); +#endif cb->check(); } @@ -1767,9 +2140,18 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) sdi2[400] = si3; CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opIntIntSD_async(sdi1, sdi2, + [&](Test::IntIntSD sdi3, Test::IntIntSD sdi4) + { + cb->opIntIntSD(move(sdi3), move(sdi4)); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyClass_opIntIntSDPtr callback = Test::newCallback_MyClass_opIntIntSD(cb, &Callback::opIntIntSD, &Callback::exCB); p->begin_opIntIntSD(sdi1, sdi2, callback); +#endif cb->check(); } @@ -1794,9 +2176,18 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) sdi2[999999992] = si3; CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opLongLongSD_async(sdi1, sdi2, + [&](Test::LongLongSD sdi3, Test::LongLongSD sdi4) + { + cb->opLongLongSD(move(sdi3), move(sdi4)); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyClass_opLongLongSDPtr callback = Test::newCallback_MyClass_opLongLongSD(cb, &Callback::opLongLongSD, &Callback::exCB); p->begin_opLongLongSD(sdi1, sdi2, callback); +#endif cb->check(); } @@ -1821,9 +2212,18 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) sdi2["aBc"] = si3; CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opStringFloatSD_async(sdi1, sdi2, + [&](Test::StringFloatSD sdi3, Test::StringFloatSD sdi4) + { + cb->opStringFloatSD(move(sdi3), move(sdi4)); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyClass_opStringFloatSDPtr callback = Test::newCallback_MyClass_opStringFloatSD(cb, &Callback::opStringFloatSD, &Callback::exCB); p->begin_opStringFloatSD(sdi1, sdi2, callback); +#endif cb->check(); } @@ -1848,9 +2248,18 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) sdi2[""] = si3; CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opStringDoubleSD_async(sdi1, sdi2, + [&](Test::StringDoubleSD sdi3, Test::StringDoubleSD sdi4) + { + cb->opStringDoubleSD(move(sdi3), move(sdi4)); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyClass_opStringDoubleSDPtr callback = Test::newCallback_MyClass_opStringDoubleSD(cb, &Callback::opStringDoubleSD, &Callback::exCB); p->begin_opStringDoubleSD(sdi1, sdi2, callback); +#endif cb->check(); } @@ -1877,9 +2286,18 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) sdi2["ghi"] = si3; CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opStringStringSD_async(sdi1, sdi2, + [&](Test::StringStringSD sdi3, Test::StringStringSD sdi4) + { + cb->opStringStringSD(move(sdi3), move(sdi4)); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyClass_opStringStringSDPtr callback = Test::newCallback_MyClass_opStringStringSD(cb, &Callback::opStringStringSD, &Callback::exCB); p->begin_opStringStringSD(sdi1, sdi2, callback); +#endif cb->check(); } @@ -1891,22 +2309,31 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) Test::MyEnumS si2; Test::MyEnumS si3; - si1.push_back(Test::enum1); - si1.push_back(Test::enum1); - si1.push_back(Test::enum2); - si2.push_back(Test::enum1); - si2.push_back(Test::enum2); - si3.push_back(Test::enum3); - si3.push_back(Test::enum3); + si1.push_back(ICE_ENUM(Test::MyEnum, enum1)); + si1.push_back(ICE_ENUM(Test::MyEnum, enum1)); + si1.push_back(ICE_ENUM(Test::MyEnum, enum2)); + si2.push_back(ICE_ENUM(Test::MyEnum, enum1)); + si2.push_back(ICE_ENUM(Test::MyEnum, enum2)); + si3.push_back(ICE_ENUM(Test::MyEnum, enum3)); + si3.push_back(ICE_ENUM(Test::MyEnum, enum3)); - sdi1[Test::enum3] = si1; - sdi1[Test::enum2] = si2; - sdi2[Test::enum1] = si3; + sdi1[ICE_ENUM(Test::MyEnum, enum3)] = si1; + sdi1[ICE_ENUM(Test::MyEnum, enum2)] = si2; + sdi2[ICE_ENUM(Test::MyEnum, enum1)] = si3; CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opMyEnumMyEnumSD_async(sdi1, sdi2, + [&](Test::MyEnumMyEnumSD sdi3, Test::MyEnumMyEnumSD sdi4) + { + cb->opMyEnumMyEnumSD(move(sdi3), move(sdi4)); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyClass_opMyEnumMyEnumSDPtr callback = Test::newCallback_MyClass_opMyEnumMyEnumSD(cb, &Callback::opMyEnumMyEnumSD, &Callback::exCB); p->begin_opMyEnumMyEnumSD(sdi1, sdi2, callback); +#endif cb->check(); } @@ -1921,9 +2348,18 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) s.push_back(i); } CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opIntS_async(s, + [&](Test::IntS s1) + { + cb->opIntS(s1); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyClass_opIntSPtr callback = Test::newCallback_MyClass_opIntS(cb, &Callback::opIntS, &Callback::exCB); p->begin_opIntS(s, callback); +#endif cb->check(); } } @@ -1935,28 +2371,88 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) ctx["three"] = "THREE"; { test(p->ice_getContext().empty()); +#ifdef ICE_CPP11_MAPPING + promise<void> prom; + p->opContext_async( + [&](Ice::Context c) + { + test(c != ctx); + prom.set_value(); + }, + [](exception_ptr) + { + test(false); + }); + prom.get_future().get(); +#else Ice::AsyncResultPtr r = p->begin_opContext(); Ice::Context c = p->end_opContext(r); test(c != ctx); +#endif } { test(p->ice_getContext().empty()); +#ifdef ICE_CPP11_MAPPING + promise<void> prom; + p->opContext_async( + [&](Ice::Context c) + { + test(c == ctx); + prom.set_value(); + }, + [](exception_ptr) + { + test(false); + }, nullptr, ctx); + prom.get_future().get(); +#else Ice::AsyncResultPtr r = p->begin_opContext(ctx); Ice::Context c = p->end_opContext(r); test(c == ctx); +#endif } - Test::MyClassPrx p2 = Test::MyClassPrx::checkedCast(p->ice_context(ctx)); + Test::MyClassPrxPtr p2 = ICE_CHECKED_CAST(Test::MyClassPrx, p->ice_context(ctx)); test(p2->ice_getContext() == ctx); { +#ifdef ICE_CPP11_MAPPING + promise<void> prom; + p2->opContext_async( + [&](Ice::Context c) + { + test(c == ctx); + prom.set_value(); + }, + [](exception_ptr) + { + test(false); + }); + prom.get_future().get(); +#else Ice::AsyncResultPtr r = p2->begin_opContext(); Ice::Context c = p2->end_opContext(r); test(c == ctx); +#endif } { - Test::MyClassPrx p2 = Test::MyClassPrx::checkedCast(p->ice_context(ctx)); + Test::MyClassPrxPtr p2 = ICE_CHECKED_CAST(Test::MyClassPrx, p->ice_context(ctx)); +#ifdef ICE_CPP11_MAPPING + promise<void> prom; + p2->opContext_async( + [&](Ice::Context c) + { + test(c == ctx); + prom.set_value(); + }, + [](exception_ptr) + { + test(false); + }, nullptr, ctx); + prom.get_future().get(); +#else Ice::AsyncResultPtr r = p2->begin_opContext(ctx); Ice::Context c = p2->end_opContext(r); test(c == ctx); +#endif } #ifndef ICE_OS_WINRT @@ -1981,25 +2477,60 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) ctx["three"] = "THREE"; - Test::MyClassPrx p = Test::MyClassPrx::uncheckedCast( - ic->stringToProxy("test:default -p 12010")); - - + Test::MyClassPrxPtr p = ICE_UNCHECKED_CAST(Test::MyClassPrx, ic->stringToProxy("test:default -p 12010")); ic->getImplicitContext()->setContext(ctx); test(ic->getImplicitContext()->getContext() == ctx); { +#ifdef ICE_CPP11_MAPPING + promise<void> prom; + p->opContext_async( + [&](Ice::Context c) + { + test(c == ctx); + prom.set_value(); + }, + [](exception_ptr) + { + test(false); + }); + prom.get_future().get(); +#else Ice::AsyncResultPtr r = p->begin_opContext(); Ice::Context c = p->end_opContext(r); test(c == ctx); +#endif } ic->getImplicitContext()->put("zero", "ZERO"); ctx = ic->getImplicitContext()->getContext(); { +#ifdef ICE_CPP11_MAPPING + promise<void> prom; + p->opContext_async( + [&](Ice::Context c) + { + test(c == ctx); + prom.set_value(); + }, + [](exception_ptr ex) + { + try + { + rethrow_exception(ex); + } + catch(const Ice::Exception& e) + { + cerr << e << endl; + } + test(false); + }); + prom.get_future().get(); +#else Ice::AsyncResultPtr r = p->begin_opContext(); Ice::Context c = p->end_opContext(r); test(c == ctx); +#endif } Ice::Context prxContext; @@ -2010,20 +2541,50 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) combined.insert(ctx.begin(), ctx.end()); test(combined["one"] == "UN"); - p = Test::MyClassPrx::uncheckedCast(p->ice_context(prxContext)); + p = ICE_UNCHECKED_CAST(Test::MyClassPrx, p->ice_context(prxContext)); ic->getImplicitContext()->setContext(Ice::Context()); { +#ifdef ICE_CPP11_MAPPING + promise<void> prom; + p->opContext_async( + [&](Ice::Context c) + { + test(c == prxContext); + prom.set_value(); + }, + [](exception_ptr) + { + test(false); + }); + prom.get_future().get(); +#else Ice::AsyncResultPtr r = p->begin_opContext(); Ice::Context c = p->end_opContext(r); test(c == prxContext); +#endif } ic->getImplicitContext()->setContext(ctx); { +#ifdef ICE_CPP11_MAPPING + promise<void> prom; + p->opContext_async( + [&](Ice::Context c) + { + test(c == combined); + prom.set_value(); + }, + [](exception_ptr) + { + test(false); + }); + prom.get_future().get(); +#else Ice::AsyncResultPtr r = p->begin_opContext(); Ice::Context c = p->end_opContext(r); test(c == combined); +#endif } ic->getImplicitContext()->setContext(Ice::Context()); @@ -2037,146 +2598,401 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) Ice::Double d = 1278312346.0 / 13.0; Test::DoubleS ds(5, d); CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opDoubleMarshaling_async(d, ds, + [&]() + { + cb->opDoubleMarshaling(); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyClass_opDoubleMarshalingPtr callback = Test::newCallback_MyClass_opDoubleMarshaling(cb, &Callback::opDoubleMarshaling, &Callback::exCB); p->begin_opDoubleMarshaling(d, ds, callback); +#endif cb->check(); } { CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opIdempotent_async( + [&]() + { + cb->opIdempotent(); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyClass_opIdempotentPtr callback = Test::newCallback_MyClass_opIdempotent(cb, &Callback::opIdempotent, &Callback::exCB); p->begin_opIdempotent(callback); +#endif cb->check(); } { CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + p->opNonmutating_async( + [&]() + { + cb->opNonmutating(); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyClass_opNonmutatingPtr callback = Test::newCallback_MyClass_opNonmutating(cb, &Callback::opNonmutating, &Callback::exCB); p->begin_opNonmutating(callback); +#endif cb->check(); } { - Test::MyDerivedClassPrx derived = Test::MyDerivedClassPrx::checkedCast(p); + Test::MyDerivedClassPrxPtr derived = ICE_CHECKED_CAST(Test::MyDerivedClassPrx, p); test(derived); CallbackPtr cb = new Callback; +#ifdef ICE_CPP11_MAPPING + derived->opDerived_async( + [&]() + { + cb->opDerived(); + }, + makeExceptionClosure(cb)); +#else Test::Callback_MyDerivedClass_opDerivedPtr callback = Test::newCallback_MyDerivedClass_opDerived(cb, &Callback::opDerived, &Callback::exCB); derived->begin_opDerived(callback); +#endif cb->check(); } -#ifdef ICE_CPP11 +#ifdef ICE_CPP11_COMPILER { CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = p->ice_ping_async(); + try + { + f.get(); + cb->ping(); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(const std::exception& ex) + { + cerr << ex.what() << endl; + test(false); + } +# else p->begin_ice_ping([=](){ cb->ping(); }, [=](const Ice::Exception& ex){ cb->exCB(ex); }); +# endif cb->check(); } { CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = p->ice_isA_async(Test::MyClass::ice_staticId()); + try + { + cb->isA(f.get()); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else p->begin_ice_isA(Test::MyClass::ice_staticId(), [=](bool isA){ cb->isA(isA); }, [=](const Ice::Exception& ex){ cb->exCB(ex); }); +# endif cb->check(); } { CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = p->ice_id_async(); + try + { + cb->id(f.get()); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else p->begin_ice_id([=](const string& id){ cb->id(id); }, [=](const Ice::Exception& ex){ cb->exCB(ex); }); +# endif cb->check(); } { CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = p->ice_ids_async(); + try + { + cb->ids(f.get()); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else p->begin_ice_ids([=](const Ice::StringSeq& ids){ cb->ids(ids); }, [=](const Ice::Exception& ex){ cb->exCB(ex); }); +# endif cb->check(); } { CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = p->opVoid_async(); + try + { + f.get(); + cb->opVoid(); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else p->begin_opVoid([=](){ cb->opVoid(); }, [=](const Ice::Exception& ex){ cb->exCB(ex); }); +# endif cb->check(); } { CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = p->opByte_async(Ice::Byte(0xff), Ice::Byte(0x0f)); + try + { + auto r = f.get(); + cb->opByte(r.returnValue, r.p3); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else p->begin_opByte(Ice::Byte(0xff), Ice::Byte(0x0f), [=](const Ice::Byte& p1, const Ice::Byte& p2){ cb->opByte(p1, p2); }, [=](const Ice::Exception& ex){ cb->exCB(ex); }); +# endif cb->check(); } { CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = p->opBool_async(true, false); + try + { + auto r = f.get(); + cb->opBool(r.returnValue, r.p3); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else Test::Callback_MyClass_opBoolPtr callback = Test::newCallback_MyClass_opBool(cb, &Callback::opBool, &Callback::exCB); p->begin_opBool(true, false, [=](bool p1, bool p2){ cb->opBool(p1, p2); }, [=](const Ice::Exception& ex){ cb->exCB(ex); }); +# endif cb->check(); } { CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = p->opShortIntLong_async(10, 11, 12); + try + { + auto r = f.get(); + cb->opShortIntLong(r.returnValue, r.p4, r.p5, r.p6); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else p->begin_opShortIntLong(10, 11, 12, [=](Ice::Long p1, Ice::Short p2, Ice::Int p3, Ice::Long p4){ cb->opShortIntLong(p1, p2, p3, p4); }, [=](const Ice::Exception& ex){ cb->exCB(ex); }); +# endif cb->check(); } { CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = p->opFloatDouble_async(3.14f, 1.1E10); + try + { + auto r = f.get(); + cb->opFloatDouble(r.returnValue, r.p3, r.p4); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else p->begin_opFloatDouble(Ice::Float(3.14), Ice::Double(1.1E10), [=](Ice::Double p1, Ice::Float p2, Ice::Double p3){ cb->opFloatDouble(p1, p2, p3); }, [=](const Ice::Exception& ex){ cb->exCB(ex); }); +# endif cb->check(); } { CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = p->opString_async("hello", "world"); + try + { + auto r = f.get(); + cb->opString(r.returnValue, r.p3); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else p->begin_opString("hello", "world", [=](const string& p1, const string& p2){ cb->opString(p1, p2); }, [=](const Ice::Exception& ex){ cb->exCB(ex); }); +# endif cb->check(); } { CallbackPtr cb = new Callback; - p->begin_opMyEnum(Test::enum2, +# ifdef ICE_CPP11_MAPPING + auto f = p->opMyEnum_async(Test::MyEnum::enum2); + try + { + auto r = f.get(); + cb->opMyEnum(r.returnValue, r.p2); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else + p->begin_opMyEnum(ICE_ENUM(Test::MyEnum, enum2), [=](Test::MyEnum p1, Test::MyEnum p2){ cb->opMyEnum(p1, p2); }, [=](const Ice::Exception& ex){ cb->exCB(ex); }); +# endif cb->check(); } { CallbackPtr cb = new Callback(communicator); +# ifdef ICE_CPP11_MAPPING + auto f = p->opMyClass_async(p); + try + { + auto r = f.get(); + cb->opMyClass(r.returnValue, r.p2, r.p3); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else p->begin_opMyClass(p, [=](const Test::MyClassPrx& p1, const Test::MyClassPrx p2, const Test::MyClassPrx p3) { cb->opMyClass(p1, p2, p3); }, [=](const Ice::Exception& ex){ cb->exCB(ex); }); +# endif cb->check(); } { Test::Structure si1; si1.p = p; - si1.e = Test::enum3; + si1.e = ICE_ENUM(Test::MyEnum, enum3); si1.s.s = "abc"; Test::Structure si2; si2.p = 0; - si2.e = Test::enum2; + si2.e = ICE_ENUM(Test::MyEnum, enum2); si2.s.s = "def"; CallbackPtr cb = new Callback(communicator); +# ifdef ICE_CPP11_MAPPING + auto f = p->opStruct_async(si1, si2); + try + { + auto r = f.get(); + cb->opStruct(r.returnValue, r.p3); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else p->begin_opStruct(si1, si2, [=](const Test::Structure& p1, const Test::Structure& p2) { cb->opStruct(p1, p2); }, [=](const Ice::Exception& ex){ cb->exCB(ex); }); +#endif cb->check(); } @@ -2195,6 +3011,22 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) bsi2.push_back(Ice::Byte(0xf4)); CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = p->opByteS_async(bsi1, bsi2); + try + { + auto r = f.get(); + cb->opByteS(r.returnValue, r.p3); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else Test::Callback_MyClass_opByteSPtr callback = Test::newCallback_MyClass_opByteS(cb, &Callback::opByteS, &Callback::exCB); @@ -2204,6 +3036,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) cb->opByteS(p1, p2); }, [=](const Ice::Exception& ex){ cb->exCB(ex); }); +# endif cb->check(); } @@ -2218,12 +3051,29 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) bsi2.push_back(false); CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = p->opBoolS_async(bsi1, bsi2); + try + { + auto r = f.get(); + cb->opBoolS(r.returnValue, r.p3); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else p->begin_opBoolS(bsi1, bsi2, [=](const Test::BoolS& p1, const Test::BoolS& p2) { cb->opBoolS(p1, p2); }, [=](const Ice::Exception& ex){ cb->exCB(ex); }); +# endif cb->check(); } @@ -2246,12 +3096,29 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) lsi.push_back(20); CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = p->opShortIntLongS_async(ssi, isi, lsi); + try + { + auto r = f.get(); + cb->opShortIntLongS(r.returnValue, r.p4, r.p5, r.p6); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else p->begin_opShortIntLongS(ssi, isi, lsi, [=](const Test::LongS& p1, const Test::ShortS& p2, const Test::IntS& p3, const Test::LongS& p4) { cb->opShortIntLongS(p1, p2, p3, p4); }, [=](const Ice::Exception& ex){ cb->exCB(ex); }); +# endif cb->check(); } @@ -2267,12 +3134,29 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) dsi.push_back(Ice::Double(1.3E10)); CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = p->opFloatDoubleS_async(fsi, dsi); + try + { + auto r = f.get(); + cb->opFloatDoubleS(r.returnValue, r.p3, r.p4); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else p->begin_opFloatDoubleS(fsi, dsi, [=](const Test::DoubleS& p1, const Test::FloatS& p2, const Test::DoubleS& p3) { cb->opFloatDoubleS(p1, p2, p3); }, [=](const Ice::Exception& ex){ cb->exCB(ex); }); +# endif cb->check(); } @@ -2287,12 +3171,29 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) ssi2.push_back("xyz"); CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = p->opStringS_async(ssi1, ssi2); + try + { + auto r = f.get(); + cb->opStringS(r.returnValue, r.p3); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else p->begin_opStringS(ssi1, ssi2, [=](const Test::StringS& p1, const Test::StringS& p2) { cb->opStringS(p1, p2); }, [=](const Ice::Exception& ex){ cb->exCB(ex); }); +# endif cb->check(); } @@ -2312,12 +3213,29 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) bsi2[1].push_back(Ice::Byte(0xf1)); CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = p->opByteSS_async(bsi1, bsi2); + try + { + auto r = f.get(); + cb->opByteSS(r.returnValue, r.p3); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else p->begin_opByteSS(bsi1, bsi2, [=](const Test::ByteSS& p1, const Test::ByteSS& p2) { cb->opByteSS(p1, p2); }, [=](const Ice::Exception& ex){ cb->exCB(ex); }); +# endif cb->check(); } @@ -2335,12 +3253,29 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) dsi[0].push_back(Ice::Double(1.3E10)); CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = p->opFloatDoubleSS_async(fsi, dsi); + try + { + auto r = f.get(); + cb->opFloatDoubleSS(r.returnValue, r.p3, r.p4); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else p->begin_opFloatDoubleSS(fsi, dsi, [=](const Test::DoubleSS& p1, const Test::FloatSS& p2, const Test::DoubleSS& p3) { cb->opFloatDoubleSS(p1, p2, p3); }, [=](const Ice::Exception& ex){ cb->exCB(ex); }); +# endif cb->check(); } @@ -2357,12 +3292,29 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) ssi2[2].push_back("xyz"); CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = p->opStringSS_async(ssi1, ssi2); + try + { + auto r = f.get(); + cb->opStringSS(r.returnValue, r.p3); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else p->begin_opStringSS(ssi1, ssi2, [=](const Test::StringSS& p1, const Test::StringSS& p2) { cb->opStringSS(p1, p2); }, [=](const Ice::Exception& ex){ cb->exCB(ex); }); +# endif cb->check(); } @@ -2376,6 +3328,22 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) di2[101] = true; CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = p->opByteBoolD_async(di1, di2); + try + { + auto r = f.get(); + cb->opByteBoolD(r.returnValue, r.p3); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else p->begin_opByteBoolD(di1, di2, [=](const Test::ByteBoolD& p1, const Test::ByteBoolD& p2) { @@ -2385,6 +3353,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) { cb->exCB(ex); }); +# endif cb->check(); } @@ -2398,6 +3367,22 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) di2[1101] = 0; CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = p->opShortIntD_async(di1, di2); + try + { + auto r = f.get(); + cb->opShortIntD(r.returnValue, r.p3); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else p->begin_opShortIntD(di1, di2, [=](const Test::ShortIntD& p1, const Test::ShortIntD& p2) { @@ -2407,6 +3392,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) { cb->exCB(ex); }); +# endif cb->check(); } @@ -2420,6 +3406,22 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) di2[999999130] = Ice::Float(0.5); CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = p->opLongFloatD_async(di1, di2); + try + { + auto r = f.get(); + cb->opLongFloatD(r.returnValue, r.p3); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else p->begin_opLongFloatD(di1, di2, [=](const Test::LongFloatD& p1, const Test::LongFloatD& p2) { @@ -2429,6 +3431,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) { cb->exCB(ex); }); +# endif cb->check(); } @@ -2442,6 +3445,22 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) di2["BAR"] = "abc 0.5"; CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = p->opStringStringD_async(di1, di2); + try + { + auto r = f.get(); + cb->opStringStringD(r.returnValue, r.p3); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else p->begin_opStringStringD(di1, di2, [=](const Test::StringStringD& p1, const Test::StringStringD& p2) { @@ -2451,19 +3470,36 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) { cb->exCB(ex); }); +# endif cb->check(); } { Test::StringMyEnumD di1; - di1["abc"] = Test::enum1; - di1[""] = Test::enum2; + di1["abc"] = ICE_ENUM(Test::MyEnum, enum1); + di1[""] = ICE_ENUM(Test::MyEnum, enum2); Test::StringMyEnumD di2; - di2["abc"] = Test::enum1; - di2["qwerty"] = Test::enum3; - di2["Hello!!"] = Test::enum2; + di2["abc"] = ICE_ENUM(Test::MyEnum, enum1); + di2["qwerty"] = ICE_ENUM(Test::MyEnum, enum3); + di2["Hello!!"] = ICE_ENUM(Test::MyEnum, enum2); CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = p->opStringMyEnumD_async(di1, di2); + try + { + auto r = f.get(); + cb->opStringMyEnumD(r.returnValue, r.p3); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else p->begin_opStringMyEnumD(di1, di2, [=](const Test::StringMyEnumD& p1, const Test::StringMyEnumD& p2) { @@ -2473,6 +3509,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) { cb->exCB(ex); }); +# endif cb->check(); } @@ -2480,17 +3517,33 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) Test::MyStruct s11 = { 1, 1 }; Test::MyStruct s12 = { 1, 2 }; Test::MyStructMyEnumD di1; - di1[s11] = Test::enum1; - di1[s12] = Test::enum2; + di1[s11] = ICE_ENUM(Test::MyEnum, enum1); + di1[s12] = ICE_ENUM(Test::MyEnum, enum2); Test::MyStruct s22 = { 2, 2 }; Test::MyStruct s23 = { 2, 3 }; Test::MyStructMyEnumD di2; - di2[s11] = Test::enum1; - di2[s22] = Test::enum3; - di2[s23] = Test::enum2; + di2[s11] = ICE_ENUM(Test::MyEnum, enum1); + di2[s22] = ICE_ENUM(Test::MyEnum, enum3); + di2[s23] = ICE_ENUM(Test::MyEnum, enum2); CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = p->opMyStructMyEnumD_async(di1, di2); + try + { + auto r = f.get(); + cb->opMyStructMyEnumD(r.returnValue, r.p3); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else p->begin_opMyStructMyEnumD(di1, di2, [=](const Test::MyStructMyEnumD& p1, const Test::MyStructMyEnumD& p2) { @@ -2500,6 +3553,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) { cb->exCB(ex); }); +# endif cb->check(); } @@ -2525,6 +3579,22 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) dsi2[0] = di3; CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = p->opByteBoolDS_async(dsi1, dsi2); + try + { + auto r = f.get(); + cb->opByteBoolDS(r.returnValue, r.p3); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else p->begin_opByteBoolDS(dsi1, dsi2, [=](const Test::ByteBoolDS& p1, const Test::ByteBoolDS& p2) { @@ -2534,6 +3604,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) { cb->exCB(ex); }); +# endif cb->check(); } @@ -2558,6 +3629,22 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) dsi2[0] = di3; CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = p->opShortIntDS_async(dsi1, dsi2); + try + { + auto r = f.get(); + cb->opShortIntDS(r.returnValue, r.p3); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else p->begin_opShortIntDS(dsi1, dsi2, [=](const Test::ShortIntDS& p1, const Test::ShortIntDS& p2) { @@ -2567,6 +3654,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) { cb->exCB(ex); }); +# endif cb->check(); } @@ -2591,6 +3679,22 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) dsi2[0] = di3; CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = p->opLongFloatDS_async(dsi1, dsi2); + try + { + auto r = f.get(); + cb->opLongFloatDS(r.returnValue, r.p3); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else p->begin_opLongFloatDS(dsi1, dsi2, [=](const Test::LongFloatDS& p1, const Test::LongFloatDS& p2) { @@ -2600,6 +3704,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) { cb->exCB(ex); }); +# endif cb->check(); } @@ -2624,6 +3729,22 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) dsi2[0] = di3; CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = p->opStringStringDS_async(dsi1, dsi2); + try + { + auto r = f.get(); + cb->opStringStringDS(r.returnValue, r.p3); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else p->begin_opStringStringDS(dsi1, dsi2, [=](const Test::StringStringDS& p1, const Test::StringStringDS& p2) { @@ -2633,6 +3754,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) { cb->exCB(ex); }); +# endif cb->check(); } @@ -2643,20 +3765,36 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) dsi2.resize(1); Test::StringMyEnumD di1; - di1["abc"] = Test::enum1; - di1[""] = Test::enum2; + di1["abc"] = ICE_ENUM(Test::MyEnum, enum1); + di1[""] = ICE_ENUM(Test::MyEnum, enum2); Test::StringMyEnumD di2; - di2["abc"] = Test::enum1; - di2["qwerty"] = Test::enum3; - di2["Hello!!"] = Test::enum2; + di2["abc"] = ICE_ENUM(Test::MyEnum, enum1); + di2["qwerty"] = ICE_ENUM(Test::MyEnum, enum3); + di2["Hello!!"] = ICE_ENUM(Test::MyEnum, enum2); Test::StringMyEnumD di3; - di3["Goodbye"] = Test::enum1; + di3["Goodbye"] = ICE_ENUM(Test::MyEnum, enum1); dsi1[0] = di1; dsi1[1] = di2; dsi2[0] = di3; CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = p->opStringMyEnumDS_async(dsi1, dsi2); + try + { + auto r = f.get(); + cb->opStringMyEnumDS(r.returnValue, r.p3); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else p->begin_opStringMyEnumDS(dsi1, dsi2, [=](const Test::StringMyEnumDS& p1, const Test::StringMyEnumDS& p2) { @@ -2666,6 +3804,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) { cb->exCB(ex); }); +# endif cb->check(); } @@ -2676,18 +3815,34 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) dsi2.resize(1); Test::MyEnumStringD di1; - di1[Test::enum1] = "abc"; + di1[ICE_ENUM(Test::MyEnum, enum1)] = "abc"; Test::MyEnumStringD di2; - di2[Test::enum2] = "Hello!!"; - di2[Test::enum3] = "qwerty"; + di2[ICE_ENUM(Test::MyEnum, enum2)] = "Hello!!"; + di2[ICE_ENUM(Test::MyEnum, enum3)] = "qwerty"; Test::MyEnumStringD di3; - di3[Test::enum1] = "Goodbye"; + di3[ICE_ENUM(Test::MyEnum, enum1)] = "Goodbye"; dsi1[0] = di1; dsi1[1] = di2; dsi2[0] = di3; CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = p->opMyEnumStringDS_async(dsi1, dsi2); + try + { + auto r = f.get(); + cb->opMyEnumStringDS(r.returnValue, r.p3); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else p->begin_opMyEnumStringDS(dsi1, dsi2, [=](const Test::MyEnumStringDS& p1, const Test::MyEnumStringDS& p2) { @@ -2697,6 +3852,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) { cb->exCB(ex); }); +# endif cb->check(); } @@ -2709,24 +3865,40 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) Test::MyStruct s11 = { 1, 1 }; Test::MyStruct s12 = { 1, 2 }; Test::MyStructMyEnumD di1; - di1[s11] = Test::enum1; - di1[s12] = Test::enum2; + di1[s11] = ICE_ENUM(Test::MyEnum, enum1); + di1[s12] = ICE_ENUM(Test::MyEnum, enum2); Test::MyStruct s22 = { 2, 2 }; Test::MyStruct s23 = { 2, 3 }; Test::MyStructMyEnumD di2; - di2[s11] = Test::enum1; - di2[s22] = Test::enum3; - di2[s23] = Test::enum2; + di2[s11] = ICE_ENUM(Test::MyEnum, enum1); + di2[s22] = ICE_ENUM(Test::MyEnum, enum3); + di2[s23] = ICE_ENUM(Test::MyEnum, enum2); Test::MyStructMyEnumD di3; - di3[s23] = Test::enum3; + di3[s23] = ICE_ENUM(Test::MyEnum, enum3); dsi1[0] = di1; dsi1[1] = di2; dsi2[0] = di3; CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = p->opMyStructMyEnumDS_async(dsi1, dsi2); + try + { + auto r = f.get(); + cb->opMyStructMyEnumDS(r.returnValue, r.p3); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else p->begin_opMyStructMyEnumDS(dsi1, dsi2, [=](const Test::MyStructMyEnumDS& p1, const Test::MyStructMyEnumDS& p2) { @@ -2736,6 +3908,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) { cb->exCB(ex); }); +# endif cb->check(); } @@ -2758,6 +3931,22 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) sdi2[Ice::Byte(0xf1)] = si3; CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = p->opByteByteSD_async(sdi1, sdi2); + try + { + auto r = f.get(); + cb->opByteByteSD(r.returnValue, r.p3); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else p->begin_opByteByteSD(sdi1, sdi2, [=](const Test::ByteByteSD& p1, const Test::ByteByteSD& p2) { @@ -2767,6 +3956,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) { cb->exCB(ex); }); +# endif cb->check(); } @@ -2788,6 +3978,22 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) sdi2[false] = si1; CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = p->opBoolBoolSD_async(sdi1, sdi2); + try + { + auto r = f.get(); + cb->opBoolBoolSD(r.returnValue, r.p3); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else p->begin_opBoolBoolSD(sdi1, sdi2, [=](const Test::BoolBoolSD& p1, const Test::BoolBoolSD& p2) { @@ -2797,6 +4003,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) { cb->exCB(ex); }); +# endif cb->check(); } @@ -2821,6 +4028,22 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) sdi2[4] = si3; CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = p->opShortShortSD_async(sdi1, sdi2); + try + { + auto r = f.get(); + cb->opShortShortSD(r.returnValue, r.p3); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else p->begin_opShortShortSD(sdi1, sdi2, [=](const Test::ShortShortSD& p1, const Test::ShortShortSD& p2) { @@ -2830,6 +4053,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) { cb->exCB(ex); }); +# endif cb->check(); } @@ -2854,6 +4078,22 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) sdi2[400] = si3; CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = p->opIntIntSD_async(sdi1, sdi2); + try + { + auto r = f.get(); + cb->opIntIntSD(r.returnValue, r.p3); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else p->begin_opIntIntSD(sdi1, sdi2, [=](const Test::IntIntSD& p1, const Test::IntIntSD& p2) { @@ -2863,6 +4103,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) { cb->exCB(ex); }); +# endif cb->check(); } @@ -2887,6 +4128,22 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) sdi2[999999992] = si3; CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = p->opLongLongSD_async(sdi1, sdi2); + try + { + auto r = f.get(); + cb->opLongLongSD(r.returnValue, r.p3); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else p->begin_opLongLongSD(sdi1, sdi2, [=](const Test::LongLongSD& p1, const Test::LongLongSD& p2) { @@ -2896,6 +4153,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) { cb->exCB(ex); }); +# endif cb->check(); } @@ -2920,6 +4178,22 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) sdi2["aBc"] = si3; CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = p->opStringFloatSD_async(sdi1, sdi2); + try + { + auto r = f.get(); + cb->opStringFloatSD(r.returnValue, r.p3); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else p->begin_opStringFloatSD(sdi1, sdi2, [=](const Test::StringFloatSD& p1, const Test::StringFloatSD& p2) { @@ -2929,6 +4203,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) { cb->exCB(ex); }); +# endif cb->check(); } @@ -2953,6 +4228,22 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) sdi2[""] = si3; CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = p->opStringDoubleSD_async(sdi1, sdi2); + try + { + auto r = f.get(); + cb->opStringDoubleSD(r.returnValue, r.p3); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else p->begin_opStringDoubleSD(sdi1, sdi2, [=](const Test::StringDoubleSD& p1, const Test::StringDoubleSD& p2) { @@ -2962,6 +4253,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) { cb->exCB(ex); }); +# endif cb->check(); } @@ -2988,6 +4280,22 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) sdi2["ghi"] = si3; CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = p->opStringStringSD_async(sdi1, sdi2); + try + { + auto r = f.get(); + cb->opStringStringSD(r.returnValue, r.p3); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else p->begin_opStringStringSD(sdi1, sdi2, [=](const Test::StringStringSD& p1, const Test::StringStringSD& p2) { @@ -2997,6 +4305,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) { cb->exCB(ex); }); +# endif cb->check(); } @@ -3009,19 +4318,35 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) Test::MyEnumS si2; Test::MyEnumS si3; - si1.push_back(Test::enum1); - si1.push_back(Test::enum1); - si1.push_back(Test::enum2); - si2.push_back(Test::enum1); - si2.push_back(Test::enum2); - si3.push_back(Test::enum3); - si3.push_back(Test::enum3); + si1.push_back(ICE_ENUM(Test::MyEnum, enum1)); + si1.push_back(ICE_ENUM(Test::MyEnum, enum1)); + si1.push_back(ICE_ENUM(Test::MyEnum, enum2)); + si2.push_back(ICE_ENUM(Test::MyEnum, enum1)); + si2.push_back(ICE_ENUM(Test::MyEnum, enum2)); + si3.push_back(ICE_ENUM(Test::MyEnum, enum3)); + si3.push_back(ICE_ENUM(Test::MyEnum, enum3)); - sdi1[Test::enum3] = si1; - sdi1[Test::enum2] = si2; - sdi2[Test::enum1] = si3; + sdi1[ICE_ENUM(Test::MyEnum, enum3)] = si1; + sdi1[ICE_ENUM(Test::MyEnum, enum2)] = si2; + sdi2[ICE_ENUM(Test::MyEnum, enum1)] = si3; CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = p->opMyEnumMyEnumSD_async(sdi1, sdi2); + try + { + auto r = f.get(); + cb->opMyEnumMyEnumSD(r.returnValue, r.p3); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else p->begin_opMyEnumMyEnumSD(sdi1, sdi2, [=](const Test::MyEnumMyEnumSD& p1, const Test::MyEnumMyEnumSD& p2) { @@ -3031,6 +4356,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) { cb->exCB(ex); }); +# endif cb->check(); } @@ -3045,6 +4371,21 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) s.push_back(i); } CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = p->opIntS_async(s); + try + { + cb->opIntS(f.get()); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else p->begin_opIntS(s, [=](const Test::IntS& p1) { @@ -3054,6 +4395,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) { cb->exCB(ex); }); +# endif cb->check(); } } @@ -3062,34 +4404,100 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p) Ice::Double d = 1278312346.0 / 13.0; Test::DoubleS ds(5, d); CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = p->opDoubleMarshaling_async(d, ds); + try + { + f.get(); + cb->opDoubleMarshaling(); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else p->begin_opDoubleMarshaling(d, ds, [=](){ cb->opDoubleMarshaling(); }, [=](const Ice::Exception& ex){ cb->exCB(ex); }); +# endif cb->check(); } { CallbackPtr cb = new Callback; - Test::Callback_MyClass_opIdempotentPtr callback = - Test::newCallback_MyClass_opIdempotent(cb, &Callback::opIdempotent, &Callback::exCB); +# ifdef ICE_CPP11_MAPPING + auto f = p->opIdempotent_async(); + try + { + f.get(); + cb->opIdempotent(); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else p->begin_opIdempotent([=](){ cb->opIdempotent(); }, [=](const Ice::Exception& ex){ cb->exCB(ex); }); +# endif cb->check(); } { CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = p->opNonmutating_async(); + try + { + f.get(); + cb->opNonmutating(); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else p->begin_opNonmutating([=](){ cb->opNonmutating(); }, [=](const Ice::Exception& ex){ cb->exCB(ex); }); +# endif cb->check(); } { - Test::MyDerivedClassPrx derived = Test::MyDerivedClassPrx::checkedCast(p); + Test::MyDerivedClassPrxPtr derived = ICE_CHECKED_CAST(Test::MyDerivedClassPrx, p); test(derived); CallbackPtr cb = new Callback; +# ifdef ICE_CPP11_MAPPING + auto f = derived->opDerived_async(); + try + { + f.get(); + cb->opDerived(); + } + catch(const Ice::Exception& ex) + { + cb->exCB(ex); + } + catch(...) + { + test(false); + } +# else derived->begin_opDerived([=](){ cb->opDerived(); }, [=](const Ice::Exception& ex){ cb->exCB(ex); }); +# endif cb->check(); } #endif diff --git a/cpp/test/Ice/optional/.depend.mak b/cpp/test/Ice/optional/.depend.mak index f6c19062c23..8283d3a8e32 100755 --- a/cpp/test/Ice/optional/.depend.mak +++ b/cpp/test/Ice/optional/.depend.mak @@ -19,6 +19,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" \ @@ -27,6 +28,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" \ @@ -61,7 +63,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" \ @@ -70,13 +72,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" \ "CustomMap.h" \ "StringView.h" \ "$(includedir)\Ice\Ice.h" \ @@ -120,7 +122,6 @@ Test.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" \ @@ -147,6 +148,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" \ @@ -155,6 +157,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" \ @@ -195,7 +198,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" \ @@ -209,6 +212,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" \ @@ -220,7 +224,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" \ @@ -243,7 +246,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" \ @@ -273,6 +275,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" \ @@ -281,6 +284,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" \ @@ -321,7 +325,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" \ @@ -335,6 +339,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" \ @@ -346,7 +351,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" \ @@ -369,7 +373,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" \ @@ -404,6 +407,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" \ @@ -412,6 +416,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" \ @@ -452,7 +457,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" \ @@ -466,6 +471,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" \ @@ -477,7 +483,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" \ @@ -500,7 +505,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" \ @@ -534,6 +538,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" \ @@ -542,6 +547,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" \ @@ -582,7 +588,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" \ @@ -596,6 +602,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" \ @@ -607,7 +614,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" \ @@ -630,7 +636,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" \ @@ -663,6 +668,7 @@ TestAMD.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" \ @@ -671,6 +677,7 @@ TestAMD.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" \ @@ -705,7 +712,7 @@ TestAMD.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" \ @@ -714,6 +721,7 @@ TestAMD.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" \ @@ -721,7 +729,6 @@ TestAMD.obj: \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "CustomMap.h" \ "StringView.h" \ "$(includedir)\Ice\Ice.h" \ @@ -764,7 +771,6 @@ TestAMD.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" \ @@ -791,6 +797,7 @@ TestAMDI.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" \ @@ -799,6 +806,7 @@ TestAMDI.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" \ @@ -839,7 +847,7 @@ TestAMDI.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" \ @@ -853,6 +861,7 @@ TestAMDI.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" \ @@ -864,7 +873,6 @@ TestAMDI.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" \ @@ -887,7 +895,6 @@ TestAMDI.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" \ @@ -917,6 +924,7 @@ ServerAMD.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" \ @@ -925,6 +933,7 @@ ServerAMD.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" \ @@ -965,7 +974,7 @@ ServerAMD.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" \ @@ -979,6 +988,7 @@ ServerAMD.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" \ @@ -990,7 +1000,6 @@ ServerAMD.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" \ @@ -1013,7 +1022,6 @@ ServerAMD.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/optional/CustomMap.h b/cpp/test/Ice/optional/CustomMap.h index ba097ce2d1e..863fcf5101d 100644 --- a/cpp/test/Ice/optional/CustomMap.h +++ b/cpp/test/Ice/optional/CustomMap.h @@ -12,7 +12,7 @@ #include <IceUtil/Config.h> -#ifdef ICE_CPP11 +#ifdef ICE_CPP11_COMPILER # include <unordered_map> #else # include <map> @@ -21,7 +21,7 @@ namespace Test { -#ifdef ICE_CPP11 +#ifdef ICE_CPP11_COMPILER template<typename K, typename V> class CustomMap : public std::unordered_map<K, V> { diff --git a/cpp/test/Ice/plugin/.depend.mak b/cpp/test/Ice/plugin/.depend.mak index 533ca1adef5..bc8a2cd7584 100755 --- a/cpp/test/Ice/plugin/.depend.mak +++ b/cpp/test/Ice/plugin/.depend.mak @@ -15,6 +15,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" \ @@ -23,6 +24,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" \ @@ -63,7 +65,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" \ @@ -77,6 +79,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" \ @@ -88,7 +91,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" \ @@ -111,7 +113,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" \ @@ -142,6 +143,7 @@ Plugin.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" \ @@ -150,6 +152,7 @@ Plugin.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" \ @@ -190,7 +193,7 @@ Plugin.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" \ @@ -204,6 +207,7 @@ Plugin.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" \ @@ -215,7 +219,6 @@ Plugin.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" \ @@ -238,7 +241,6 @@ Plugin.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/properties/.depend.mak b/cpp/test/Ice/properties/.depend.mak index 13e5e3347b1..ba2e103148d 100755 --- a/cpp/test/Ice/properties/.depend.mak +++ b/cpp/test/Ice/properties/.depend.mak @@ -15,6 +15,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" \ @@ -23,6 +24,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" \ @@ -63,7 +65,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" \ @@ -77,6 +79,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" \ @@ -88,7 +91,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" \ @@ -111,7 +113,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" \ diff --git a/cpp/test/Ice/proxy/.depend.mak b/cpp/test/Ice/proxy/.depend.mak index 4b298f8f995..f38c3b9ccfe 100755 --- a/cpp/test/Ice/proxy/.depend.mak +++ b/cpp/test/Ice/proxy/.depend.mak @@ -29,6 +29,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" \ @@ -37,6 +38,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" \ @@ -71,7 +73,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" \ @@ -80,13 +82,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\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -109,6 +111,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" \ @@ -117,6 +120,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" \ @@ -157,7 +161,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" \ @@ -171,6 +175,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" \ @@ -182,7 +187,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" \ @@ -205,7 +209,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" \ @@ -237,6 +240,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" \ @@ -245,6 +249,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" \ @@ -285,7 +290,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" \ @@ -299,6 +304,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" \ @@ -310,7 +316,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" \ @@ -333,7 +338,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" \ @@ -365,6 +369,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" \ @@ -373,6 +378,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" \ @@ -413,7 +419,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" \ @@ -427,6 +433,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" \ @@ -438,7 +445,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" \ @@ -461,7 +467,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" \ @@ -494,6 +499,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" \ @@ -502,6 +508,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" \ @@ -542,7 +549,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" \ @@ -556,6 +563,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" \ @@ -567,7 +575,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" \ @@ -590,7 +597,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" \ @@ -621,6 +627,7 @@ TestAMD.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" \ @@ -629,6 +636,7 @@ TestAMD.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" \ @@ -663,7 +671,7 @@ TestAMD.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" \ @@ -672,6 +680,7 @@ TestAMD.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" \ @@ -679,7 +688,6 @@ TestAMD.obj: \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -702,6 +710,7 @@ TestAMDI.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" \ @@ -710,6 +719,7 @@ TestAMDI.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" \ @@ -750,7 +760,7 @@ TestAMDI.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" \ @@ -764,6 +774,7 @@ TestAMDI.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" \ @@ -775,7 +786,6 @@ TestAMDI.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" \ @@ -798,7 +808,6 @@ TestAMDI.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" \ @@ -831,6 +840,7 @@ ServerAMD.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" \ @@ -839,6 +849,7 @@ ServerAMD.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" \ @@ -879,7 +890,7 @@ ServerAMD.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" \ @@ -893,6 +904,7 @@ ServerAMD.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" \ @@ -904,7 +916,6 @@ ServerAMD.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" \ @@ -927,7 +938,6 @@ ServerAMD.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" \ @@ -960,6 +970,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" \ @@ -968,6 +979,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" \ @@ -1008,7 +1020,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" \ @@ -1022,6 +1034,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" \ @@ -1033,7 +1046,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" \ @@ -1056,7 +1068,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/proxy/AllTests.cpp b/cpp/test/Ice/proxy/AllTests.cpp index 545dc04037d..d324135ac83 100644 --- a/cpp/test/Ice/proxy/AllTests.cpp +++ b/cpp/test/Ice/proxy/AllTests.cpp @@ -10,20 +10,21 @@ #include <Ice/Ice.h> #include <Ice/Locator.h> #include <Ice/Router.h> +#include <Ice/EndpointI.h> #include <TestCommon.h> #include <Test.h> using namespace std; -Test::MyClassPrx +Test::MyClassPrxPtr allTests(const Ice::CommunicatorPtr& communicator) { cout << "testing stringToProxy... " << flush; string ref = "test:default -p 12010"; - Ice::ObjectPrx base = communicator->stringToProxy(ref); + Ice::ObjectPrxPtr base = communicator->stringToProxy(ref); test(base); - Ice::ObjectPrx b1 = communicator->stringToProxy("test"); + Ice::ObjectPrxPtr b1 = communicator->stringToProxy("test"); test(b1->ice_getIdentity().name == "test" && b1->ice_getIdentity().category.empty() && b1->ice_getAdapterId().empty() && b1->ice_getFacet().empty()); b1 = communicator->stringToProxy("test "); @@ -389,7 +390,7 @@ allTests(const Ice::CommunicatorPtr& communicator) b1 = b1->ice_invocationTimeout(1234); Ice::EncodingVersion v = { 1, 0 }; b1 = b1->ice_encodingVersion(v); - Ice::ObjectPrx router = communicator->stringToProxy("router"); + Ice::ObjectPrxPtr router = communicator->stringToProxy("router"); router = router->ice_collocationOptimized(false); router = router->ice_connectionCached(true); router = router->ice_preferSecure(true); @@ -397,7 +398,7 @@ allTests(const Ice::CommunicatorPtr& communicator) router = router->ice_locatorCacheTimeout(200); router = router->ice_invocationTimeout(1500); - Ice::ObjectPrx locator = communicator->stringToProxy("locator"); + Ice::ObjectPrxPtr locator = communicator->stringToProxy("locator"); locator = locator->ice_collocationOptimized(true); locator = locator->ice_connectionCached(false); locator = locator->ice_preferSecure(true); @@ -405,8 +406,8 @@ allTests(const Ice::CommunicatorPtr& communicator) locator = locator->ice_locatorCacheTimeout(300); locator = locator->ice_invocationTimeout(1500); - locator = locator->ice_router(Ice::RouterPrx::uncheckedCast(router)); - b1 = b1->ice_locator(Ice::LocatorPrx::uncheckedCast(locator)); + locator = locator->ice_router(ICE_UNCHECKED_CAST(Ice::RouterPrx, router)); + b1 = b1->ice_locator(ICE_UNCHECKED_CAST(Ice::LocatorPrx, locator)); Ice::PropertyDict proxyProps = communicator->proxyToProperty(b1, "Test"); test(proxyProps.size() == 21); @@ -548,12 +549,195 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "testing proxy comparison... " << flush; +#ifdef ICE_CPP11_MAPPING + test(Ice::targetEquals(communicator->stringToProxy("foo"), communicator->stringToProxy("foo"))); + test(!Ice::targetEquals(communicator->stringToProxy("foo"), communicator->stringToProxy("foo2"))); + test(Ice::targetLess(communicator->stringToProxy("foo"), communicator->stringToProxy("foo2"))); + test(!Ice::targetLess(communicator->stringToProxy("foo2"), communicator->stringToProxy("foo"))); + + Ice::ObjectPrxPtr compObj = communicator->stringToProxy("foo"); + + test(Ice::targetEquals(compObj->ice_facet("facet"), compObj->ice_facet("facet"))); + test(!Ice::targetEquals(compObj->ice_facet("facet"), compObj->ice_facet("facet1"))); + test(Ice::targetLess(compObj->ice_facet("facet"), compObj->ice_facet("facet1"))); + test(!Ice::targetLess(compObj->ice_facet("facet"), compObj->ice_facet("facet"))); + + test(Ice::targetEquals(compObj->ice_oneway(), compObj->ice_oneway())); + test(!Ice::targetEquals(compObj->ice_oneway(), compObj->ice_twoway())); + test(Ice::targetLess(compObj->ice_twoway(), compObj->ice_oneway())); + test(!Ice::targetLess(compObj->ice_oneway(), compObj->ice_twoway())); + + test(Ice::targetEquals(compObj->ice_secure(true), compObj->ice_secure(true))); + test(!Ice::targetEquals(compObj->ice_secure(false), compObj->ice_secure(true))); + test(Ice::targetLess(compObj->ice_secure(false), compObj->ice_secure(true))); + test(!Ice::targetLess(compObj->ice_secure(true), compObj->ice_secure(false))); + + test(Ice::targetEquals(compObj->ice_collocationOptimized(true), compObj->ice_collocationOptimized(true))); + test(!Ice::targetEquals(compObj->ice_collocationOptimized(false), compObj->ice_collocationOptimized(true))); + test(Ice::targetLess(compObj->ice_collocationOptimized(false), compObj->ice_collocationOptimized(true))); + test(!Ice::targetLess(compObj->ice_collocationOptimized(true), compObj->ice_collocationOptimized(false))); + + test(Ice::targetEquals(compObj->ice_connectionCached(true), compObj->ice_connectionCached(true))); + test(!Ice::targetEquals(compObj->ice_connectionCached(false), compObj->ice_connectionCached(true))); + test(Ice::targetLess(compObj->ice_connectionCached(false), compObj->ice_connectionCached(true))); + test(!Ice::targetLess(compObj->ice_connectionCached(true), compObj->ice_connectionCached(false))); + + test(Ice::targetEquals(compObj->ice_endpointSelection(Ice::Random), compObj->ice_endpointSelection(Ice::Random))); + test(!Ice::targetEquals(compObj->ice_endpointSelection(Ice::Random), compObj->ice_endpointSelection(Ice::Ordered))); + test(Ice::targetLess(compObj->ice_endpointSelection(Ice::Random), compObj->ice_endpointSelection(Ice::Ordered))); + test(!Ice::targetLess(compObj->ice_endpointSelection(Ice::Ordered), compObj->ice_endpointSelection(Ice::Random))); + + test(Ice::targetEquals(compObj->ice_connectionId("id2"), compObj->ice_connectionId("id2"))); + test(!Ice::targetEquals(compObj->ice_connectionId("id1"), compObj->ice_connectionId("id2"))); + test(Ice::targetLess(compObj->ice_connectionId("id1"), compObj->ice_connectionId("id2"))); + test(!Ice::targetLess(compObj->ice_connectionId("id2"), compObj->ice_connectionId("id1"))); + + test(compObj->ice_connectionId("id1")->ice_getConnectionId() == "id1"); + test(compObj->ice_connectionId("id2")->ice_getConnectionId() == "id2"); + + test(Ice::targetEquals(compObj->ice_compress(true), compObj->ice_compress(true))); + test(!Ice::targetEquals(compObj->ice_compress(false), compObj->ice_compress(true))); + test(Ice::targetLess(compObj->ice_compress(false), compObj->ice_compress(true))); + test(!Ice::targetLess(compObj->ice_compress(true), compObj->ice_compress(false))); + + test(Ice::targetEquals(compObj->ice_timeout(20), compObj->ice_timeout(20))); + test(!Ice::targetEquals(compObj->ice_timeout(10), compObj->ice_timeout(20))); + test(Ice::targetLess(compObj->ice_timeout(10), compObj->ice_timeout(20))); + test(!Ice::targetLess(compObj->ice_timeout(20), compObj->ice_timeout(10))); + + auto loc1 = Ice::uncheckedCast<Ice::LocatorPrx>(communicator->stringToProxy("loc1:default -p 10000")); + auto loc2 = Ice::uncheckedCast<Ice::LocatorPrx>(communicator->stringToProxy("loc2:default -p 10000")); + + test(Ice::targetEquals(compObj->ice_locator(0), compObj->ice_locator(0))); + test(Ice::targetEquals(compObj->ice_locator(loc1), compObj->ice_locator(loc1))); + test(!Ice::targetEquals(compObj->ice_locator(loc1), compObj->ice_locator(0))); + test(!Ice::targetEquals(compObj->ice_locator(0), compObj->ice_locator(loc2))); + test(!Ice::targetEquals(compObj->ice_locator(loc1), compObj->ice_locator(loc2))); + test(Ice::targetLess(compObj->ice_locator(0), compObj->ice_locator(loc1))); + test(!Ice::targetLess(compObj->ice_locator(loc1), compObj->ice_locator(0))); + test(Ice::targetLess(compObj->ice_locator(loc1), compObj->ice_locator(loc2))); + test(!Ice::targetLess(compObj->ice_locator(loc2), compObj->ice_locator(loc1))); + + auto rtr1 = Ice::uncheckedCast<Ice::RouterPrx>(communicator->stringToProxy("rtr1:default -p 10000")); + auto rtr2 = Ice::uncheckedCast<Ice::RouterPrx>(communicator->stringToProxy("rtr2:default -p 10000")); + + test(Ice::targetEquals(compObj->ice_router(0), compObj->ice_router(0))); + test(Ice::targetEquals(compObj->ice_router(rtr1), compObj->ice_router(rtr1))); + test(!Ice::targetEquals(compObj->ice_router(rtr1), compObj->ice_router(0))); + test(!Ice::targetEquals(compObj->ice_router(0), compObj->ice_router(rtr2))); + test(!Ice::targetEquals(compObj->ice_router(rtr1), compObj->ice_router(rtr2))); + test(Ice::targetLess(compObj->ice_router(0), compObj->ice_router(rtr1))); + test(!Ice::targetLess(compObj->ice_router(rtr1), compObj->ice_router(0))); + test(Ice::targetLess(compObj->ice_router(rtr1), compObj->ice_router(rtr2))); + test(!Ice::targetLess(compObj->ice_router(rtr2), compObj->ice_router(rtr1))); + + Ice::Context ctx1; + ctx1["ctx1"] = "v1"; + Ice::Context ctx2; + ctx2["ctx2"] = "v2"; + test(Ice::targetEquals(compObj->ice_context(Ice::Context()), compObj->ice_context(Ice::Context()))); + test(Ice::targetEquals(compObj->ice_context(ctx1), compObj->ice_context(ctx1))); + test(!Ice::targetEquals(compObj->ice_context(ctx1), compObj->ice_context(Ice::Context()))); + test(!Ice::targetEquals(compObj->ice_context(Ice::Context()), compObj->ice_context(ctx2))); + test(!Ice::targetEquals(compObj->ice_context(ctx1), compObj->ice_context(ctx2))); + test(Ice::targetLess(compObj->ice_context(ctx1), compObj->ice_context(ctx2))); + test(!Ice::targetLess(compObj->ice_context(ctx2), compObj->ice_context(ctx1))); + + test(Ice::targetEquals(compObj->ice_preferSecure(true), compObj->ice_preferSecure(true))); + test(!Ice::targetEquals(compObj->ice_preferSecure(true), compObj->ice_preferSecure(false))); + test(Ice::targetLess(compObj->ice_preferSecure(false), compObj->ice_preferSecure(true))); + test(!Ice::targetLess(compObj->ice_preferSecure(true), compObj->ice_preferSecure(false))); + + auto compObj1 = communicator->stringToProxy("foo:tcp -h 127.0.0.1 -p 10000"); + auto compObj2 = communicator->stringToProxy("foo:tcp -h 127.0.0.1 -p 10001"); + test(!Ice::targetEquals(compObj1, compObj2)); + test(Ice::targetLess(compObj1, compObj2)); + test(!Ice::targetLess(compObj2, compObj1)); + + compObj1 = communicator->stringToProxy("foo@MyAdapter1"); + compObj2 = communicator->stringToProxy("foo@MyAdapter2"); + test(!Ice::targetEquals(compObj1, compObj2)); + test(Ice::targetLess(compObj1, compObj2)); + test(!Ice::targetLess(compObj2, compObj1)); + + test(Ice::targetEquals(compObj1->ice_locatorCacheTimeout(20), compObj1->ice_locatorCacheTimeout(20))); + test(!Ice::targetEquals(compObj1->ice_locatorCacheTimeout(10), compObj1->ice_locatorCacheTimeout(20))); + test(Ice::targetLess(compObj1->ice_locatorCacheTimeout(10), compObj1->ice_locatorCacheTimeout(20))); + test(!Ice::targetLess(compObj1->ice_locatorCacheTimeout(20), compObj1->ice_locatorCacheTimeout(10))); + + test(Ice::targetEquals(compObj1->ice_invocationTimeout(20), compObj1->ice_invocationTimeout(20))); + test(!Ice::targetEquals(compObj1->ice_invocationTimeout(10), compObj1->ice_invocationTimeout(20))); + test(Ice::targetLess(compObj1->ice_invocationTimeout(10), compObj1->ice_invocationTimeout(20))); + test(!Ice::targetLess(compObj1->ice_invocationTimeout(20), compObj1->ice_invocationTimeout(10))); + + compObj1 = communicator->stringToProxy("foo:tcp -h 127.0.0.1 -p 1000"); + compObj2 = communicator->stringToProxy("foo@MyAdapter1"); + test(!Ice::targetEquals(compObj1, compObj2)); + test(Ice::targetLess(compObj1, compObj2)); + test(!Ice::targetLess(compObj2, compObj1)); + + Ice::EndpointSeq endpts1 = communicator->stringToProxy("foo:tcp -h 127.0.0.1 -p 10000")->ice_getEndpoints(); + Ice::EndpointSeq endpts2 = communicator->stringToProxy("foo:tcp -h 127.0.0.1 -p 10001")->ice_getEndpoints(); + + auto eq = [](const shared_ptr<Ice::Endpoint>& lhs, const shared_ptr<Ice::Endpoint>& rhs) + { + return Ice::targetEquals(dynamic_pointer_cast<IceInternal::EndpointI>(lhs), + dynamic_pointer_cast<IceInternal::EndpointI>(rhs)); + }; + + auto less = [](const shared_ptr<Ice::Endpoint>& lhs, const shared_ptr<Ice::Endpoint>& rhs) + { + return Ice::targetLess(dynamic_pointer_cast<IceInternal::EndpointI>(lhs), + dynamic_pointer_cast<IceInternal::EndpointI>(rhs)); + }; + + test(!equal(endpts1.begin(), endpts1.end(), endpts2.begin(), endpts2.end(), eq)); + test(lexicographical_compare(endpts1.begin(), endpts1.end(), endpts2.begin(), endpts2.end(), less)); + test(!lexicographical_compare(endpts2.begin(), endpts2.end(), endpts1.begin(), endpts1.end(), less)); + + Ice::EndpointSeq endpts3 = communicator->stringToProxy("foo:tcp -h 127.0.0.1 -p 10000")->ice_getEndpoints(); + test(equal(endpts1.begin(), endpts1.end(), endpts3.begin(), endpts3.end(), eq)); + + test(Ice::targetEquals(compObj1->ice_encodingVersion(Ice::Encoding_1_0), compObj1->ice_encodingVersion(Ice::Encoding_1_0))); + test(!Ice::targetEquals(compObj1->ice_encodingVersion(Ice::Encoding_1_0), compObj1->ice_encodingVersion(Ice::Encoding_1_1))); + test(Ice::targetLess(compObj->ice_encodingVersion(Ice::Encoding_1_0), compObj->ice_encodingVersion(Ice::Encoding_1_1))); + test(!Ice::targetLess(compObj->ice_encodingVersion(Ice::Encoding_1_1), compObj->ice_encodingVersion(Ice::Encoding_1_0))); + + // + // TODO: Ideally we should also test comparison of fixed proxies. + // + + cout << "ok" << endl; + + cout << "testing checked cast... " << flush; + auto cl = Ice::checkedCast<Test::MyClassPrx>(base); + test(cl); + + auto derived = Ice::checkedCast<Test::MyDerivedClassPrx>(cl); + test(derived); + test(Ice::targetEquals(cl, base)); + test(Ice::targetEquals(derived, base)); + test(Ice::targetEquals(cl, derived)); + + auto loc = Ice::checkedCast<Ice::LocatorPrx>(base); + test(loc == nullptr); + + // + // Upcasting + // + auto cl2 = Ice::checkedCast<Test::MyClassPrx>(derived); + auto obj = Ice::checkedCast<Ice::ObjectPrx>(derived); + test(cl2); + test(obj); + test(Ice::targetEquals(cl2, obj)); + test(Ice::targetEquals(cl2, derived)); +#else test(communicator->stringToProxy("foo") == communicator->stringToProxy("foo")); test(communicator->stringToProxy("foo") != communicator->stringToProxy("foo2")); test(communicator->stringToProxy("foo") < communicator->stringToProxy("foo2")); test(!(communicator->stringToProxy("foo2") < communicator->stringToProxy("foo"))); - Ice::ObjectPrx compObj = communicator->stringToProxy("foo"); + Ice::ObjectPrxPtr compObj = communicator->stringToProxy("foo"); test(compObj->ice_facet("facet") == compObj->ice_facet("facet")); test(compObj->ice_facet("facet") != compObj->ice_facet("facet1")); @@ -603,8 +787,8 @@ allTests(const Ice::CommunicatorPtr& communicator) test(compObj->ice_timeout(10) < compObj->ice_timeout(20)); test(!(compObj->ice_timeout(20) < compObj->ice_timeout(10))); - Ice::LocatorPrx loc1 = Ice::LocatorPrx::uncheckedCast(communicator->stringToProxy("loc1:default -p 10000")); - Ice::LocatorPrx loc2 = Ice::LocatorPrx::uncheckedCast(communicator->stringToProxy("loc2:default -p 10000")); + Ice::LocatorPrxPtr loc1 = ICE_UNCHECKED_CAST(Ice::LocatorPrx, communicator->stringToProxy("loc1:default -p 10000")); + Ice::LocatorPrxPtr loc2 = ICE_UNCHECKED_CAST(Ice::LocatorPrx, communicator->stringToProxy("loc2:default -p 10000")); test(compObj->ice_locator(0) == compObj->ice_locator(0)); test(compObj->ice_locator(loc1) == compObj->ice_locator(loc1)); test(compObj->ice_locator(loc1) != compObj->ice_locator(0)); @@ -615,8 +799,8 @@ allTests(const Ice::CommunicatorPtr& communicator) test(compObj->ice_locator(loc1) < compObj->ice_locator(loc2)); test(!(compObj->ice_locator(loc2) < compObj->ice_locator(loc1))); - Ice::RouterPrx rtr1 = Ice::RouterPrx::uncheckedCast(communicator->stringToProxy("rtr1:default -p 10000")); - Ice::RouterPrx rtr2 = Ice::RouterPrx::uncheckedCast(communicator->stringToProxy("rtr2:default -p 10000")); + Ice::RouterPrxPtr rtr1 = ICE_UNCHECKED_CAST(Ice::RouterPrx, communicator->stringToProxy("rtr1:default -p 10000")); + Ice::RouterPrxPtr rtr2 = ICE_UNCHECKED_CAST(Ice::RouterPrx, communicator->stringToProxy("rtr2:default -p 10000")); test(compObj->ice_router(0) == compObj->ice_router(0)); test(compObj->ice_router(rtr1) == compObj->ice_router(rtr1)); test(compObj->ice_router(rtr1) != compObj->ice_router(0)); @@ -644,8 +828,8 @@ allTests(const Ice::CommunicatorPtr& communicator) test(compObj->ice_preferSecure(false) < compObj->ice_preferSecure(true)); test(!(compObj->ice_preferSecure(true) < compObj->ice_preferSecure(false))); - Ice::ObjectPrx compObj1 = communicator->stringToProxy("foo:tcp -h 127.0.0.1 -p 10000"); - Ice::ObjectPrx compObj2 = communicator->stringToProxy("foo:tcp -h 127.0.0.1 -p 10001"); + Ice::ObjectPrxPtr compObj1 = communicator->stringToProxy("foo:tcp -h 127.0.0.1 -p 10000"); + Ice::ObjectPrxPtr compObj2 = communicator->stringToProxy("foo:tcp -h 127.0.0.1 -p 10001"); test(compObj1 != compObj2); test(compObj1 < compObj2); test(!(compObj2 < compObj1)); @@ -691,23 +875,23 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "ok" << endl; cout << "testing checked cast... " << flush; - Test::MyClassPrx cl = Test::MyClassPrx::checkedCast(base); + Test::MyClassPrxPtr cl = ICE_CHECKED_CAST(Test::MyClassPrx, base); test(cl); - Test::MyDerivedClassPrx derived = Test::MyDerivedClassPrx::checkedCast(cl); + Test::MyDerivedClassPrxPtr derived = ICE_CHECKED_CAST(Test::MyDerivedClassPrx, cl); test(derived); test(cl == base); test(derived == base); test(cl == derived); - Ice::LocatorPrx loc = Ice::LocatorPrx::checkedCast(base); + Ice::LocatorPrxPtr loc = ICE_CHECKED_CAST(Ice::LocatorPrx, base); test(loc == 0); // // Upcasting // - Test::MyClassPrx cl2 = Test::MyClassPrx::checkedCast(derived); - Ice::ObjectPrx obj = Ice::ObjectPrx::checkedCast(derived); + Test::MyClassPrxPtr cl2 = ICE_CHECKED_CAST(Test::MyClassPrx, derived); + Ice::ObjectPrxPtr obj = ICE_CHECKED_CAST(Ice::ObjectPrx, derived); test(cl2); test(obj); test(cl2 == obj); @@ -733,7 +917,7 @@ allTests(const Ice::CommunicatorPtr& communicator) test(obj); test(cl2 == obj); test(cl2 == derived); - +#endif cout << "ok" << endl; cout << "testing checked cast with context... " << flush; @@ -742,13 +926,18 @@ allTests(const Ice::CommunicatorPtr& communicator) c["one"] = "hello"; c["two"] = "world"; +#ifdef ICE_CPP11_MAPPING + cl = Ice::checkedCast<Test::MyClassPrx>(base, c); +#else cl = Test::MyClassPrx::checkedCast(base, c); +#endif Ice::Context c2 = cl->getContext(); test(c == c2); // // Now with alternate API // +#ifndef ICE_CPP11_MAPPING cl = checkedCast<Test::MyClassPrx>(base); c = cl->getContext(); test(c.size() == 0); @@ -756,12 +945,12 @@ allTests(const Ice::CommunicatorPtr& communicator) cl = checkedCast<Test::MyClassPrx>(base, c); c2 = cl->getContext(); test(c == c2); - +#endif cout << "ok" << endl; cout << "testing encoding versioning... " << flush; string ref20 = "test -e 2.0:default -p 12010"; - Test::MyClassPrx cl20 = Test::MyClassPrx::uncheckedCast(communicator->stringToProxy(ref20)); + Test::MyClassPrxPtr cl20 = ICE_UNCHECKED_CAST(Test::MyClassPrx, communicator->stringToProxy(ref20)); try { cl20->ice_ping(); @@ -773,7 +962,7 @@ allTests(const Ice::CommunicatorPtr& communicator) } string ref10 = "test -e 1.0:default -p 12010"; - Test::MyClassPrx cl10 = Test::MyClassPrx::uncheckedCast(communicator->stringToProxy(ref10)); + Test::MyClassPrxPtr cl10 = ICE_UNCHECKED_CAST(Test::MyClassPrx, communicator->stringToProxy(ref10)); cl10->ice_ping(); cl10->ice_encodingVersion(Ice::Encoding_1_0)->ice_ping(); cl->ice_encodingVersion(Ice::Encoding_1_0)->ice_ping(); @@ -781,10 +970,18 @@ allTests(const Ice::CommunicatorPtr& communicator) // 1.3 isn't supported but since a 1.3 proxy supports 1.1, the // call will use the 1.1 encoding string ref13 = "test -e 1.3:default -p 12010"; - Test::MyClassPrx cl13 = Test::MyClassPrx::uncheckedCast(communicator->stringToProxy(ref13)); + Test::MyClassPrxPtr cl13 = ICE_UNCHECKED_CAST(Test::MyClassPrx, communicator->stringToProxy(ref13)); cl13->ice_ping(); +#ifdef ICE_CPP11_MAPPING + cl13->ice_ping_async().get(); +#else cl13->end_ice_ping(cl13->begin_ice_ping()); +#endif +#ifndef ICE_CPP11_MAPPING + // + // TODO port this once the C++11 streaming API is done + // try { // Send request with bogus 1.2 encoding. @@ -826,13 +1023,14 @@ allTests(const Ice::CommunicatorPtr& communicator) // The server thrown an UnsupportedEncodingException test(ex.unknown.find("UnsupportedEncodingException") != string::npos); } +#endif cout << "ok" << endl; cout << "testing protocol versioning... " << flush; ref20 = "test -p 2.0:default -p 12010"; - cl20 = Test::MyClassPrx::uncheckedCast(communicator->stringToProxy(ref20)); + cl20 = ICE_UNCHECKED_CAST(Test::MyClassPrx, communicator->stringToProxy(ref20)); try { cl20->ice_ping(); @@ -844,16 +1042,19 @@ allTests(const Ice::CommunicatorPtr& communicator) } ref10 = "test -p 1.0:default -p 12010"; - cl10 = Test::MyClassPrx::uncheckedCast(communicator->stringToProxy(ref10)); + cl10 = ICE_UNCHECKED_CAST(Test::MyClassPrx, communicator->stringToProxy(ref10)); cl10->ice_ping(); // 1.3 isn't supported but since a 1.3 proxy supports 1.0, the // call will use the 1.0 encoding ref13 = "test -p 1.3:default -p 12010"; - cl13 = Test::MyClassPrx::uncheckedCast(communicator->stringToProxy(ref13)); + cl13 = ICE_UNCHECKED_CAST(Test::MyClassPrx, communicator->stringToProxy(ref13)); cl13->ice_ping(); +#ifdef ICE_CPP11_MAPPING + cl13->ice_ping_async().get(); +#else cl13->end_ice_ping(cl13->begin_ice_ping()); - +#endif cout << "ok" <<endl; cout << "testing opaque endpoints... " << flush; @@ -861,7 +1062,7 @@ allTests(const Ice::CommunicatorPtr& communicator) try { // Invalid -x option - Ice::ObjectPrx p = communicator->stringToProxy("id:opaque -t 99 -v abc -x abc"); + Ice::ObjectPrxPtr p = communicator->stringToProxy("id:opaque -t 99 -v abc -x abc"); test(false); } catch(const Ice::EndpointParseException&) @@ -871,7 +1072,7 @@ allTests(const Ice::CommunicatorPtr& communicator) try { // Missing -t and -v - Ice::ObjectPrx p = communicator->stringToProxy("id:opaque"); + Ice::ObjectPrxPtr p = communicator->stringToProxy("id:opaque"); test(false); } catch(const Ice::EndpointParseException&) @@ -881,7 +1082,7 @@ allTests(const Ice::CommunicatorPtr& communicator) try { // Repeated -t - Ice::ObjectPrx p = communicator->stringToProxy("id:opaque -t 1 -t 1 -v abc"); + Ice::ObjectPrxPtr p = communicator->stringToProxy("id:opaque -t 1 -t 1 -v abc"); test(false); } catch(const Ice::EndpointParseException&) @@ -891,7 +1092,7 @@ allTests(const Ice::CommunicatorPtr& communicator) try { // Repeated -v - Ice::ObjectPrx p = communicator->stringToProxy("id:opaque -t 1 -v abc -v abc"); + Ice::ObjectPrxPtr p = communicator->stringToProxy("id:opaque -t 1 -v abc -v abc"); test(false); } catch(const Ice::EndpointParseException&) @@ -901,7 +1102,7 @@ allTests(const Ice::CommunicatorPtr& communicator) try { // Missing -t - Ice::ObjectPrx p = communicator->stringToProxy("id:opaque -v abc"); + Ice::ObjectPrxPtr p = communicator->stringToProxy("id:opaque -v abc"); test(false); } catch(const Ice::EndpointParseException&) @@ -911,7 +1112,7 @@ allTests(const Ice::CommunicatorPtr& communicator) try { // Missing -v - Ice::ObjectPrx p = communicator->stringToProxy("id:opaque -t 1"); + Ice::ObjectPrxPtr p = communicator->stringToProxy("id:opaque -t 1"); test(false); } catch(const Ice::EndpointParseException&) @@ -921,7 +1122,7 @@ allTests(const Ice::CommunicatorPtr& communicator) try { // Missing arg for -t - Ice::ObjectPrx p = communicator->stringToProxy("id:opaque -t -v abc"); + Ice::ObjectPrxPtr p = communicator->stringToProxy("id:opaque -t -v abc"); test(false); } catch(const Ice::EndpointParseException&) @@ -931,7 +1132,7 @@ allTests(const Ice::CommunicatorPtr& communicator) try { // Missing arg for -v - Ice::ObjectPrx p = communicator->stringToProxy("id:opaque -t 1 -v"); + Ice::ObjectPrxPtr p = communicator->stringToProxy("id:opaque -t 1 -v"); test(false); } catch(const Ice::EndpointParseException&) @@ -941,7 +1142,7 @@ allTests(const Ice::CommunicatorPtr& communicator) try { // Not a number for -t - Ice::ObjectPrx p = communicator->stringToProxy("id:opaque -t x -v abc"); + Ice::ObjectPrxPtr p = communicator->stringToProxy("id:opaque -t x -v abc"); test(false); } catch(const Ice::EndpointParseException&) @@ -951,7 +1152,7 @@ allTests(const Ice::CommunicatorPtr& communicator) try { // < 0 for -t - Ice::ObjectPrx p = communicator->stringToProxy("id:opaque -t -1 -v abc"); + Ice::ObjectPrxPtr p = communicator->stringToProxy("id:opaque -t -1 -v abc"); test(false); } catch(const Ice::EndpointParseException&) @@ -961,7 +1162,7 @@ allTests(const Ice::CommunicatorPtr& communicator) try { // Invalid char for -v - Ice::ObjectPrx p = communicator->stringToProxy("id:opaque -t 99 -v x?c"); + Ice::ObjectPrxPtr p = communicator->stringToProxy("id:opaque -t 99 -v x?c"); test(false); } catch(const Ice::EndpointParseException&) @@ -969,12 +1170,12 @@ allTests(const Ice::CommunicatorPtr& communicator) } // Legal TCP endpoint expressed as opaque endpoint - Ice::ObjectPrx p1 = communicator->stringToProxy("test -e 1.1:opaque -e 1.0 -t 1 -v CTEyNy4wLjAuMeouAAAQJwAAAA=="); + Ice::ObjectPrxPtr p1 = communicator->stringToProxy("test -e 1.1:opaque -e 1.0 -t 1 -v CTEyNy4wLjAuMeouAAAQJwAAAA=="); string pstr = communicator->proxyToString(p1); test(pstr == "test -t -e 1.1:tcp -h 127.0.0.1 -p 12010 -t 10000"); // Opaque endpoint encoded with 1.1 encoding. - Ice::ObjectPrx p2 = communicator->stringToProxy("test -e 1.1:opaque -e 1.1 -t 1 -v CTEyNy4wLjAuMeouAAAQJwAAAA=="); + Ice::ObjectPrxPtr p2 = communicator->stringToProxy("test -e 1.1:opaque -e 1.1 -t 1 -v CTEyNy4wLjAuMeouAAAQJwAAAA=="); test(communicator->proxyToString(p2) == "test -t -e 1.1:tcp -h 127.0.0.1 -p 12010 -t 10000"); if(communicator->getProperties()->getPropertyAsInt("Ice.IPv6") == 0 && @@ -1043,7 +1244,7 @@ allTests(const Ice::CommunicatorPtr& communicator) // sent over the wire and returned by the server without losing // the opaque endpoints. // - Ice::ObjectPrx p2 = derived->echo(p1); + Ice::ObjectPrxPtr p2 = derived->echo(p1); pstr = communicator->proxyToString(p2); if(ssl) { diff --git a/cpp/test/Ice/proxy/Client.cpp b/cpp/test/Ice/proxy/Client.cpp index 6eed51d0287..b436481d8ac 100644 --- a/cpp/test/Ice/proxy/Client.cpp +++ b/cpp/test/Ice/proxy/Client.cpp @@ -18,8 +18,8 @@ using namespace std; int run(int, char**, const Ice::CommunicatorPtr& communicator, const Ice::InitializationData&) { - Test::MyClassPrx allTests(const Ice::CommunicatorPtr&); - Test::MyClassPrx myClass = allTests(communicator); + Test::MyClassPrxPtr allTests(const Ice::CommunicatorPtr&); + Test::MyClassPrxPtr myClass = allTests(communicator); myClass->shutdown(); diff --git a/cpp/test/Ice/proxy/Collocated.cpp b/cpp/test/Ice/proxy/Collocated.cpp index 6c008378319..3612987454d 100644 --- a/cpp/test/Ice/proxy/Collocated.cpp +++ b/cpp/test/Ice/proxy/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"); - adapter->add(new MyDerivedClassI, communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), communicator->stringToIdentity("test")); //adapter->activate(); // Don't activate OA to ensure collocation is used. - Test::MyClassPrx allTests(const Ice::CommunicatorPtr&); + Test::MyClassPrxPtr allTests(const Ice::CommunicatorPtr&); allTests(communicator); return EXIT_SUCCESS; diff --git a/cpp/test/Ice/proxy/Makefile b/cpp/test/Ice/proxy/Makefile index fd028031a2f..803fb4d002d 100644 --- a/cpp/test/Ice/proxy/Makefile +++ b/cpp/test/Ice/proxy/Makefile @@ -49,7 +49,7 @@ GENPIC = no include $(top_srcdir)/config/Make.rules -CPPFLAGS := -I. -I../../include $(CPPFLAGS) +CPPFLAGS := -I. -I../../include -I../../../src $(CPPFLAGS) $(CLIENT): $(COBJS) rm -f $@ diff --git a/cpp/test/Ice/proxy/Makefile.mak b/cpp/test/Ice/proxy/Makefile.mak index c08163168a4..55b8cc66b0f 100644 --- a/cpp/test/Ice/proxy/Makefile.mak +++ b/cpp/test/Ice/proxy/Makefile.mak @@ -52,7 +52,7 @@ OBJS = $(COBJS) \ !include $(top_srcdir)/config/Make.rules.mak -CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN +CPPFLAGS = -I. -I../../include -I../../../src $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT).pdb diff --git a/cpp/test/Ice/proxy/Server.cpp b/cpp/test/Ice/proxy/Server.cpp index 10195276471..f9b26da3b59 100644 --- a/cpp/test/Ice/proxy/Server.cpp +++ b/cpp/test/Ice/proxy/Server.cpp @@ -20,7 +20,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(new MyDerivedClassI, communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), communicator->stringToIdentity("test")); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/proxy/ServerAMD.cpp b/cpp/test/Ice/proxy/ServerAMD.cpp index f0f85af4b9f..a27b9df15ac 100644 --- a/cpp/test/Ice/proxy/ServerAMD.cpp +++ b/cpp/test/Ice/proxy/ServerAMD.cpp @@ -20,7 +20,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(new MyDerivedClassI, communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), communicator->stringToIdentity("test")); adapter->activate(); TEST_READY communicator->waitForShutdown(); diff --git a/cpp/test/Ice/proxy/TestAMDI.cpp b/cpp/test/Ice/proxy/TestAMDI.cpp index 401f276292c..54098ebd7ae 100644 --- a/cpp/test/Ice/proxy/TestAMDI.cpp +++ b/cpp/test/Ice/proxy/TestAMDI.cpp @@ -11,10 +11,42 @@ #include <TestAMDI.h> #include <TestCommon.h> +using namespace std; + MyDerivedClassI::MyDerivedClassI() { } +#ifdef ICE_CPP11_MAPPING +void +MyDerivedClassI::echo_async( + const shared_ptr<Ice::ObjectPrx>& obj, + function<void (const shared_ptr<Ice::ObjectPrx>&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + response(obj); +} + +void +MyDerivedClassI::shutdown_async( + function<void ()> response, + function<void (const exception_ptr&)>, + const Ice::Current& current) +{ + current.adapter->getCommunicator()->shutdown(); + response(); +} + +void +MyDerivedClassI::getContext_async( + function<void (const Ice::Context&)> response, + function<void (const exception_ptr&)>, + const Ice::Current&) +{ + response(_ctx); +} +#else void MyDerivedClassI::echo_async(const Test::AMD_MyDerivedClass_echoPtr& cb, const Ice::ObjectPrx& obj, const Ice::Current&) { @@ -33,10 +65,14 @@ MyDerivedClassI::getContext_async(const Test::AMD_MyClass_getContextPtr& cb, con { cb->ice_response(_ctx); } - +#endif bool -MyDerivedClassI::ice_isA(const std::string& s, const Ice::Current& current) const +MyDerivedClassI::ice_isA(const string& s, const Ice::Current& current) const { _ctx = current.ctx; +#ifdef ICE_CPP11_MAPPING + return Test::MyDerivedClassDisp::ice_isA(s, current); +#else return Test::MyDerivedClass::ice_isA(s, current); +#endif } diff --git a/cpp/test/Ice/proxy/TestAMDI.h b/cpp/test/Ice/proxy/TestAMDI.h index b25a0b1dd29..b3400f4f83d 100644 --- a/cpp/test/Ice/proxy/TestAMDI.h +++ b/cpp/test/Ice/proxy/TestAMDI.h @@ -12,19 +12,41 @@ #include <TestAMD.h> -class MyDerivedClassI : public Test::MyDerivedClass +class MyDerivedClassI : +#ifdef ICE_CPP11_MAPPING + public Test::MyDerivedClassDisp +#else + public Test::MyDerivedClass +#endif { public: MyDerivedClassI(); +#ifdef ICE_CPP11_MAPPING + virtual void echo_async( + const std::shared_ptr<Ice::ObjectPrx>&, + ::std::function<void (const ::std::shared_ptr<Ice::ObjectPrx>&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void shutdown_async( + ::std::function<void ()>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); + + virtual void getContext_async( + ::std::function<void (const Ice::Context&)>, + ::std::function<void (const ::std::exception_ptr&)>, + const Ice::Current&); +#else virtual void echo_async(const Test::AMD_MyDerivedClass_echoPtr&, const Ice::ObjectPrx&, const Ice::Current&); virtual void shutdown_async(const Test::AMD_MyClass_shutdownPtr&, const Ice::Current&); virtual void getContext_async(const Test::AMD_MyClass_getContextPtr& cb, const Ice::Current&); +#endif virtual bool ice_isA(const std::string&, const Ice::Current&) const; - private: mutable Ice::Context _ctx; diff --git a/cpp/test/Ice/proxy/TestI.cpp b/cpp/test/Ice/proxy/TestI.cpp index e8412bbac8c..7ffde953fad 100644 --- a/cpp/test/Ice/proxy/TestI.cpp +++ b/cpp/test/Ice/proxy/TestI.cpp @@ -17,8 +17,8 @@ MyDerivedClassI::MyDerivedClassI() { } -Ice::ObjectPrx -MyDerivedClassI::echo(const Ice::ObjectPrx& obj, const Ice::Current&) +Ice::ObjectPrxPtr +MyDerivedClassI::echo(const Ice::ObjectPrxPtr& obj, const Ice::Current&) { return obj; } @@ -39,5 +39,9 @@ bool MyDerivedClassI::ice_isA(const std::string& s, const Ice::Current& current) const { _ctx = current.ctx; +#ifdef ICE_CPP11_MAPPING + return Test::MyDerivedClassDisp::ice_isA(s, current); +#else return Test::MyDerivedClass::ice_isA(s, current); +#endif } diff --git a/cpp/test/Ice/proxy/TestI.h b/cpp/test/Ice/proxy/TestI.h index 9aaea330ef0..f032507e3d8 100644 --- a/cpp/test/Ice/proxy/TestI.h +++ b/cpp/test/Ice/proxy/TestI.h @@ -12,13 +12,18 @@ #include <Test.h> -class MyDerivedClassI : public Test::MyDerivedClass +class MyDerivedClassI : +#ifdef ICE_CPP11_MAPPING + public Test::MyDerivedClassDisp +#else + public Test::MyDerivedClass +#endif { public: MyDerivedClassI(); - virtual Ice::ObjectPrx echo(const Ice::ObjectPrx&, const Ice::Current&); + virtual Ice::ObjectPrxPtr echo(const Ice::ObjectPrxPtr&, const Ice::Current&); virtual void shutdown(const Ice::Current&); virtual Ice::Context getContext(const Ice::Current&); virtual bool ice_isA(const std::string&, const Ice::Current&) const; diff --git a/cpp/test/Ice/retry/.depend.mak b/cpp/test/Ice/retry/.depend.mak index dc709470a7f..adb5a97e8da 100755 --- a/cpp/test/Ice/retry/.depend.mak +++ b/cpp/test/Ice/retry/.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\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -96,6 +98,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" \ @@ -104,6 +107,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" \ @@ -144,7 +148,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" \ @@ -158,6 +162,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" \ @@ -169,7 +174,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" \ @@ -192,7 +196,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" \ @@ -225,6 +228,7 @@ InstrumentationI.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" \ @@ -233,6 +237,7 @@ InstrumentationI.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" \ @@ -273,7 +278,7 @@ InstrumentationI.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" \ @@ -287,6 +292,7 @@ InstrumentationI.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" \ @@ -298,7 +304,6 @@ InstrumentationI.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" \ @@ -321,7 +326,6 @@ InstrumentationI.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" \ @@ -352,6 +356,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" \ @@ -360,6 +365,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" \ @@ -400,7 +406,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" \ @@ -414,6 +420,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" \ @@ -425,7 +432,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" \ @@ -448,7 +454,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" \ @@ -482,6 +487,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" \ @@ -490,6 +496,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" \ @@ -530,7 +537,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" \ @@ -544,6 +551,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" \ @@ -555,7 +563,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" \ @@ -578,7 +585,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" \ @@ -607,6 +613,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" \ @@ -615,6 +622,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" \ @@ -655,7 +663,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" \ @@ -669,6 +677,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" \ @@ -680,7 +689,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" \ @@ -703,7 +711,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" \ @@ -736,6 +743,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" \ @@ -744,6 +752,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" \ @@ -784,7 +793,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" \ @@ -798,6 +807,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" \ @@ -809,7 +819,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" \ @@ -832,7 +841,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/servantLocator/.depend.mak b/cpp/test/Ice/servantLocator/.depend.mak index 6fa2f15c7e6..c12e76ab764 100755 --- a/cpp/test/Ice/servantLocator/.depend.mak +++ b/cpp/test/Ice/servantLocator/.depend.mak @@ -19,6 +19,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" \ @@ -27,6 +28,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" \ @@ -61,7 +63,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" \ @@ -70,13 +72,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" \ @@ -102,6 +104,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" \ @@ -110,6 +113,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" \ @@ -150,7 +154,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" \ @@ -164,6 +168,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" \ @@ -175,7 +180,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" \ @@ -197,7 +201,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" \ @@ -229,6 +232,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" \ @@ -237,6 +241,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" \ @@ -277,7 +282,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" \ @@ -291,6 +296,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" \ @@ -302,7 +308,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" \ @@ -325,7 +330,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" \ @@ -376,6 +380,7 @@ TestI.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -383,6 +388,7 @@ TestI.obj: \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -411,7 +417,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" \ @@ -424,6 +430,7 @@ TestI.obj: \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -435,7 +442,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" \ @@ -457,7 +463,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" \ @@ -486,6 +491,7 @@ ServantLocatorI.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" \ @@ -494,6 +500,7 @@ ServantLocatorI.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" \ @@ -534,7 +541,7 @@ ServantLocatorI.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" \ @@ -548,6 +555,7 @@ ServantLocatorI.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" \ @@ -559,7 +567,6 @@ ServantLocatorI.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" \ @@ -582,7 +589,6 @@ ServantLocatorI.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" \ @@ -615,6 +621,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" \ @@ -623,6 +630,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" \ @@ -663,7 +671,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" \ @@ -677,6 +685,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" \ @@ -688,7 +697,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" \ @@ -710,7 +718,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" \ @@ -742,6 +749,7 @@ TestAMD.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" \ @@ -750,6 +758,7 @@ TestAMD.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" \ @@ -784,7 +793,7 @@ TestAMD.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" \ @@ -793,6 +802,7 @@ TestAMD.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" \ @@ -800,7 +810,6 @@ TestAMD.obj: \ "$(includedir)\Ice\IncomingAsync.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" \ @@ -844,6 +853,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -851,6 +861,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -879,7 +890,7 @@ TestAMDI.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" \ @@ -892,6 +903,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -903,7 +915,6 @@ TestAMDI.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" \ @@ -925,7 +936,6 @@ TestAMDI.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" \ @@ -954,6 +964,7 @@ ServerAMD.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" \ @@ -962,6 +973,7 @@ ServerAMD.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" \ @@ -1002,7 +1014,7 @@ ServerAMD.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" \ @@ -1016,6 +1028,7 @@ ServerAMD.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" \ @@ -1027,7 +1040,6 @@ ServerAMD.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" \ @@ -1049,7 +1061,6 @@ ServerAMD.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" \ @@ -1084,6 +1095,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" \ @@ -1092,6 +1104,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" \ @@ -1132,7 +1145,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" \ @@ -1146,6 +1159,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" \ @@ -1157,7 +1171,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" \ @@ -1179,7 +1192,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/services/.depend.mak b/cpp/test/Ice/services/.depend.mak index a730edad423..d3ae3494aa7 100755 --- a/cpp/test/Ice/services/.depend.mak +++ b/cpp/test/Ice/services/.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\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -96,6 +98,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" \ @@ -104,6 +107,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" \ @@ -144,7 +148,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" \ @@ -158,6 +162,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" \ @@ -169,7 +174,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" \ @@ -192,7 +196,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" \ @@ -224,6 +227,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" \ @@ -232,6 +236,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" \ @@ -272,7 +277,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" \ @@ -286,6 +291,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" \ @@ -297,7 +303,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" \ @@ -320,7 +325,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" \ diff --git a/cpp/test/Ice/slicing/exceptions/.depend.mak b/cpp/test/Ice/slicing/exceptions/.depend.mak index 6147ee954dc..9abe3d1215d 100755 --- a/cpp/test/Ice/slicing/exceptions/.depend.mak +++ b/cpp/test/Ice/slicing/exceptions/.depend.mak @@ -31,6 +31,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" \ @@ -39,6 +40,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" \ @@ -73,7 +75,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" \ @@ -82,13 +84,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" \ @@ -114,6 +116,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" \ @@ -122,6 +125,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" \ @@ -162,7 +166,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" \ @@ -176,6 +180,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" \ @@ -187,7 +192,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" \ @@ -210,7 +214,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" \ @@ -240,6 +243,7 @@ ClientPrivate.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" \ @@ -248,6 +252,7 @@ ClientPrivate.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" \ @@ -282,7 +287,7 @@ ClientPrivate.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" \ @@ -291,13 +296,13 @@ ClientPrivate.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" \ "Test.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ @@ -324,6 +329,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" \ @@ -332,6 +338,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" \ @@ -372,7 +379,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" \ @@ -386,6 +393,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" \ @@ -397,7 +405,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" \ @@ -420,7 +427,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" \ @@ -451,6 +457,7 @@ ServerPrivate.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" \ @@ -459,6 +466,7 @@ ServerPrivate.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" \ @@ -493,7 +501,7 @@ ServerPrivate.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" \ @@ -502,13 +510,13 @@ ServerPrivate.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" \ "Test.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ @@ -534,6 +542,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" \ @@ -542,6 +551,7 @@ TestI.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" \ @@ -576,7 +586,7 @@ TestI.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" \ @@ -585,13 +595,13 @@ TestI.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" \ "Test.h" \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ @@ -634,7 +644,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" \ @@ -665,6 +674,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" \ @@ -673,6 +683,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" \ @@ -713,7 +724,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" \ @@ -727,6 +738,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" \ @@ -738,7 +750,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" \ @@ -761,7 +772,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" \ @@ -793,6 +803,7 @@ TestAMD.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" \ @@ -801,6 +812,7 @@ TestAMD.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" \ @@ -835,7 +847,7 @@ TestAMD.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" \ @@ -844,6 +856,7 @@ TestAMD.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" \ @@ -851,7 +864,6 @@ TestAMD.obj: \ "$(includedir)\Ice\IncomingAsync.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" \ @@ -875,6 +887,7 @@ ServerPrivateAMD.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" \ @@ -883,6 +896,7 @@ ServerPrivateAMD.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" \ @@ -917,7 +931,7 @@ ServerPrivateAMD.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" \ @@ -926,6 +940,7 @@ ServerPrivateAMD.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" \ @@ -933,7 +948,6 @@ ServerPrivateAMD.obj: \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "TestAMD.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ @@ -959,6 +973,7 @@ TestAMDI.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" \ @@ -967,6 +982,7 @@ TestAMDI.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" \ @@ -1001,7 +1017,7 @@ TestAMDI.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" \ @@ -1010,6 +1026,7 @@ TestAMDI.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" \ @@ -1017,7 +1034,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "TestAMD.h" \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ @@ -1059,7 +1075,6 @@ TestAMDI.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" \ @@ -1090,6 +1105,7 @@ ServerAMD.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" \ @@ -1098,6 +1114,7 @@ ServerAMD.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" \ @@ -1138,7 +1155,7 @@ ServerAMD.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" \ @@ -1152,6 +1169,7 @@ ServerAMD.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" \ @@ -1163,7 +1181,6 @@ ServerAMD.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" \ @@ -1186,7 +1203,6 @@ ServerAMD.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/slicing/objects/.depend.mak b/cpp/test/Ice/slicing/objects/.depend.mak index aa4ed1ef281..6fac2ce0ead 100755 --- a/cpp/test/Ice/slicing/objects/.depend.mak +++ b/cpp/test/Ice/slicing/objects/.depend.mak @@ -34,6 +34,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" \ @@ -42,6 +43,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" \ @@ -76,7 +78,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" \ @@ -85,6 +87,7 @@ 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" \ @@ -92,7 +95,6 @@ Test.obj: \ "$(includedir)\Ice\IncomingAsync.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" \ @@ -116,6 +118,7 @@ ClientPrivate.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" \ @@ -124,6 +127,7 @@ ClientPrivate.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" \ @@ -158,7 +162,7 @@ ClientPrivate.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" \ @@ -167,6 +171,7 @@ ClientPrivate.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" \ @@ -174,7 +179,6 @@ ClientPrivate.obj: \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "Test.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ @@ -201,6 +205,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" \ @@ -209,6 +214,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" \ @@ -249,7 +255,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" \ @@ -263,6 +269,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" \ @@ -274,7 +281,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" \ @@ -297,7 +303,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" \ @@ -330,6 +335,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" \ @@ -338,6 +344,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" \ @@ -378,7 +385,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" \ @@ -392,6 +399,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" \ @@ -403,7 +411,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" \ @@ -426,7 +433,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" \ @@ -457,6 +463,7 @@ Forward.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" \ @@ -465,6 +472,7 @@ Forward.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" \ @@ -499,7 +507,7 @@ Forward.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" \ @@ -508,13 +516,13 @@ Forward.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" \ @@ -537,6 +545,7 @@ ServerPrivate.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" \ @@ -545,6 +554,7 @@ ServerPrivate.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" \ @@ -579,7 +589,7 @@ ServerPrivate.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" \ @@ -588,6 +598,7 @@ ServerPrivate.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" \ @@ -595,7 +606,6 @@ ServerPrivate.obj: \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "Test.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ @@ -621,6 +631,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" \ @@ -629,6 +640,7 @@ TestI.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" \ @@ -663,7 +675,7 @@ TestI.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" \ @@ -672,6 +684,7 @@ TestI.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" \ @@ -679,7 +692,6 @@ TestI.obj: \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "Test.h" \ "Forward.h" \ "$(includedir)\Ice\Ice.h" \ @@ -722,7 +734,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" \ @@ -753,6 +764,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" \ @@ -761,6 +773,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" \ @@ -801,7 +814,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" \ @@ -815,6 +828,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" \ @@ -826,7 +840,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" \ @@ -849,7 +862,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" \ @@ -882,6 +894,7 @@ TestAMD.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" \ @@ -890,6 +903,7 @@ TestAMD.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" \ @@ -924,7 +938,7 @@ TestAMD.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" \ @@ -933,6 +947,7 @@ TestAMD.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" \ @@ -940,7 +955,6 @@ TestAMD.obj: \ "$(includedir)\Ice\IncomingAsync.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" \ @@ -964,6 +978,7 @@ ServerPrivateAMD.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" \ @@ -972,6 +987,7 @@ ServerPrivateAMD.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" \ @@ -1006,7 +1022,7 @@ ServerPrivateAMD.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" \ @@ -1015,6 +1031,7 @@ ServerPrivateAMD.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" \ @@ -1022,7 +1039,6 @@ ServerPrivateAMD.obj: \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "TestAMD.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ @@ -1048,6 +1064,7 @@ TestAMDI.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" \ @@ -1056,6 +1073,7 @@ TestAMDI.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" \ @@ -1090,7 +1108,7 @@ TestAMDI.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" \ @@ -1099,6 +1117,7 @@ TestAMDI.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" \ @@ -1106,7 +1125,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "TestAMD.h" \ "Forward.h" \ "$(includedir)\Ice\Ice.h" \ @@ -1149,7 +1167,6 @@ TestAMDI.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" \ @@ -1180,6 +1197,7 @@ ServerAMD.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" \ @@ -1188,6 +1206,7 @@ ServerAMD.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" \ @@ -1228,7 +1247,7 @@ ServerAMD.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" \ @@ -1242,6 +1261,7 @@ ServerAMD.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" \ @@ -1253,7 +1273,6 @@ ServerAMD.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" \ @@ -1276,7 +1295,6 @@ ServerAMD.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/stream/.depend.mak b/cpp/test/Ice/stream/.depend.mak index c6421b8e608..96709144f71 100755 --- a/cpp/test/Ice/stream/.depend.mak +++ b/cpp/test/Ice/stream/.depend.mak @@ -17,6 +17,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" \ @@ -25,6 +26,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" \ @@ -59,7 +61,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" \ @@ -68,13 +70,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\BuiltinSequences.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\Outgoing.h" \ @@ -100,6 +102,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" \ @@ -108,6 +111,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" \ @@ -148,7 +152,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" \ @@ -162,6 +166,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" \ @@ -173,7 +178,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" \ @@ -196,7 +200,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" \ diff --git a/cpp/test/Ice/stringConverter/.depend.mak b/cpp/test/Ice/stringConverter/.depend.mak index c2fb276f381..14fb5c6f44f 100755 --- a/cpp/test/Ice/stringConverter/.depend.mak +++ b/cpp/test/Ice/stringConverter/.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 @@ 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" \ @@ -234,6 +238,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" \ @@ -274,7 +279,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" \ @@ -288,6 +293,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" \ @@ -299,7 +305,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" \ @@ -322,7 +327,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" \ diff --git a/cpp/test/Ice/threadPoolPriority/.depend.mak b/cpp/test/Ice/threadPoolPriority/.depend.mak index b9d72e1a44f..ffbfce8d58f 100755 --- a/cpp/test/Ice/threadPoolPriority/.depend.mak +++ b/cpp/test/Ice/threadPoolPriority/.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\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -96,6 +98,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" \ @@ -104,6 +107,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" \ @@ -144,7 +148,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" \ @@ -158,6 +162,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" \ @@ -169,7 +174,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" \ @@ -192,7 +196,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" \ @@ -224,6 +227,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" \ @@ -232,6 +236,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" \ @@ -272,7 +277,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" \ @@ -286,6 +291,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" \ @@ -297,7 +303,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" \ @@ -320,7 +325,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" \ @@ -352,6 +356,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" \ @@ -360,6 +365,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" \ @@ -400,7 +406,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" \ @@ -414,6 +420,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" \ @@ -425,7 +432,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" \ @@ -448,7 +454,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" \ @@ -476,6 +481,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" \ @@ -484,6 +490,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" \ @@ -524,7 +531,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" \ @@ -538,6 +545,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" \ @@ -549,7 +557,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" \ @@ -572,7 +579,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" \ @@ -605,6 +611,7 @@ ServerCustomThreadPool.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" \ @@ -613,6 +620,7 @@ ServerCustomThreadPool.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" \ @@ -653,7 +661,7 @@ ServerCustomThreadPool.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" \ @@ -667,6 +675,7 @@ ServerCustomThreadPool.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" \ @@ -678,7 +687,6 @@ ServerCustomThreadPool.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" \ @@ -701,7 +709,6 @@ ServerCustomThreadPool.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/timeout/.depend.mak b/cpp/test/Ice/timeout/.depend.mak index 92d9520a9a2..df7c1716b35 100755 --- a/cpp/test/Ice/timeout/.depend.mak +++ b/cpp/test/Ice/timeout/.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\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -95,6 +97,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" \ @@ -103,6 +106,7 @@ TestI.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" \ @@ -137,7 +141,7 @@ TestI.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" \ @@ -146,6 +150,7 @@ TestI.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" \ @@ -171,7 +176,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" \ @@ -194,7 +198,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" \ @@ -220,6 +223,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" \ @@ -228,6 +232,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" \ @@ -268,7 +273,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" \ @@ -282,6 +287,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" \ @@ -293,7 +299,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" \ @@ -316,7 +321,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" \ @@ -348,6 +352,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" \ @@ -356,6 +361,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" \ @@ -396,7 +402,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" \ @@ -410,6 +416,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" \ @@ -421,7 +428,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" \ @@ -444,7 +450,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" \ @@ -477,6 +482,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" \ @@ -485,6 +491,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" \ @@ -525,7 +532,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" \ @@ -539,6 +546,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" \ @@ -550,7 +558,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" \ @@ -573,7 +580,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" \ diff --git a/cpp/test/Ice/udp/.depend.mak b/cpp/test/Ice/udp/.depend.mak index 8f46119d3e3..014f4090a05 100755 --- a/cpp/test/Ice/udp/.depend.mak +++ b/cpp/test/Ice/udp/.depend.mak @@ -17,6 +17,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" \ @@ -25,6 +26,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" \ @@ -59,7 +61,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" \ @@ -68,13 +70,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\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -97,6 +99,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" \ @@ -105,6 +108,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" \ @@ -145,7 +149,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" \ @@ -159,6 +163,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" \ @@ -170,7 +175,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" \ @@ -193,7 +197,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" \ @@ -225,6 +228,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" \ @@ -233,6 +237,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" \ @@ -273,7 +278,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" \ @@ -287,6 +292,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" \ @@ -298,7 +304,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" \ @@ -321,7 +326,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" \ @@ -372,6 +376,7 @@ TestI.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -379,6 +384,7 @@ TestI.obj: \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -407,7 +413,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" \ @@ -420,6 +426,7 @@ TestI.obj: \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -431,7 +438,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" \ @@ -453,7 +459,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" \ @@ -481,6 +486,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" \ @@ -489,6 +495,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" \ @@ -529,7 +536,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" \ @@ -543,6 +550,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" \ @@ -554,7 +562,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" \ @@ -577,7 +584,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" \ diff --git a/cpp/test/IceBox/admin/.depend.mak b/cpp/test/IceBox/admin/.depend.mak index 79c202fc823..9dd22223f74 100755 --- a/cpp/test/IceBox/admin/.depend.mak +++ b/cpp/test/IceBox/admin/.depend.mak @@ -19,6 +19,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" \ @@ -27,6 +28,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" \ @@ -61,7 +63,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" \ @@ -70,6 +72,7 @@ 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" \ @@ -79,7 +82,6 @@ Test.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -102,6 +104,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" \ @@ -110,6 +113,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" \ @@ -150,7 +154,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" \ @@ -164,6 +168,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" \ @@ -175,7 +180,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" \ @@ -198,7 +202,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" \ @@ -230,6 +233,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" \ @@ -238,6 +242,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" \ @@ -278,7 +283,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" \ @@ -292,6 +297,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" \ @@ -303,7 +309,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" \ @@ -326,7 +331,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" \ @@ -358,6 +362,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" \ @@ -366,6 +371,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" \ @@ -406,7 +412,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" \ @@ -420,6 +426,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" \ @@ -431,7 +438,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" \ @@ -454,7 +460,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" \ @@ -482,6 +487,7 @@ Service.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" \ @@ -490,6 +496,7 @@ Service.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" \ @@ -530,7 +537,7 @@ Service.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" \ @@ -544,6 +551,7 @@ Service.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" \ @@ -555,7 +563,6 @@ Service.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" \ @@ -578,7 +585,6 @@ Service.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/IceBox/configuration/.depend.mak b/cpp/test/IceBox/configuration/.depend.mak index 34f47b79af2..fe2953e966b 100755 --- a/cpp/test/IceBox/configuration/.depend.mak +++ b/cpp/test/IceBox/configuration/.depend.mak @@ -17,6 +17,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" \ @@ -25,6 +26,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" \ @@ -59,7 +61,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" \ @@ -68,13 +70,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\BuiltinSequences.h" \ "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -97,6 +99,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" \ @@ -105,6 +108,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" \ @@ -145,7 +149,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" \ @@ -159,6 +163,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" \ @@ -170,7 +175,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" \ @@ -193,7 +197,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" \ @@ -225,6 +228,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" \ @@ -233,6 +237,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" \ @@ -273,7 +278,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" \ @@ -287,6 +292,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" \ @@ -298,7 +304,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" \ @@ -321,7 +326,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" \ @@ -353,6 +357,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" \ @@ -361,6 +366,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" \ @@ -401,7 +407,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" \ @@ -415,6 +421,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" \ @@ -426,7 +433,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" \ @@ -449,7 +455,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" \ @@ -477,6 +482,7 @@ Service.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" \ @@ -485,6 +491,7 @@ Service.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" \ @@ -525,7 +532,7 @@ Service.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" \ @@ -539,6 +546,7 @@ Service.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" \ @@ -550,7 +558,6 @@ Service.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" \ @@ -573,7 +580,6 @@ Service.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/IceDiscovery/simple/.depend.mak b/cpp/test/IceDiscovery/simple/.depend.mak index 80524069778..fc201e5e491 100755 --- a/cpp/test/IceDiscovery/simple/.depend.mak +++ b/cpp/test/IceDiscovery/simple/.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\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -96,6 +98,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" \ @@ -104,6 +107,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" \ @@ -144,7 +148,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" \ @@ -158,6 +162,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" \ @@ -169,7 +174,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" \ @@ -192,7 +196,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" \ @@ -224,6 +227,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" \ @@ -232,6 +236,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" \ @@ -272,7 +277,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" \ @@ -286,6 +291,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" \ @@ -297,7 +303,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" \ @@ -320,7 +325,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" \ @@ -371,6 +375,7 @@ TestI.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -378,6 +383,7 @@ TestI.obj: \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -406,7 +412,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" \ @@ -419,6 +425,7 @@ TestI.obj: \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -430,7 +437,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" \ @@ -452,7 +458,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" \ @@ -480,6 +485,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" \ @@ -488,6 +494,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" \ @@ -528,7 +535,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" \ @@ -542,6 +549,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" \ @@ -553,7 +561,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" \ @@ -576,7 +583,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" \ diff --git a/cpp/test/IceGrid/activation/.depend.mak b/cpp/test/IceGrid/activation/.depend.mak index c25c47f7c1a..0a8e26ec134 100755 --- a/cpp/test/IceGrid/activation/.depend.mak +++ b/cpp/test/IceGrid/activation/.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\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -96,6 +98,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" \ @@ -104,6 +107,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" \ @@ -144,7 +148,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" \ @@ -158,6 +162,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" \ @@ -169,7 +174,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" \ @@ -192,7 +196,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" \ @@ -224,6 +227,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" \ @@ -232,6 +236,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" \ @@ -272,7 +277,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" \ @@ -286,6 +291,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" \ @@ -297,7 +303,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" \ @@ -320,7 +325,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" \ @@ -368,6 +372,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" \ @@ -376,6 +381,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" \ @@ -416,7 +422,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" \ @@ -430,6 +436,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" \ @@ -441,7 +448,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" \ @@ -464,7 +470,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" \ @@ -492,6 +497,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" \ @@ -500,6 +506,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" \ @@ -540,7 +547,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" \ @@ -554,6 +561,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" \ @@ -565,7 +573,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" \ @@ -588,7 +595,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" \ diff --git a/cpp/test/IceGrid/admin/.depend.mak b/cpp/test/IceGrid/admin/.depend.mak index 2daf0a33181..441e01cda0c 100755 --- a/cpp/test/IceGrid/admin/.depend.mak +++ b/cpp/test/IceGrid/admin/.depend.mak @@ -15,6 +15,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" \ @@ -23,6 +24,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" \ @@ -63,7 +65,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" \ @@ -77,6 +79,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" \ @@ -88,7 +91,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" \ @@ -111,7 +113,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" \ diff --git a/cpp/test/IceGrid/allocation/.depend.mak b/cpp/test/IceGrid/allocation/.depend.mak index 4275667d41a..395461c6468 100755 --- a/cpp/test/IceGrid/allocation/.depend.mak +++ b/cpp/test/IceGrid/allocation/.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\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -96,6 +98,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" \ @@ -104,6 +107,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" \ @@ -144,7 +148,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" \ @@ -158,6 +162,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" \ @@ -169,7 +174,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" \ @@ -192,7 +196,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" \ @@ -231,6 +234,7 @@ AllTests.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -239,6 +243,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" \ @@ -273,7 +278,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" \ @@ -287,6 +292,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" \ @@ -298,7 +304,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" \ @@ -321,7 +326,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" \ @@ -371,6 +375,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" \ @@ -379,6 +384,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" \ @@ -419,7 +425,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" \ @@ -433,6 +439,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" \ @@ -444,7 +451,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" \ @@ -467,7 +473,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" \ @@ -495,6 +500,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" \ @@ -503,6 +509,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" \ @@ -543,7 +550,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" \ @@ -557,6 +564,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" \ @@ -568,7 +576,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" \ @@ -591,7 +598,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" \ @@ -624,6 +630,7 @@ PermissionsVerifier.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" \ @@ -632,6 +639,7 @@ PermissionsVerifier.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" \ @@ -672,7 +680,7 @@ PermissionsVerifier.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" \ @@ -686,6 +694,7 @@ PermissionsVerifier.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" \ @@ -697,7 +706,6 @@ PermissionsVerifier.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" \ @@ -720,7 +728,6 @@ PermissionsVerifier.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/IceGrid/deployer/.depend.mak b/cpp/test/IceGrid/deployer/.depend.mak index 89051ba24d9..76ce806d5ff 100755 --- a/cpp/test/IceGrid/deployer/.depend.mak +++ b/cpp/test/IceGrid/deployer/.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\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -96,6 +98,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" \ @@ -104,6 +107,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" \ @@ -144,7 +148,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" \ @@ -158,6 +162,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" \ @@ -169,7 +174,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" \ @@ -192,7 +196,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" \ @@ -224,6 +227,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" \ @@ -232,6 +236,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" \ @@ -272,7 +277,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" \ @@ -286,6 +291,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" \ @@ -297,7 +303,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" \ @@ -320,7 +325,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" \ @@ -368,6 +372,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" \ @@ -376,6 +381,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" \ @@ -416,7 +422,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" \ @@ -430,6 +436,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" \ @@ -441,7 +448,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" \ @@ -464,7 +470,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" \ @@ -493,6 +498,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" \ @@ -501,6 +507,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" \ @@ -541,7 +548,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" \ @@ -555,6 +562,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" \ @@ -566,7 +574,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" \ @@ -589,7 +596,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" \ @@ -622,6 +628,7 @@ Service.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" \ @@ -630,6 +637,7 @@ Service.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" \ @@ -670,7 +678,7 @@ Service.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" \ @@ -684,6 +692,7 @@ Service.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" \ @@ -695,7 +704,6 @@ Service.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" \ @@ -718,7 +726,6 @@ Service.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/IceGrid/distribution/.depend.mak b/cpp/test/IceGrid/distribution/.depend.mak index 2211a51b3f7..2fc87e56322 100755 --- a/cpp/test/IceGrid/distribution/.depend.mak +++ b/cpp/test/IceGrid/distribution/.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\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -96,6 +98,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" \ @@ -104,6 +107,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" \ @@ -144,7 +148,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" \ @@ -158,6 +162,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" \ @@ -169,7 +174,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" \ @@ -192,7 +196,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" \ @@ -230,6 +233,7 @@ AllTests.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -238,6 +242,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" \ @@ -272,7 +277,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" \ @@ -286,6 +291,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" \ @@ -297,7 +303,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" \ @@ -320,7 +325,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" \ @@ -368,6 +372,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" \ @@ -376,6 +381,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" \ @@ -416,7 +422,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" \ @@ -430,6 +436,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" \ @@ -441,7 +448,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" \ @@ -464,7 +470,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" \ @@ -492,6 +497,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" \ @@ -500,6 +506,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" \ @@ -540,7 +547,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" \ @@ -554,6 +561,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" \ @@ -565,7 +573,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" \ @@ -588,7 +595,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" \ diff --git a/cpp/test/IceGrid/noRestartUpdate/.depend.mak b/cpp/test/IceGrid/noRestartUpdate/.depend.mak index 99e8541d697..d99a3a60369 100755 --- a/cpp/test/IceGrid/noRestartUpdate/.depend.mak +++ b/cpp/test/IceGrid/noRestartUpdate/.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\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -96,6 +98,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" \ @@ -104,6 +107,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" \ @@ -144,7 +148,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" \ @@ -158,6 +162,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" \ @@ -169,7 +174,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" \ @@ -192,7 +196,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" \ @@ -230,6 +233,7 @@ AllTests.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -238,6 +242,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" \ @@ -272,7 +277,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" \ @@ -286,6 +291,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" \ @@ -297,7 +303,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" \ @@ -320,7 +325,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" \ @@ -368,6 +372,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" \ @@ -376,6 +381,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" \ @@ -416,7 +422,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" \ @@ -430,6 +436,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" \ @@ -441,7 +448,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" \ @@ -464,7 +470,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" \ @@ -492,6 +497,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" \ @@ -500,6 +506,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" \ @@ -540,7 +547,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" \ @@ -554,6 +561,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" \ @@ -565,7 +573,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" \ @@ -588,7 +595,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" \ @@ -621,6 +627,7 @@ Service.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" \ @@ -629,6 +636,7 @@ Service.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" \ @@ -669,7 +677,7 @@ Service.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" \ @@ -683,6 +691,7 @@ Service.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" \ @@ -694,7 +703,6 @@ Service.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" \ @@ -717,7 +725,6 @@ Service.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/IceGrid/noRestartUpdate/AllTests.cpp b/cpp/test/IceGrid/noRestartUpdate/AllTests.cpp index 994a87e9024..84b4a9526d0 100644 --- a/cpp/test/IceGrid/noRestartUpdate/AllTests.cpp +++ b/cpp/test/IceGrid/noRestartUpdate/AllTests.cpp @@ -544,7 +544,7 @@ allTests(const Ice::CommunicatorPtr& communicator) # if defined(__i386) iceboxExe += "32"; # endif -# if defined(ICE_CPP11) +# if defined(ICE_CPP11_COMPILER) iceboxExe += "++11"; # endif #endif diff --git a/cpp/test/IceGrid/replicaGroup/.depend.mak b/cpp/test/IceGrid/replicaGroup/.depend.mak index b77a53a08c5..78a0378a133 100755 --- a/cpp/test/IceGrid/replicaGroup/.depend.mak +++ b/cpp/test/IceGrid/replicaGroup/.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\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -96,6 +98,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" \ @@ -104,6 +107,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" \ @@ -144,7 +148,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" \ @@ -158,6 +162,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" \ @@ -169,7 +174,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" \ @@ -192,7 +196,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" \ @@ -224,6 +227,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" \ @@ -232,6 +236,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" \ @@ -272,7 +277,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" \ @@ -286,6 +291,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" \ @@ -297,7 +303,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" \ @@ -320,7 +325,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" \ @@ -368,6 +372,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" \ @@ -376,6 +381,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" \ @@ -416,7 +422,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" \ @@ -430,6 +436,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" \ @@ -441,7 +448,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" \ @@ -464,7 +470,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" \ @@ -492,6 +497,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" \ @@ -500,6 +506,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" \ @@ -540,7 +547,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" \ @@ -554,6 +561,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" \ @@ -565,7 +573,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" \ @@ -588,7 +595,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" \ @@ -621,6 +627,7 @@ Service.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" \ @@ -629,6 +636,7 @@ Service.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" \ @@ -669,7 +677,7 @@ Service.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" \ @@ -683,6 +691,7 @@ Service.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" \ @@ -694,7 +703,6 @@ Service.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" \ @@ -717,7 +725,6 @@ Service.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/IceGrid/replication/.depend.mak b/cpp/test/IceGrid/replication/.depend.mak index 69d02294086..424ac8034e2 100755 --- a/cpp/test/IceGrid/replication/.depend.mak +++ b/cpp/test/IceGrid/replication/.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\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -96,6 +98,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" \ @@ -104,6 +107,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" \ @@ -144,7 +148,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" \ @@ -158,6 +162,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" \ @@ -169,7 +174,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" \ @@ -192,7 +196,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" \ @@ -224,6 +227,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" \ @@ -232,6 +236,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" \ @@ -272,7 +277,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" \ @@ -286,6 +291,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" \ @@ -297,7 +303,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" \ @@ -320,7 +325,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" \ @@ -368,6 +372,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" \ @@ -376,6 +381,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" \ @@ -416,7 +422,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" \ @@ -430,6 +436,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" \ @@ -441,7 +448,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" \ @@ -464,7 +470,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" \ @@ -492,6 +497,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" \ @@ -500,6 +506,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" \ @@ -540,7 +547,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" \ @@ -554,6 +561,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" \ @@ -565,7 +573,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" \ @@ -588,7 +595,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" \ diff --git a/cpp/test/IceGrid/session/.depend.mak b/cpp/test/IceGrid/session/.depend.mak index ba646e88178..933177e4034 100755 --- a/cpp/test/IceGrid/session/.depend.mak +++ b/cpp/test/IceGrid/session/.depend.mak @@ -19,6 +19,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" \ @@ -27,6 +28,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" \ @@ -61,7 +63,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" \ @@ -70,13 +72,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)\Glacier2\PermissionsVerifier.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ @@ -105,6 +107,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" \ @@ -113,6 +116,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" \ @@ -153,7 +157,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" \ @@ -167,6 +171,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" \ @@ -178,7 +183,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" \ @@ -201,7 +205,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" \ @@ -238,6 +241,7 @@ AllTests.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -246,6 +250,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" \ @@ -280,7 +285,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" \ @@ -294,6 +299,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" \ @@ -305,7 +311,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" \ @@ -328,7 +333,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" \ @@ -378,6 +382,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" \ @@ -386,6 +391,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" \ @@ -426,7 +432,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" \ @@ -440,6 +446,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" \ @@ -451,7 +458,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" \ @@ -474,7 +480,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" \ @@ -512,6 +517,7 @@ PermissionsVerifier.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" \ @@ -520,6 +526,7 @@ PermissionsVerifier.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" \ @@ -560,7 +567,7 @@ PermissionsVerifier.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" \ @@ -574,6 +581,7 @@ PermissionsVerifier.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" \ @@ -585,7 +593,6 @@ PermissionsVerifier.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" \ @@ -608,7 +615,6 @@ PermissionsVerifier.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/IceGrid/simple/.depend.mak b/cpp/test/IceGrid/simple/.depend.mak index fbaf06d7aa7..ba2e54050a4 100755 --- a/cpp/test/IceGrid/simple/.depend.mak +++ b/cpp/test/IceGrid/simple/.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\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -96,6 +98,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" \ @@ -104,6 +107,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" \ @@ -144,7 +148,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" \ @@ -158,6 +162,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" \ @@ -169,7 +174,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" \ @@ -192,7 +196,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" \ @@ -243,6 +246,7 @@ AllTests.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -250,6 +254,7 @@ AllTests.obj: \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -278,7 +283,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" \ @@ -291,6 +296,7 @@ AllTests.obj: \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -302,7 +308,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" \ @@ -324,7 +329,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" \ @@ -368,6 +372,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" \ @@ -376,6 +381,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" \ @@ -416,7 +422,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" \ @@ -430,6 +436,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" \ @@ -441,7 +448,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" \ @@ -464,7 +470,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" \ @@ -492,6 +497,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" \ @@ -500,6 +506,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" \ @@ -540,7 +547,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" \ @@ -554,6 +561,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" \ @@ -565,7 +573,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" \ @@ -588,7 +595,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" \ diff --git a/cpp/test/IceGrid/update/.depend.mak b/cpp/test/IceGrid/update/.depend.mak index 2211a51b3f7..2fc87e56322 100755 --- a/cpp/test/IceGrid/update/.depend.mak +++ b/cpp/test/IceGrid/update/.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\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -96,6 +98,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" \ @@ -104,6 +107,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" \ @@ -144,7 +148,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" \ @@ -158,6 +162,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" \ @@ -169,7 +174,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" \ @@ -192,7 +196,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" \ @@ -230,6 +233,7 @@ AllTests.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -238,6 +242,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" \ @@ -272,7 +277,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" \ @@ -286,6 +291,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" \ @@ -297,7 +303,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" \ @@ -320,7 +325,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" \ @@ -368,6 +372,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" \ @@ -376,6 +381,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" \ @@ -416,7 +422,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" \ @@ -430,6 +436,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" \ @@ -441,7 +448,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" \ @@ -464,7 +470,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" \ @@ -492,6 +497,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" \ @@ -500,6 +506,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" \ @@ -540,7 +547,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" \ @@ -554,6 +561,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" \ @@ -565,7 +573,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" \ @@ -588,7 +595,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" \ diff --git a/cpp/test/IceGrid/update/AllTests.cpp b/cpp/test/IceGrid/update/AllTests.cpp index a5f6e1f1761..79edfeda68d 100644 --- a/cpp/test/IceGrid/update/AllTests.cpp +++ b/cpp/test/IceGrid/update/AllTests.cpp @@ -560,7 +560,7 @@ allTests(const Ice::CommunicatorPtr& communicator) # if defined(__i386) iceboxExe += "32"; # endif -# if defined(ICE_CPP11) +# if defined(ICE_CPP11_COMPILER) iceboxExe += "++11"; # endif #endif diff --git a/cpp/test/IceSSL/configuration/.depend.mak b/cpp/test/IceSSL/configuration/.depend.mak index 9229e4a5d73..d404ab117a9 100755 --- a/cpp/test/IceSSL/configuration/.depend.mak +++ b/cpp/test/IceSSL/configuration/.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\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -96,6 +98,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" \ @@ -104,6 +107,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" \ @@ -144,7 +148,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" \ @@ -158,6 +162,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" \ @@ -169,7 +174,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" \ @@ -192,7 +196,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" \ @@ -223,6 +226,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" \ @@ -231,6 +235,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" \ @@ -271,7 +276,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" \ @@ -285,6 +290,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" \ @@ -296,7 +302,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" \ @@ -319,7 +324,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" \ @@ -486,6 +491,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" \ @@ -494,6 +500,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" \ @@ -534,7 +541,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" \ @@ -548,6 +555,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" \ @@ -559,7 +567,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" \ @@ -582,7 +589,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" \ diff --git a/cpp/test/IceStorm/federation/.depend.mak b/cpp/test/IceStorm/federation/.depend.mak index 51c9a594753..d47a900c4b7 100755 --- a/cpp/test/IceStorm/federation/.depend.mak +++ b/cpp/test/IceStorm/federation/.depend.mak @@ -16,6 +16,7 @@ Event.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 @@ Event.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 @@ Event.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 @@ Event.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\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -96,6 +98,7 @@ Publisher.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" \ @@ -104,6 +107,7 @@ Publisher.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" \ @@ -144,7 +148,7 @@ Publisher.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" \ @@ -158,6 +162,7 @@ Publisher.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" \ @@ -169,7 +174,6 @@ Publisher.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" \ @@ -192,7 +196,6 @@ Publisher.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" \ @@ -222,6 +225,7 @@ Subscriber.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" \ @@ -230,6 +234,7 @@ Subscriber.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" \ @@ -270,7 +275,7 @@ Subscriber.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" \ @@ -284,6 +289,7 @@ Subscriber.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" \ @@ -295,7 +301,6 @@ Subscriber.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" \ @@ -318,7 +323,6 @@ Subscriber.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/IceStorm/federation2/.depend.mak b/cpp/test/IceStorm/federation2/.depend.mak index 0a36fff01d3..46a81acef02 100755 --- a/cpp/test/IceStorm/federation2/.depend.mak +++ b/cpp/test/IceStorm/federation2/.depend.mak @@ -16,6 +16,7 @@ Event.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 @@ Event.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 @@ Event.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 @@ Event.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\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -116,6 +118,7 @@ Publisher.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -123,6 +126,7 @@ Publisher.obj: \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -151,7 +155,7 @@ Publisher.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" \ @@ -164,6 +168,7 @@ Publisher.obj: \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -175,7 +180,6 @@ Publisher.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" \ @@ -197,7 +201,6 @@ Publisher.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" \ @@ -227,6 +230,7 @@ Subscriber.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" \ @@ -235,6 +239,7 @@ Subscriber.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" \ @@ -275,7 +280,7 @@ Subscriber.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" \ @@ -289,6 +294,7 @@ Subscriber.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" \ @@ -300,7 +306,6 @@ Subscriber.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" \ @@ -323,7 +328,6 @@ Subscriber.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/IceStorm/rep1/.depend.mak b/cpp/test/IceStorm/rep1/.depend.mak index 883aade2386..64d7a1b0430 100755 --- a/cpp/test/IceStorm/rep1/.depend.mak +++ b/cpp/test/IceStorm/rep1/.depend.mak @@ -16,6 +16,7 @@ Single.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 @@ Single.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 @@ Single.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 @@ Single.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\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -96,6 +98,7 @@ Publisher.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" \ @@ -104,6 +107,7 @@ Publisher.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" \ @@ -144,7 +148,7 @@ Publisher.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" \ @@ -158,6 +162,7 @@ Publisher.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" \ @@ -169,7 +174,6 @@ Publisher.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" \ @@ -192,7 +196,6 @@ Publisher.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" \ @@ -247,6 +250,7 @@ Subscriber.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -254,6 +258,7 @@ Subscriber.obj: \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -282,7 +287,7 @@ Subscriber.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" \ @@ -295,6 +300,7 @@ Subscriber.obj: \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -306,7 +312,6 @@ Subscriber.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" \ @@ -328,7 +333,6 @@ Subscriber.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" \ @@ -379,6 +383,7 @@ Sub.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -386,6 +391,7 @@ Sub.obj: \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -414,7 +420,7 @@ Sub.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" \ @@ -427,6 +433,7 @@ Sub.obj: \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -438,7 +445,6 @@ Sub.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" \ @@ -460,7 +466,6 @@ Sub.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/IceStorm/repgrid/.depend.mak b/cpp/test/IceStorm/repgrid/.depend.mak index adda0464171..cc8cea436d7 100755 --- a/cpp/test/IceStorm/repgrid/.depend.mak +++ b/cpp/test/IceStorm/repgrid/.depend.mak @@ -16,6 +16,7 @@ Single.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 @@ Single.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 @@ Single.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 @@ Single.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\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -96,6 +98,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" \ @@ -104,6 +107,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" \ @@ -144,7 +148,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" \ @@ -158,6 +162,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" \ @@ -169,7 +174,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" \ @@ -192,7 +196,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" \ diff --git a/cpp/test/IceStorm/repstress/.depend.mak b/cpp/test/IceStorm/repstress/.depend.mak index f1fe645ff9d..744bff612e3 100755 --- a/cpp/test/IceStorm/repstress/.depend.mak +++ b/cpp/test/IceStorm/repstress/.depend.mak @@ -19,6 +19,7 @@ Single.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" \ @@ -27,6 +28,7 @@ Single.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" \ @@ -61,7 +63,7 @@ Single.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" \ @@ -70,13 +72,13 @@ Single.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\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -97,6 +99,7 @@ Controller.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" \ @@ -105,6 +108,7 @@ Controller.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" \ @@ -139,7 +143,7 @@ Controller.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" \ @@ -148,13 +152,13 @@ Controller.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\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -177,6 +181,7 @@ Publisher.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" \ @@ -185,6 +190,7 @@ Publisher.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" \ @@ -225,7 +231,7 @@ Publisher.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" \ @@ -239,6 +245,7 @@ Publisher.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" \ @@ -250,7 +257,6 @@ Publisher.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" \ @@ -273,7 +279,6 @@ Publisher.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" \ @@ -327,6 +332,7 @@ Subscriber.obj: \ "$(includedir)\Ice\ProxyHandle.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" \ @@ -334,6 +340,7 @@ Subscriber.obj: \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\Iterator.h" \ + "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -362,7 +369,7 @@ Subscriber.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" \ @@ -375,6 +382,7 @@ Subscriber.obj: \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ + "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ @@ -386,7 +394,6 @@ Subscriber.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" \ @@ -408,7 +415,6 @@ Subscriber.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" \ @@ -440,6 +446,7 @@ Control.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" \ @@ -448,6 +455,7 @@ Control.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" \ @@ -488,7 +496,7 @@ Control.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" \ @@ -502,6 +510,7 @@ Control.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" \ @@ -513,7 +522,6 @@ Control.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" \ @@ -536,7 +544,6 @@ Control.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/IceStorm/single/.depend.mak b/cpp/test/IceStorm/single/.depend.mak index 50560f88fee..fd6375acde5 100755 --- a/cpp/test/IceStorm/single/.depend.mak +++ b/cpp/test/IceStorm/single/.depend.mak @@ -16,6 +16,7 @@ Single.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 @@ Single.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 @@ Single.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 @@ Single.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\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -96,6 +98,7 @@ Publisher.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" \ @@ -104,6 +107,7 @@ Publisher.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" \ @@ -144,7 +148,7 @@ Publisher.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" \ @@ -158,6 +162,7 @@ Publisher.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" \ @@ -169,7 +174,6 @@ Publisher.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" \ @@ -192,7 +196,6 @@ Publisher.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" \ @@ -222,6 +225,7 @@ Subscriber.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" \ @@ -230,6 +234,7 @@ Subscriber.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" \ @@ -270,7 +275,7 @@ Subscriber.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" \ @@ -284,6 +289,7 @@ Subscriber.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" \ @@ -295,7 +301,6 @@ Subscriber.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" \ @@ -318,7 +323,6 @@ Subscriber.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/IceStorm/stress/.depend.mak b/cpp/test/IceStorm/stress/.depend.mak index bacf31b965e..fd67bc06cc3 100755 --- a/cpp/test/IceStorm/stress/.depend.mak +++ b/cpp/test/IceStorm/stress/.depend.mak @@ -16,6 +16,7 @@ Event.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 @@ Event.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 @@ Event.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 @@ Event.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\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -96,6 +98,7 @@ Publisher.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" \ @@ -104,6 +107,7 @@ Publisher.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" \ @@ -144,7 +148,7 @@ Publisher.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" \ @@ -158,6 +162,7 @@ Publisher.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" \ @@ -169,7 +174,6 @@ Publisher.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" \ @@ -192,7 +196,6 @@ Publisher.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" \ @@ -224,6 +227,7 @@ Subscriber.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" \ @@ -232,6 +236,7 @@ Subscriber.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" \ @@ -272,7 +277,7 @@ Subscriber.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" \ @@ -286,6 +291,7 @@ Subscriber.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" \ @@ -297,7 +303,6 @@ Subscriber.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" \ @@ -320,7 +325,6 @@ Subscriber.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/IceUtil/timer/Client.cpp b/cpp/test/IceUtil/timer/Client.cpp index a893352cb66..a527869e731 100644 --- a/cpp/test/IceUtil/timer/Client.cpp +++ b/cpp/test/IceUtil/timer/Client.cpp @@ -15,6 +15,22 @@ using namespace IceUtil; using namespace std; +template<typename T> +struct TargetLess +{ + bool operator()(const T& lhs, const T& rhs) const + { + if(lhs && rhs) + { + return *lhs < *rhs; + } + else + { + return !lhs && rhs; + } + } +}; + class TestTask : public IceUtil::TimerTask, IceUtil::Monitor<IceUtil::Mutex> { public: @@ -96,7 +112,7 @@ private: IceUtil::Time _scheduledTime; int _count; }; -typedef IceUtil::Handle<TestTask> TestTaskPtr; +ICE_DEFINE_PTR(TestTaskPtr, TestTask); class DestroyTask : public IceUtil::TimerTask, IceUtil::Monitor<IceUtil::Mutex> @@ -134,7 +150,7 @@ private: IceUtil::TimerPtr _timer; bool _run; }; -typedef IceUtil::Handle<DestroyTask> DestroyTaskPtr; +ICE_DEFINE_PTR(DestroyTaskPtr, DestroyTask); int main(int, char**) { @@ -143,7 +159,7 @@ int main(int, char**) IceUtil::TimerPtr timer = new IceUtil::Timer(); { - TestTaskPtr task = new TestTask(); + TestTaskPtr task = ICE_MAKE_SHARED(TestTask); timer->schedule(task, IceUtil::Time()); task->waitForRun(); task->clear(); @@ -165,7 +181,7 @@ int main(int, char**) } { - TestTaskPtr task = new TestTask(); + TestTaskPtr task = ICE_MAKE_SHARED(TestTask); test(!timer->cancel(task)); timer->schedule(task, IceUtil::Time::seconds(1)); test(!task->hasRun() && timer->cancel(task) && !task->hasRun()); @@ -179,7 +195,7 @@ int main(int, char**) IceUtil::Time start = IceUtil::Time::now(IceUtil::Time::Monotonic) + IceUtil::Time::milliSeconds(500); for(int i = 0; i < 20; ++i) { - tasks.push_back(new TestTask(IceUtil::Time::milliSeconds(500 + i * 50))); + tasks.push_back(ICE_MAKE_SHARED(TestTask, IceUtil::Time::milliSeconds(500 + i * 50))); } random_shuffle(tasks.begin(), tasks.end()); @@ -196,7 +212,11 @@ int main(int, char**) test(IceUtil::Time::now(IceUtil::Time::Monotonic) > start); +#ifdef ICE_CPP11_MAPPING + sort(tasks.begin(), tasks.end(), TargetLess<shared_ptr<TestTask>>()); +#else sort(tasks.begin(), tasks.end()); +#endif for(p = tasks.begin(); p + 1 != tasks.end(); ++p) { if((*p)->getRunTime() > (*(p + 1))->getRunTime()) @@ -207,7 +227,7 @@ int main(int, char**) } { - TestTaskPtr task = new TestTask(); + TestTaskPtr task = ICE_MAKE_SHARED(TestTask); timer->scheduleRepeated(task, IceUtil::Time::milliSeconds(20)); IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(500)); test(task->hasRun()); @@ -227,7 +247,7 @@ int main(int, char**) { { IceUtil::TimerPtr timer = new IceUtil::Timer(); - DestroyTaskPtr destroyTask = new DestroyTask(timer); + DestroyTaskPtr destroyTask = ICE_MAKE_SHARED(DestroyTask, timer); timer->schedule(destroyTask, IceUtil::Time()); destroyTask->waitForRun(); try @@ -241,7 +261,7 @@ int main(int, char**) } { IceUtil::TimerPtr timer = new IceUtil::Timer(); - TestTaskPtr testTask = new TestTask(); + TestTaskPtr testTask = ICE_MAKE_SHARED(TestTask); timer->schedule(testTask, IceUtil::Time()); timer->destroy(); try diff --git a/cpp/test/Makefile b/cpp/test/Makefile index 83555938843..ae9994a3c45 100644 --- a/cpp/test/Makefile +++ b/cpp/test/Makefile @@ -10,6 +10,12 @@ top_srcdir = .. include $(top_srcdir)/config/Make.rules +ifeq ($(CPP11_MAPPING),yes) +SUBDIRS = IceUtil \ + Slice \ + Ice +else + SUBDIRS = IceUtil \ Slice \ @@ -24,6 +30,7 @@ SUBDIRS := $(SUBDIRS) \ Glacier2 \ IceGrid endif +endif .PHONY: $(EVERYTHING) $(SUBDIRS) diff --git a/cpp/test/Makefile.mak b/cpp/test/Makefile.mak index ecd60946b01..650f43b2528 100644 --- a/cpp/test/Makefile.mak +++ b/cpp/test/Makefile.mak @@ -15,6 +15,10 @@ top_srcdir = .. SUBDIRS = Ice +!elseif "$(CPP11_MAPPING)" == "yes" +SUBDIRS = IceUtil \ + Slice \ + Ice !elseif "$(CPP_COMPILER)" == "VC100" SUBDIRS = IceUtil \ Slice \ diff --git a/cpp/test/Slice/errorDetection/DictionaryRedefinition.err b/cpp/test/Slice/errorDetection/DictionaryRedefinition.err index cdf3844e1f4..a09dbc4846b 100644 --- a/cpp/test/Slice/errorDetection/DictionaryRedefinition.err +++ b/cpp/test/Slice/errorDetection/DictionaryRedefinition.err @@ -1,6 +1 @@ -DictionaryRedefinition.ice:15: illegal identifier: `Dictionary' differs from keyword `dictionary' only in capitalization -DictionaryRedefinition.ice:15: keyword `dictionary' cannot be used as dictionary name -DictionaryRedefinition.ice:16: illegal identifier: `Dictionary' differs from keyword `dictionary' only in capitalization -DictionaryRedefinition.ice:16: redefinition of dictionary `dictionary' as dictionary -DictionaryRedefinition.ice:16: keyword `dictionary' cannot be used as dictionary name DictionaryRedefinition.ice:18: redefinition of dictionary `foo' as dictionary diff --git a/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice b/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice index a3996cce063..553e0bd4254 100644 --- a/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice +++ b/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice @@ -12,8 +12,8 @@ module Test { -dictionary<int, long> Dictionary; -dictionary<int, long> Dictionary; +// dictionary<int, long> Dictionary; +// dictionary<int, long> Dictionary; dictionary<int, long> foo; dictionary<int, long> foo; diff --git a/cpp/test/Slice/errorDetection/IdentAsKeyword.err b/cpp/test/Slice/errorDetection/IdentAsKeyword.err index 0d6512d4601..d3bbb497a7b 100644 --- a/cpp/test/Slice/errorDetection/IdentAsKeyword.err +++ b/cpp/test/Slice/errorDetection/IdentAsKeyword.err @@ -1,92 +1,85 @@ -IdentAsKeyword.ice:15: illegal identifier: `INTERFACE' differs from keyword `interface' only in capitalization -IdentAsKeyword.ice:17: illegal identifier: `Void' differs from keyword `void' only in capitalization -IdentAsKeyword.ice:17: keyword `void' cannot be used as exception name +IdentAsKeyword.ice:15: syntax error +IdentAsKeyword.ice:17: `Void': an exception can be defined only at module scope IdentAsKeyword.ice:18: keyword `int' cannot be used as exception name -IdentAsKeyword.ice:20: illegal identifier: `OUT' differs from keyword `out' only in capitalization -IdentAsKeyword.ice:20: keyword `out' cannot be used as struct name +IdentAsKeyword.ice:18: `int': an exception can be defined only at module scope +IdentAsKeyword.ice:20: `OUT': a structure can be defined only at module scope IdentAsKeyword.ice:21: keyword `double' cannot be used as struct name -IdentAsKeyword.ice:23: illegal identifier: `Int' differs from keyword `int' only in capitalization -IdentAsKeyword.ice:23: keyword `int' cannot be used as data member name +IdentAsKeyword.ice:21: `double': a structure can be defined only at module scope +IdentAsKeyword.ice:23: `s1': a structure can be defined only at module scope +IdentAsKeyword.ice:24: `s2': a structure can be defined only at module scope IdentAsKeyword.ice:24: keyword `byte' cannot be used as data member name -IdentAsKeyword.ice:25: illegal identifier: `Int' differs from keyword `int' only in capitalization -IdentAsKeyword.ice:25: keyword `int' cannot be used as data member name +IdentAsKeyword.ice:25: `s3': a structure can be defined only at module scope +IdentAsKeyword.ice:26: `s4': a structure can be defined only at module scope IdentAsKeyword.ice:26: keyword `byte' cannot be used as data member name -IdentAsKeyword.ice:28: illegal identifier: `inTERface' differs from keyword `interface' only in capitalization -IdentAsKeyword.ice:28: keyword `interface' cannot be used as class name +IdentAsKeyword.ice:28: `inTERface': a class can be defined only at module scope IdentAsKeyword.ice:29: keyword `interface' cannot be used as class name -IdentAsKeyword.ice:31: illegal identifier: `MOdule' differs from keyword `module' only in capitalization -IdentAsKeyword.ice:31: keyword `module' cannot be used as class name +IdentAsKeyword.ice:29: `interface': a class can be defined only at module scope +IdentAsKeyword.ice:31: `MOdule': a class can be defined only at module scope IdentAsKeyword.ice:32: keyword `module' cannot be used as class name -IdentAsKeyword.ice:32: redefinition of class `module' -IdentAsKeyword.ice:34: illegal identifier: `extendS' differs from keyword `extends' only in capitalization -IdentAsKeyword.ice:34: keyword `extends' cannot be used as data member name -IdentAsKeyword.ice:35: redefinition of class `C' +IdentAsKeyword.ice:32: `module': a class can be defined only at module scope +IdentAsKeyword.ice:34: `C': a class can be defined only at module scope +IdentAsKeyword.ice:35: `C': a class can be defined only at module scope IdentAsKeyword.ice:35: keyword `extends' cannot be used as data member name +IdentAsKeyword.ice:36: `D': a class can be defined only at module scope IdentAsKeyword.ice:36: keyword `extends' cannot be used as data member name IdentAsKeyword.ice:38: keyword `local' cannot be used as interface name -IdentAsKeyword.ice:39: illegal identifier: `Local' differs from keyword `local' only in capitalization -IdentAsKeyword.ice:39: keyword `local' cannot be used as interface name +IdentAsKeyword.ice:38: `local': an interface can be defined only at module scope +IdentAsKeyword.ice:39: `Local': an interface can be defined only at module scope IdentAsKeyword.ice:41: keyword `Object' cannot be used as interface name -IdentAsKeyword.ice:42: illegal identifier: `object' differs from keyword `Object' only in capitalization -IdentAsKeyword.ice:42: keyword `Object' cannot be used as interface name -IdentAsKeyword.ice:42: redefinition of interface `Object' +IdentAsKeyword.ice:41: `Object': an interface can be defined only at module scope +IdentAsKeyword.ice:42: `object': an interface can be defined only at module scope IdentAsKeyword.ice:43: keyword `long' cannot be used as interface name -IdentAsKeyword.ice:45: illegal identifier: `impLEments' differs from keyword `implements' only in capitalization -IdentAsKeyword.ice:45: keyword `implements' cannot be used as sequence name -IdentAsKeyword.ice:46: redefinition of sequence `implements' as sequence +IdentAsKeyword.ice:43: `long': an interface can be defined only at module scope +IdentAsKeyword.ice:45: `impLEments': a sequence can be defined only at module scope +IdentAsKeyword.ice:46: sequence `implements' differs only in capitalization from sequence `impLEments' IdentAsKeyword.ice:46: keyword `implements' cannot be used as sequence name +IdentAsKeyword.ice:47: `short': a sequence can be defined only at module scope IdentAsKeyword.ice:47: keyword `short' cannot be used as sequence name IdentAsKeyword.ice:49: syntax error -IdentAsKeyword.ice:50: illegal identifier: `moDule' differs from keyword `module' only in capitalization -IdentAsKeyword.ice:50: syntax error +IdentAsKeyword.ice:50: `moDule' is not defined +IdentAsKeyword.ice:52: `throws': a dictionary can be defined only at module scope IdentAsKeyword.ice:52: keyword `throws' cannot be used as dictionary name -IdentAsKeyword.ice:53: illegal identifier: `thRows' differs from keyword `throws' only in capitalization -IdentAsKeyword.ice:53: redefinition of dictionary `throws' as dictionary -IdentAsKeyword.ice:53: keyword `throws' cannot be used as dictionary name -IdentAsKeyword.ice:54: illegal identifier: `LOCALobject' differs from keyword `LocalObject' only in capitalization -IdentAsKeyword.ice:54: keyword `LocalObject' cannot be used as dictionary name +IdentAsKeyword.ice:53: dictionary `thRows' differs only in capitalization from dictionary `throws' +IdentAsKeyword.ice:54: `LOCALobject': a dictionary can be defined only at module scope IdentAsKeyword.ice:56: syntax error -IdentAsKeyword.ice:57: illegal identifier: `MODULE' differs from keyword `module' only in capitalization -IdentAsKeyword.ice:57: syntax error +IdentAsKeyword.ice:57: `MODULE' is not defined IdentAsKeyword.ice:59: syntax error -IdentAsKeyword.ice:60: illegal identifier: `OUT' differs from keyword `out' only in capitalization -IdentAsKeyword.ice:60: syntax error +IdentAsKeyword.ice:60: `d4': a dictionary can be defined only at module scope IdentAsKeyword.ice:62: syntax error -IdentAsKeyword.ice:63: illegal identifier: `VOID' differs from keyword `void' only in capitalization -IdentAsKeyword.ice:63: syntax error -IdentAsKeyword.ice:63: illegal identifier: `VOID' differs from keyword `void' only in capitalization +IdentAsKeyword.ice:63: `VOID' is an exception, which cannot be used as a type IdentAsKeyword.ice:65: keyword `local' cannot be used as enumeration name -IdentAsKeyword.ice:65: redefinition of interface `local' as enumeration -IdentAsKeyword.ice:66: illegal identifier: `LOCAL' differs from keyword `local' only in capitalization -IdentAsKeyword.ice:66: keyword `local' cannot be used as enumeration name -IdentAsKeyword.ice:66: redefinition of interface `local' as enumeration -IdentAsKeyword.ice:66: enumerator `c' differs only in capitalization from class `C' +IdentAsKeyword.ice:65: `local': an enumeration can be defined only at module scope +IdentAsKeyword.ice:66: enumeration `LOCAL' differs only in capitalization from enumeration `local' +IdentAsKeyword.ice:68: `e1': an enumeration can be defined only at module scope IdentAsKeyword.ice:68: keyword `long' cannot be used as enumerator IdentAsKeyword.ice:68: keyword `byte' cannot be used as enumerator -IdentAsKeyword.ice:69: illegal identifier: `LONG' differs from keyword `long' only in capitalization -IdentAsKeyword.ice:69: keyword `long' cannot be used as enumerator -IdentAsKeyword.ice:69: illegal identifier: `BYTE' differs from keyword `byte' only in capitalization -IdentAsKeyword.ice:69: keyword `byte' cannot be used as enumerator -IdentAsKeyword.ice:71: keyword `module' cannot be used as operation name -IdentAsKeyword.ice:72: illegal identifier: `mODule' differs from keyword `module' only in capitalization -IdentAsKeyword.ice:72: keyword `module' cannot be used as operation name -IdentAsKeyword.ice:74: keyword `exception' cannot be used as operation name -IdentAsKeyword.ice:75: illegal identifier: `EXception' differs from keyword `exception' only in capitalization -IdentAsKeyword.ice:75: keyword `exception' cannot be used as operation name +IdentAsKeyword.ice:69: `e2': an enumeration can be defined only at module scope +IdentAsKeyword.ice:71: `i1': an interface can be defined only at module scope +IdentAsKeyword.ice:72: `i2': an interface can be defined only at module scope +IdentAsKeyword.ice:74: `i3': an interface can be defined only at module scope +IdentAsKeyword.ice:75: `i4': an interface can be defined only at module scope +IdentAsKeyword.ice:77: `i5': an interface can be defined only at module scope IdentAsKeyword.ice:77: syntax error -IdentAsKeyword.ice:78: illegal identifier: `OUT' differs from keyword `out' only in capitalization -IdentAsKeyword.ice:78: syntax error -IdentAsKeyword.ice:80: keyword `byte' cannot be used as parameter name -IdentAsKeyword.ice:81: illegal identifier: `BYTE' differs from keyword `byte' only in capitalization -IdentAsKeyword.ice:81: keyword `byte' cannot be used as parameter name -IdentAsKeyword.ice:83: keyword `byte' cannot be used as parameter name -IdentAsKeyword.ice:84: illegal identifier: `BYTE' differs from keyword `byte' only in capitalization -IdentAsKeyword.ice:84: keyword `byte' cannot be used as parameter name +IdentAsKeyword.ice:78: `i6': an interface can be defined only at module scope +IdentAsKeyword.ice:80: `i7': an interface can be defined only at module scope +IdentAsKeyword.ice:81: `i8': an interface can be defined only at module scope +IdentAsKeyword.ice:83: `i9': an interface can be defined only at module scope +IdentAsKeyword.ice:84: `i10': an interface can be defined only at module scope +IdentAsKeyword.ice:86: `true': an interface can be defined only at module scope IdentAsKeyword.ice:88: illegal leading underscore in identifier `_a' +IdentAsKeyword.ice:88: `_a': an interface can be defined only at module scope IdentAsKeyword.ice:89: illegal leading underscore in identifier `_true' +IdentAsKeyword.ice:89: `_true': an interface can be defined only at module scope IdentAsKeyword.ice:90: illegal leading underscore in identifier `_true' +IdentAsKeyword.ice:90: `_true': an interface can be defined only at module scope IdentAsKeyword.ice:92: illegal trailing underscore in identifier `b_' +IdentAsKeyword.ice:92: `b_': an interface can be defined only at module scope IdentAsKeyword.ice:94: illegal double underscore in identifier `b__c' +IdentAsKeyword.ice:94: `b__c': an interface can be defined only at module scope IdentAsKeyword.ice:95: illegal double underscore in identifier `b___c' +IdentAsKeyword.ice:95: `b___c': an interface can be defined only at module scope IdentAsKeyword.ice:97: illegal underscore in identifier `a_b' +IdentAsKeyword.ice:97: `a_b': an interface can be defined only at module scope IdentAsKeyword.ice:98: illegal underscore in identifier `a_b_c' +IdentAsKeyword.ice:98: `a_b_c': an interface can be defined only at module scope +IdentAsKeyword.ice:100: syntax error diff --git a/cpp/test/Slice/errorDetection/IdentAsKeywordUnderscore.err b/cpp/test/Slice/errorDetection/IdentAsKeywordUnderscore.err index fde90f00e3e..8d9dc11b53d 100644 --- a/cpp/test/Slice/errorDetection/IdentAsKeywordUnderscore.err +++ b/cpp/test/Slice/errorDetection/IdentAsKeywordUnderscore.err @@ -1,90 +1,83 @@ -IdentAsKeywordUnderscore.ice:15: illegal identifier: `INTERFACE' differs from keyword `interface' only in capitalization -IdentAsKeywordUnderscore.ice:17: illegal identifier: `Void' differs from keyword `void' only in capitalization -IdentAsKeywordUnderscore.ice:17: keyword `void' cannot be used as exception name +IdentAsKeywordUnderscore.ice:15: syntax error +IdentAsKeywordUnderscore.ice:17: `Void': an exception can be defined only at module scope IdentAsKeywordUnderscore.ice:18: keyword `int' cannot be used as exception name -IdentAsKeywordUnderscore.ice:20: illegal identifier: `OUT' differs from keyword `out' only in capitalization -IdentAsKeywordUnderscore.ice:20: keyword `out' cannot be used as struct name +IdentAsKeywordUnderscore.ice:18: `int': an exception can be defined only at module scope +IdentAsKeywordUnderscore.ice:20: `OUT': a structure can be defined only at module scope IdentAsKeywordUnderscore.ice:21: keyword `double' cannot be used as struct name -IdentAsKeywordUnderscore.ice:23: illegal identifier: `Int' differs from keyword `int' only in capitalization -IdentAsKeywordUnderscore.ice:23: keyword `int' cannot be used as data member name +IdentAsKeywordUnderscore.ice:21: `double': a structure can be defined only at module scope +IdentAsKeywordUnderscore.ice:23: `s1': a structure can be defined only at module scope +IdentAsKeywordUnderscore.ice:24: `s2': a structure can be defined only at module scope IdentAsKeywordUnderscore.ice:24: keyword `byte' cannot be used as data member name -IdentAsKeywordUnderscore.ice:25: illegal identifier: `Int' differs from keyword `int' only in capitalization -IdentAsKeywordUnderscore.ice:25: keyword `int' cannot be used as data member name +IdentAsKeywordUnderscore.ice:25: `s3': a structure can be defined only at module scope +IdentAsKeywordUnderscore.ice:26: `s4': a structure can be defined only at module scope IdentAsKeywordUnderscore.ice:26: keyword `byte' cannot be used as data member name -IdentAsKeywordUnderscore.ice:28: illegal identifier: `inTERface' differs from keyword `interface' only in capitalization -IdentAsKeywordUnderscore.ice:28: keyword `interface' cannot be used as class name +IdentAsKeywordUnderscore.ice:28: `inTERface': a class can be defined only at module scope IdentAsKeywordUnderscore.ice:29: keyword `interface' cannot be used as class name -IdentAsKeywordUnderscore.ice:31: illegal identifier: `MOdule' differs from keyword `module' only in capitalization -IdentAsKeywordUnderscore.ice:31: keyword `module' cannot be used as class name +IdentAsKeywordUnderscore.ice:29: `interface': a class can be defined only at module scope +IdentAsKeywordUnderscore.ice:31: `MOdule': a class can be defined only at module scope IdentAsKeywordUnderscore.ice:32: keyword `module' cannot be used as class name -IdentAsKeywordUnderscore.ice:32: redefinition of class `module' -IdentAsKeywordUnderscore.ice:34: illegal identifier: `extendS' differs from keyword `extends' only in capitalization -IdentAsKeywordUnderscore.ice:34: keyword `extends' cannot be used as data member name -IdentAsKeywordUnderscore.ice:35: redefinition of class `C' +IdentAsKeywordUnderscore.ice:32: `module': a class can be defined only at module scope +IdentAsKeywordUnderscore.ice:34: `C': a class can be defined only at module scope +IdentAsKeywordUnderscore.ice:35: `C': a class can be defined only at module scope IdentAsKeywordUnderscore.ice:35: keyword `extends' cannot be used as data member name +IdentAsKeywordUnderscore.ice:36: `D': a class can be defined only at module scope IdentAsKeywordUnderscore.ice:36: keyword `extends' cannot be used as data member name IdentAsKeywordUnderscore.ice:38: keyword `local' cannot be used as interface name -IdentAsKeywordUnderscore.ice:39: illegal identifier: `Local' differs from keyword `local' only in capitalization -IdentAsKeywordUnderscore.ice:39: keyword `local' cannot be used as interface name +IdentAsKeywordUnderscore.ice:38: `local': an interface can be defined only at module scope +IdentAsKeywordUnderscore.ice:39: `Local': an interface can be defined only at module scope IdentAsKeywordUnderscore.ice:41: keyword `Object' cannot be used as interface name -IdentAsKeywordUnderscore.ice:42: illegal identifier: `object' differs from keyword `Object' only in capitalization -IdentAsKeywordUnderscore.ice:42: keyword `Object' cannot be used as interface name -IdentAsKeywordUnderscore.ice:42: redefinition of interface `Object' +IdentAsKeywordUnderscore.ice:41: `Object': an interface can be defined only at module scope +IdentAsKeywordUnderscore.ice:42: `object': an interface can be defined only at module scope IdentAsKeywordUnderscore.ice:43: keyword `long' cannot be used as interface name -IdentAsKeywordUnderscore.ice:45: illegal identifier: `impLEments' differs from keyword `implements' only in capitalization -IdentAsKeywordUnderscore.ice:45: keyword `implements' cannot be used as sequence name -IdentAsKeywordUnderscore.ice:46: redefinition of sequence `implements' as sequence +IdentAsKeywordUnderscore.ice:43: `long': an interface can be defined only at module scope +IdentAsKeywordUnderscore.ice:45: `impLEments': a sequence can be defined only at module scope +IdentAsKeywordUnderscore.ice:46: sequence `implements' differs only in capitalization from sequence `impLEments' IdentAsKeywordUnderscore.ice:46: keyword `implements' cannot be used as sequence name +IdentAsKeywordUnderscore.ice:47: `short': a sequence can be defined only at module scope IdentAsKeywordUnderscore.ice:47: keyword `short' cannot be used as sequence name IdentAsKeywordUnderscore.ice:49: syntax error -IdentAsKeywordUnderscore.ice:50: illegal identifier: `moDule' differs from keyword `module' only in capitalization -IdentAsKeywordUnderscore.ice:50: syntax error +IdentAsKeywordUnderscore.ice:50: `moDule' is not defined +IdentAsKeywordUnderscore.ice:52: `throws': a dictionary can be defined only at module scope IdentAsKeywordUnderscore.ice:52: keyword `throws' cannot be used as dictionary name -IdentAsKeywordUnderscore.ice:53: illegal identifier: `thRows' differs from keyword `throws' only in capitalization -IdentAsKeywordUnderscore.ice:53: redefinition of dictionary `throws' as dictionary -IdentAsKeywordUnderscore.ice:53: keyword `throws' cannot be used as dictionary name -IdentAsKeywordUnderscore.ice:54: illegal identifier: `LOCALobject' differs from keyword `LocalObject' only in capitalization -IdentAsKeywordUnderscore.ice:54: keyword `LocalObject' cannot be used as dictionary name +IdentAsKeywordUnderscore.ice:53: dictionary `thRows' differs only in capitalization from dictionary `throws' +IdentAsKeywordUnderscore.ice:54: `LOCALobject': a dictionary can be defined only at module scope IdentAsKeywordUnderscore.ice:56: syntax error -IdentAsKeywordUnderscore.ice:57: illegal identifier: `MODULE' differs from keyword `module' only in capitalization -IdentAsKeywordUnderscore.ice:57: syntax error +IdentAsKeywordUnderscore.ice:57: `MODULE' is not defined IdentAsKeywordUnderscore.ice:59: syntax error -IdentAsKeywordUnderscore.ice:60: illegal identifier: `OUT' differs from keyword `out' only in capitalization -IdentAsKeywordUnderscore.ice:60: syntax error +IdentAsKeywordUnderscore.ice:60: `d4': a dictionary can be defined only at module scope IdentAsKeywordUnderscore.ice:62: syntax error -IdentAsKeywordUnderscore.ice:63: illegal identifier: `VOID' differs from keyword `void' only in capitalization -IdentAsKeywordUnderscore.ice:63: syntax error -IdentAsKeywordUnderscore.ice:63: illegal identifier: `VOID' differs from keyword `void' only in capitalization +IdentAsKeywordUnderscore.ice:63: `VOID' is an exception, which cannot be used as a type IdentAsKeywordUnderscore.ice:65: keyword `local' cannot be used as enumeration name -IdentAsKeywordUnderscore.ice:65: redefinition of interface `local' as enumeration -IdentAsKeywordUnderscore.ice:66: illegal identifier: `LOCAL' differs from keyword `local' only in capitalization -IdentAsKeywordUnderscore.ice:66: keyword `local' cannot be used as enumeration name -IdentAsKeywordUnderscore.ice:66: redefinition of interface `local' as enumeration -IdentAsKeywordUnderscore.ice:66: enumerator `c' differs only in capitalization from class `C' +IdentAsKeywordUnderscore.ice:65: `local': an enumeration can be defined only at module scope +IdentAsKeywordUnderscore.ice:66: enumeration `LOCAL' differs only in capitalization from enumeration `local' +IdentAsKeywordUnderscore.ice:68: `e1': an enumeration can be defined only at module scope IdentAsKeywordUnderscore.ice:68: keyword `long' cannot be used as enumerator IdentAsKeywordUnderscore.ice:68: keyword `byte' cannot be used as enumerator -IdentAsKeywordUnderscore.ice:69: illegal identifier: `LONG' differs from keyword `long' only in capitalization -IdentAsKeywordUnderscore.ice:69: keyword `long' cannot be used as enumerator -IdentAsKeywordUnderscore.ice:69: illegal identifier: `BYTE' differs from keyword `byte' only in capitalization -IdentAsKeywordUnderscore.ice:69: keyword `byte' cannot be used as enumerator -IdentAsKeywordUnderscore.ice:71: keyword `module' cannot be used as operation name -IdentAsKeywordUnderscore.ice:72: illegal identifier: `mODule' differs from keyword `module' only in capitalization -IdentAsKeywordUnderscore.ice:72: keyword `module' cannot be used as operation name -IdentAsKeywordUnderscore.ice:74: keyword `exception' cannot be used as operation name -IdentAsKeywordUnderscore.ice:75: illegal identifier: `EXception' differs from keyword `exception' only in capitalization -IdentAsKeywordUnderscore.ice:75: keyword `exception' cannot be used as operation name +IdentAsKeywordUnderscore.ice:69: `e2': an enumeration can be defined only at module scope +IdentAsKeywordUnderscore.ice:71: `i1': an interface can be defined only at module scope +IdentAsKeywordUnderscore.ice:72: `i2': an interface can be defined only at module scope +IdentAsKeywordUnderscore.ice:74: `i3': an interface can be defined only at module scope +IdentAsKeywordUnderscore.ice:75: `i4': an interface can be defined only at module scope +IdentAsKeywordUnderscore.ice:77: `i5': an interface can be defined only at module scope IdentAsKeywordUnderscore.ice:77: syntax error -IdentAsKeywordUnderscore.ice:78: illegal identifier: `OUT' differs from keyword `out' only in capitalization -IdentAsKeywordUnderscore.ice:78: syntax error -IdentAsKeywordUnderscore.ice:80: keyword `byte' cannot be used as parameter name -IdentAsKeywordUnderscore.ice:81: illegal identifier: `BYTE' differs from keyword `byte' only in capitalization -IdentAsKeywordUnderscore.ice:81: keyword `byte' cannot be used as parameter name -IdentAsKeywordUnderscore.ice:83: keyword `byte' cannot be used as parameter name -IdentAsKeywordUnderscore.ice:84: illegal identifier: `BYTE' differs from keyword `byte' only in capitalization -IdentAsKeywordUnderscore.ice:84: keyword `byte' cannot be used as parameter name +IdentAsKeywordUnderscore.ice:78: `i6': an interface can be defined only at module scope +IdentAsKeywordUnderscore.ice:80: `i7': an interface can be defined only at module scope +IdentAsKeywordUnderscore.ice:81: `i8': an interface can be defined only at module scope +IdentAsKeywordUnderscore.ice:83: `i9': an interface can be defined only at module scope +IdentAsKeywordUnderscore.ice:84: `i10': an interface can be defined only at module scope +IdentAsKeywordUnderscore.ice:86: `true': an interface can be defined only at module scope IdentAsKeywordUnderscore.ice:88: illegal leading underscore in identifier `_a' +IdentAsKeywordUnderscore.ice:88: `_a': an interface can be defined only at module scope IdentAsKeywordUnderscore.ice:89: illegal leading underscore in identifier `_true' +IdentAsKeywordUnderscore.ice:89: `_true': an interface can be defined only at module scope IdentAsKeywordUnderscore.ice:90: illegal leading underscore in identifier `_true' +IdentAsKeywordUnderscore.ice:90: `_true': an interface can be defined only at module scope IdentAsKeywordUnderscore.ice:92: illegal trailing underscore in identifier `b_' +IdentAsKeywordUnderscore.ice:92: `b_': an interface can be defined only at module scope IdentAsKeywordUnderscore.ice:94: illegal double underscore in identifier `b__c' +IdentAsKeywordUnderscore.ice:94: `b__c': an interface can be defined only at module scope IdentAsKeywordUnderscore.ice:95: illegal double underscore in identifier `b___c' +IdentAsKeywordUnderscore.ice:95: `b___c': an interface can be defined only at module scope +IdentAsKeywordUnderscore.ice:97: `a_b': an interface can be defined only at module scope +IdentAsKeywordUnderscore.ice:98: `a_b_c': an interface can be defined only at module scope +IdentAsKeywordUnderscore.ice:100: syntax error diff --git a/cpp/test/Slice/keyword/.depend.mak b/cpp/test/Slice/keyword/.depend.mak index ca8ae1f5bbd..eb0c6006bbc 100755 --- a/cpp/test/Slice/keyword/.depend.mak +++ b/cpp/test/Slice/keyword/.depend.mak @@ -16,6 +16,7 @@ Key.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 @@ Key.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 @@ Key.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,6 +69,7 @@ Key.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" \ @@ -74,7 +77,6 @@ Key.obj: \ "$(includedir)\Ice\IncomingAsync.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" \ @@ -100,6 +102,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" \ @@ -108,6 +111,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" \ @@ -148,7 +152,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" \ @@ -162,6 +166,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" \ @@ -173,7 +178,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" \ @@ -196,7 +200,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" \ diff --git a/cpp/test/Slice/keyword/Client.cpp b/cpp/test/Slice/keyword/Client.cpp index b91cf2abeda..ea833ebce9d 100644 --- a/cpp/test/Slice/keyword/Client.cpp +++ b/cpp/test/Slice/keyword/Client.cpp @@ -16,10 +16,21 @@ using namespace std; class breakI : public _cpp_and::_cpp_break { public: + +#ifdef ICE_CPP11_MAPPING + virtual void case_async(::Ice::Int, + function<void (int)> response, + function<void (const exception_ptr&)>, + const ::Ice::Current&) + { + response(0); + } +#else virtual void case_async(const ::_cpp_and::AMD_break_casePtr& cb, ::Ice::Int, const ::Ice::Current&) { cb->ice_response(0); } +#endif }; class charI: public _cpp_and::_cpp_char @@ -47,9 +58,18 @@ public: class doI : public _cpp_and::_cpp_do { public: +#ifdef ICE_CPP11_MAPPING + virtual void case_async(::Ice::Int, + function<void (int)>, + function<void (const exception_ptr&)>, + const ::Ice::Current&) + { + } +#else virtual void case_async(const ::_cpp_and::AMD_break_casePtr&, ::Ice::Int, const ::Ice::Current&) { } +#endif virtual void _cpp_explicit(const ::Ice::Current&) { } @@ -62,10 +82,21 @@ class friendI : public _cpp_and::_cpp_friend { public: virtual _cpp_and::_cpp_auto - _cpp_goto(_cpp_and::_cpp_continue, const _cpp_and::_cpp_auto&, const _cpp_and::deletePtr&, - const _cpp_and::switchPtr&, const _cpp_and::doPtr&, const _cpp_and::breakPrx&, - const _cpp_and::charPrx&, const _cpp_and::switchPrx&, const _cpp_and::doPrx&, - ::Ice::Int, ::Ice::Int, ::Ice::Int, ::Ice::Int) + _cpp_goto(_cpp_and::_cpp_continue, + const _cpp_and::_cpp_auto&, +#ifdef ICE_CPP11_MAPPING + const _cpp_and::_cpp_delete&, +#else + const _cpp_and::deletePtr&, +#endif + const _cpp_and::switchPtr&, + const _cpp_and::doPtr&, + const _cpp_and::breakPrxPtr&, + const _cpp_and::charPrxPtr&, + const _cpp_and::switchPrxPtr&, + const _cpp_and::doPrxPtr&, + ::Ice::Int, ::Ice::Int, + ::Ice::Int, ::Ice::Int) { return _cpp_and::_cpp_auto(); } @@ -78,32 +109,42 @@ public: void testtypes() { +#ifdef ICE_CPP11_MAPPING + _cpp_and::_cpp_continue a = _cpp_and::_cpp_continue::_cpp_asm; + test(a == _cpp_and::_cpp_continue::_cpp_asm); +#else _cpp_and::_cpp_continue a = _cpp_and::_cpp_asm; test(a); +#endif _cpp_and::_cpp_auto b, b2; b._cpp_default = 0; b2._cpp_default = b._cpp_default; b._cpp_default = b2._cpp_default; +#ifdef ICE_CPP11_MAPPING + _cpp_and::_cpp_delete c; + c._cpp_else = ""; +#else _cpp_and::deletePtr c = new _cpp_and::_cpp_delete(); c->_cpp_else = ""; +#endif - _cpp_and::breakPrx d; + _cpp_and::breakPrxPtr d; int d2; d->_cpp_case(0, d2); - _cpp_and::breakPtr d1 = new breakI(); + _cpp_and::breakPtr d1 = ICE_MAKE_SHARED(breakI); - _cpp_and::charPrx e; + _cpp_and::charPrxPtr e; e->_cpp_explicit(); - _cpp_and::charPtr e1 = new charI(); + _cpp_and::charPtr e1 = ICE_MAKE_SHARED(charI); - _cpp_and::switchPtr f1 = new switchI(); + _cpp_and::switchPtr f1 = ICE_MAKE_SHARED(switchI); - _cpp_and::doPrx g; + _cpp_and::doPrxPtr g; g->_cpp_case(0, d2); g->_cpp_explicit(); - _cpp_and::doPtr g1 = new doI(); + _cpp_and::doPtr g1 = ICE_MAKE_SHARED(doI); _cpp_and::_cpp_extern h; _cpp_and::_cpp_for i; @@ -114,7 +155,7 @@ testtypes() k._cpp_switch = 1; k._cpp_signed = 2; - _cpp_and::friendPtr l = new friendI(); + _cpp_and::friendPtr l = ICE_MAKE_SHARED(friendI); const int m = _cpp_and::_cpp_template; test(m == _cpp_and::_cpp_template); @@ -127,11 +168,11 @@ run(const Ice::CommunicatorPtr& communicator) { communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); - adapter->add(new charI, communicator->stringToIdentity("test")); + adapter->add(ICE_MAKE_SHARED(charI), communicator->stringToIdentity("test")); adapter->activate(); cout << "Testing operation name... " << flush; - _cpp_and::charPrx p = _cpp_and::charPrx::uncheckedCast( + _cpp_and::charPrxPtr p = ICE_UNCHECKED_CAST(_cpp_and::charPrx, adapter->createProxy(communicator->stringToIdentity("test"))); p->_cpp_explicit(); cout << "ok" << endl; diff --git a/cpp/test/Slice/keyword/Key.ice b/cpp/test/Slice/keyword/Key.ice index 53bde99901b..a0846e0acb0 100644 --- a/cpp/test/Slice/keyword/Key.ice +++ b/cpp/test/Slice/keyword/Key.ice @@ -61,8 +61,8 @@ exception sizeof extends return local interface friend { - auto goto(continue if, auto d, delete inline, switch private, do mutable, break* namespace, - char* new, switch* not, do* operator, int or, int protected, int public, int register) + auto goto(continue if, auto d, delete inline, switch private, do mutable, break* namespace, + char* new, switch* not, do* operator, int or, int protected, int public, int register) throws return, sizeof; }; diff --git a/cpp/test/Slice/macros/.depend.mak b/cpp/test/Slice/macros/.depend.mak index 0392268cd73..e850ed85d00 100755 --- a/cpp/test/Slice/macros/.depend.mak +++ b/cpp/test/Slice/macros/.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" \ diff --git a/cpp/test/Slice/macros/Client.cpp b/cpp/test/Slice/macros/Client.cpp index 36c26e47b7a..a4fdb957129 100644 --- a/cpp/test/Slice/macros/Client.cpp +++ b/cpp/test/Slice/macros/Client.cpp @@ -21,11 +21,11 @@ main(int argc, char* argv[]) try { cout << "testing Slice predefined macros... " << flush; - DefaultPtr d = new Default(); + DefaultPtr d = ICE_MAKE_SHARED(Default); test(d->x == 10); test(d->y == 10); - CppOnlyPtr c = new CppOnly(); + CppOnlyPtr c = ICE_MAKE_SHARED(CppOnly); test(c->lang == "cpp"); test(c->version == ICE_INT_VERSION); cout << "ok" << endl; diff --git a/cpp/test/Slice/parser/.depend.mak b/cpp/test/Slice/parser/.depend.mak index f106724fef2..4b73fea7084 100755 --- a/cpp/test/Slice/parser/.depend.mak +++ b/cpp/test/Slice/parser/.depend.mak @@ -21,6 +21,7 @@ CircularA.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" \ @@ -29,6 +30,7 @@ CircularA.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" \ @@ -63,7 +65,7 @@ CircularA.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" \ @@ -72,6 +74,7 @@ CircularA.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" \ @@ -79,7 +82,6 @@ CircularA.obj: \ "CircularB.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -100,6 +102,7 @@ CircularB.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" \ @@ -108,6 +111,7 @@ CircularB.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" \ @@ -142,7 +146,7 @@ CircularB.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" \ @@ -151,6 +155,7 @@ CircularB.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" \ @@ -158,7 +163,6 @@ CircularB.obj: \ "CircularA.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ diff --git a/cpp/test/Slice/structure/.depend.mak b/cpp/test/Slice/structure/.depend.mak index bde39630d82..e73374df995 100755 --- a/cpp/test/Slice/structure/.depend.mak +++ b/cpp/test/Slice/structure/.depend.mak @@ -19,6 +19,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" \ @@ -27,6 +28,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" \ @@ -61,7 +63,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" \ @@ -70,13 +72,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" \ @@ -99,6 +101,7 @@ Forward.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" \ @@ -107,6 +110,7 @@ Forward.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" \ @@ -141,7 +145,7 @@ Forward.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" \ @@ -165,6 +169,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" \ @@ -173,6 +178,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" \ @@ -213,7 +219,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" \ @@ -227,6 +233,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" \ @@ -238,7 +245,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" \ @@ -261,7 +267,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" \ diff --git a/cpp/test/Slice/structure/Client.cpp b/cpp/test/Slice/structure/Client.cpp index c0b88ebd337..1d91a6e3029 100644 --- a/cpp/test/Slice/structure/Client.cpp +++ b/cpp/test/Slice/structure/Client.cpp @@ -38,10 +38,20 @@ allTests(const Ice::CommunicatorPtr& communicator) def_s2.il.push_back(2); def_s2.il.push_back(3); def_s2.sd["abc"] = "def"; +#ifdef ICE_CPP11_MAPPING + def_s2.s = {"name"}; +#else def_s2.s = new S1("name"); - def_s2.cls = new C(5); +#endif + def_s2.cls = ICE_MAKE_SHARED(C, 5); def_s2.prx = communicator->stringToProxy("test"); +#ifndef ICE_CPP11_MAPPING + // + // cpp:comparable required by tests bellow is only + // supported with C++98 mapping. + // + // // Change one primitive member at a time. // @@ -248,7 +258,7 @@ allTests(const Ice::CommunicatorPtr& communicator) v2.prx = 0; test(v1 != v2); } - +#endif cout << "ok" << endl; } |