diff options
| author | Joe George <joe@zeroc.com> | 2015-12-10 17:29:01 -0500 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2015-12-10 17:29:47 -0500 |
| commit | 46de9e2c22f27b091dbb28266856f8b6cc172e71 (patch) | |
| tree | bfb937deea053489fe0ee747c6908fe24c175c8a /cpp | |
| parent | Fix ObjectFactory deprecate metadata and cleanup (diff) | |
| download | ice-46de9e2c22f27b091dbb28266856f8b6cc172e71.tar.bz2 ice-46de9e2c22f27b091dbb28266856f8b6cc172e71.tar.xz ice-46de9e2c22f27b091dbb28266856f8b6cc172e71.zip | |
Fix Windows C++ tests build
Diffstat (limited to 'cpp')
79 files changed, 2992 insertions, 2043 deletions
diff --git a/cpp/test/Glacier2/attack/.depend.mak b/cpp/test/Glacier2/attack/.depend.mak index ebc4d3c46e8..70036e46905 100755 --- a/cpp/test/Glacier2/attack/.depend.mak +++ b/cpp/test/Glacier2/attack/.depend.mak @@ -60,13 +60,15 @@ Backend.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -74,8 +76,8 @@ Backend.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -88,6 +90,7 @@ BackendI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -148,17 +151,17 @@ BackendI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -168,13 +171,14 @@ BackendI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -204,6 +208,7 @@ BackendI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "BackendI.h" \ "Backend.h" \ @@ -216,6 +221,7 @@ Client.obj: \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -275,17 +281,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -295,13 +301,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -330,6 +337,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\Glacier2\Router.h" \ "$(includedir)\Glacier2\Session.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ @@ -349,6 +357,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -409,17 +418,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -429,13 +438,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -464,5 +474,6 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "BackendI.h" \ "Backend.h" \ diff --git a/cpp/test/Glacier2/dynamicFiltering/.depend.mak b/cpp/test/Glacier2/dynamicFiltering/.depend.mak index 53161996b25..5a9bbceae38 100755 --- a/cpp/test/Glacier2/dynamicFiltering/.depend.mak +++ b/cpp/test/Glacier2/dynamicFiltering/.depend.mak @@ -64,13 +64,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -79,12 +81,10 @@ Test.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Glacier2\Session.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Glacier2\Config.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -99,6 +99,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -159,17 +160,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -179,13 +180,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -214,6 +216,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\Glacier2\Router.h" \ "$(includedir)\Glacier2\Session.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ @@ -233,6 +236,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -293,17 +297,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -313,13 +317,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -348,6 +353,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\Glacier2\PermissionsVerifier.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Glacier2\Config.h" \ @@ -363,6 +369,7 @@ SessionI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -423,17 +430,17 @@ SessionI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -443,13 +450,14 @@ SessionI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -479,6 +487,7 @@ SessionI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "SessionI.h" \ "Test.h" \ "$(includedir)\Glacier2\Session.h" \ @@ -492,6 +501,7 @@ BackendI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -552,17 +562,17 @@ BackendI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -572,13 +582,14 @@ BackendI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -608,6 +619,7 @@ BackendI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "BackendI.h" \ "Test.h" \ "$(includedir)\Glacier2\Session.h" \ @@ -620,6 +632,7 @@ TestControllerI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -680,17 +693,17 @@ TestControllerI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -700,13 +713,14 @@ TestControllerI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -736,6 +750,7 @@ TestControllerI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestControllerI.h" \ "$(includedir)\Glacier2\Session.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ diff --git a/cpp/test/Glacier2/override/.depend.mak b/cpp/test/Glacier2/override/.depend.mak index e66df4dca6b..6070aa1d656 100755 --- a/cpp/test/Glacier2/override/.depend.mak +++ b/cpp/test/Glacier2/override/.depend.mak @@ -61,13 +61,15 @@ Callback.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -76,8 +78,8 @@ Callback.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -90,6 +92,7 @@ CallbackI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -150,17 +153,17 @@ CallbackI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -170,13 +173,14 @@ CallbackI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -206,6 +210,7 @@ CallbackI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "CallbackI.h" \ "Callback.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ @@ -244,6 +249,7 @@ Client.obj: \ "$(includedir)\Ice\Application.h" \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\Ice\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -287,17 +293,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\Ice\Value.h" \ @@ -306,13 +312,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -340,6 +347,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\Glacier2\Router.h" \ "$(includedir)\Glacier2\Session.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ @@ -356,6 +364,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -416,17 +425,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -436,13 +445,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -471,5 +481,6 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "CallbackI.h" \ "Callback.h" \ diff --git a/cpp/test/Glacier2/router/.depend.mak b/cpp/test/Glacier2/router/.depend.mak index f5e29c58a32..f078426f6dc 100755 --- a/cpp/test/Glacier2/router/.depend.mak +++ b/cpp/test/Glacier2/router/.depend.mak @@ -61,13 +61,15 @@ Callback.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -77,9 +79,7 @@ Callback.obj: \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -92,6 +92,7 @@ CallbackI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -152,17 +153,17 @@ CallbackI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -172,13 +173,14 @@ CallbackI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -208,6 +210,7 @@ CallbackI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "CallbackI.h" \ "Callback.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ @@ -247,6 +250,7 @@ Client.obj: \ "$(includedir)\Ice\Application.h" \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\Ice\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -290,17 +294,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\Ice\Value.h" \ @@ -309,13 +313,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -343,6 +348,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\Glacier2\Router.h" \ "$(includedir)\Glacier2\Session.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ @@ -359,6 +365,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -419,17 +426,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -439,13 +446,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -474,5 +482,6 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "CallbackI.h" \ "Callback.h" \ diff --git a/cpp/test/Glacier2/sessionControl/.depend.mak b/cpp/test/Glacier2/sessionControl/.depend.mak index 7382a43a3ac..acc4d35b6f6 100755 --- a/cpp/test/Glacier2/sessionControl/.depend.mak +++ b/cpp/test/Glacier2/sessionControl/.depend.mak @@ -64,13 +64,15 @@ Session.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -80,12 +82,10 @@ Session.obj: \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Glacier2\Session.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Glacier2\Config.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -100,6 +100,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -160,17 +161,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -180,13 +181,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -215,6 +217,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\Glacier2\Router.h" \ "$(includedir)\Glacier2\Session.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ @@ -234,6 +237,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -294,17 +298,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -314,13 +318,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -349,6 +354,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\Glacier2\PermissionsVerifier.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Glacier2\Config.h" \ @@ -362,6 +368,7 @@ SessionI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -422,17 +429,17 @@ SessionI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -442,13 +449,14 @@ SessionI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -478,6 +486,7 @@ SessionI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "SessionI.h" \ "Session.h" \ "$(includedir)\Glacier2\Session.h" \ diff --git a/cpp/test/Glacier2/sessionHelper/.depend.mak b/cpp/test/Glacier2/sessionHelper/.depend.mak index 1921a676ccb..41e19e34f6c 100755 --- a/cpp/test/Glacier2/sessionHelper/.depend.mak +++ b/cpp/test/Glacier2/sessionHelper/.depend.mak @@ -60,13 +60,15 @@ Callback.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -75,9 +77,7 @@ Callback.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -113,6 +113,7 @@ Client.obj: \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\Ice\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -156,17 +157,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\Ice\Value.h" \ @@ -175,13 +176,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -210,6 +212,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\Glacier2\Glacier2.h" \ "$(includedir)\Glacier2\Router.h" \ "$(includedir)\Glacier2\Session.h" \ @@ -251,6 +254,7 @@ Server.obj: \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\Ice\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -294,17 +298,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\Ice\Value.h" \ @@ -313,13 +317,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -348,4 +353,5 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "Callback.h" \ diff --git a/cpp/test/Glacier2/ssl/.depend.mak b/cpp/test/Glacier2/ssl/.depend.mak index dfeefed13d3..29de516fc96 100755 --- a/cpp/test/Glacier2/ssl/.depend.mak +++ b/cpp/test/Glacier2/ssl/.depend.mak @@ -6,6 +6,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -66,17 +67,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -86,13 +87,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -121,6 +123,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\Glacier2\Router.h" \ "$(includedir)\Glacier2\Session.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ @@ -139,6 +142,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -199,17 +203,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -219,13 +223,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -254,6 +259,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\Glacier2\PermissionsVerifier.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Glacier2\Config.h" \ diff --git a/cpp/test/Glacier2/staticFiltering/.depend.mak b/cpp/test/Glacier2/staticFiltering/.depend.mak index 8d5a4b1f045..caef59307f8 100755 --- a/cpp/test/Glacier2/staticFiltering/.depend.mak +++ b/cpp/test/Glacier2/staticFiltering/.depend.mak @@ -60,13 +60,15 @@ Backend.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -74,8 +76,8 @@ Backend.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -88,6 +90,7 @@ BackendI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -148,17 +151,17 @@ BackendI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -168,13 +171,14 @@ BackendI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -204,6 +208,7 @@ BackendI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "BackendI.h" \ "Backend.h" \ @@ -214,6 +219,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -274,17 +280,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -294,13 +300,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -329,6 +336,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\Glacier2\Router.h" \ "$(includedir)\Glacier2\Session.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ @@ -348,6 +356,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -408,17 +417,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -428,13 +437,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -463,5 +473,6 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "BackendI.h" \ "Backend.h" \ diff --git a/cpp/test/Ice/acm/.depend.mak b/cpp/test/Ice/acm/.depend.mak index fc201e5e491..f23d13fe1df 100755 --- a/cpp/test/Ice/acm/.depend.mak +++ b/cpp/test/Ice/acm/.depend.mak @@ -60,13 +60,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -74,8 +76,8 @@ Test.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -88,6 +90,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -148,17 +151,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -168,13 +171,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -204,6 +208,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -217,6 +222,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -277,17 +283,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -297,13 +303,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -333,6 +340,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -369,6 +377,7 @@ TestI.obj: \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\Ice\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -412,17 +421,17 @@ TestI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\Ice\Value.h" \ @@ -431,13 +440,14 @@ TestI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -466,6 +476,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ @@ -475,6 +486,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -535,17 +547,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -555,13 +567,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -591,6 +604,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ diff --git a/cpp/test/Ice/adapterDeactivation/.depend.mak b/cpp/test/Ice/adapterDeactivation/.depend.mak index 9a51b63c683..0e104777ab1 100755 --- a/cpp/test/Ice/adapterDeactivation/.depend.mak +++ b/cpp/test/Ice/adapterDeactivation/.depend.mak @@ -60,13 +60,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -74,8 +76,8 @@ Test.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -89,6 +91,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -149,17 +152,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -169,13 +172,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -204,6 +208,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -217,6 +222,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -277,17 +283,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -297,13 +303,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -333,6 +340,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -369,6 +377,7 @@ TestI.obj: \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\Ice\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -412,17 +421,17 @@ TestI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\Ice\Value.h" \ @@ -431,13 +440,14 @@ TestI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -466,6 +476,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ @@ -476,6 +487,7 @@ ServantLocatorI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -536,17 +548,17 @@ ServantLocatorI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -556,13 +568,14 @@ ServantLocatorI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -592,6 +605,7 @@ ServantLocatorI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -607,6 +621,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -667,17 +682,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -687,13 +702,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -722,6 +738,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "ServantLocatorI.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ @@ -736,6 +753,7 @@ Collocated.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -796,17 +814,17 @@ Collocated.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -816,13 +834,14 @@ Collocated.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -851,6 +870,7 @@ Collocated.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "ServantLocatorI.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ diff --git a/cpp/test/Ice/admin/.depend.mak b/cpp/test/Ice/admin/.depend.mak index f062167f9e4..35bdc84184f 100755 --- a/cpp/test/Ice/admin/.depend.mak +++ b/cpp/test/Ice/admin/.depend.mak @@ -63,13 +63,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -78,10 +80,10 @@ Test.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -94,6 +96,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -154,17 +157,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -174,13 +177,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -210,6 +214,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -223,6 +228,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -283,17 +289,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -303,13 +309,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -339,6 +346,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -406,13 +414,15 @@ TestI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -421,28 +431,34 @@ TestI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ + "$(includedir)\IceUtil\IceUtil.h" \ + "$(includedir)\IceUtil\CtrlCHandler.h" \ + "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\RecMutex.h" \ + "$(includedir)\IceUtil\Thread.h" \ + "$(includedir)\IceUtil\Timer.h" \ + "$(includedir)\IceUtil\UUID.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ "$(includedir)\Ice\Ice.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\Plugin.h" \ "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\Initialize.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -460,7 +476,6 @@ TestI.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\IceUtil\Functional.h" \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ @@ -471,6 +486,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ Server.obj: \ Server.cpp \ @@ -478,6 +494,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -538,17 +555,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -558,13 +575,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -594,6 +612,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ diff --git a/cpp/test/Ice/ami/.depend.mak b/cpp/test/Ice/ami/.depend.mak index 775d41b05d0..a81b00a0a65 100755 --- a/cpp/test/Ice/ami/.depend.mak +++ b/cpp/test/Ice/ami/.depend.mak @@ -64,13 +64,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -79,10 +81,8 @@ Test.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Endpoint.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -95,6 +95,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -155,17 +156,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -175,13 +176,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -211,6 +213,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -224,6 +227,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -284,17 +288,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -304,13 +308,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -340,6 +345,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceUtil\Random.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ @@ -407,13 +413,15 @@ TestI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -422,21 +430,26 @@ TestI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Endpoint.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ + "$(includedir)\IceUtil\IceUtil.h" \ + "$(includedir)\IceUtil\CtrlCHandler.h" \ + "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\RecMutex.h" \ + "$(includedir)\IceUtil\Thread.h" \ + "$(includedir)\IceUtil\Timer.h" \ + "$(includedir)\IceUtil\UUID.h" \ "$(includedir)\Ice\Ice.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\Plugin.h" \ "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\Initialize.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\Properties.h" \ @@ -444,6 +457,7 @@ TestI.obj: \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -460,7 +474,6 @@ TestI.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\IceUtil\Functional.h" \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ @@ -472,6 +485,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ Server.obj: \ Server.cpp \ @@ -479,6 +493,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -539,17 +554,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -559,13 +574,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -595,6 +611,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -609,6 +626,7 @@ Collocated.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -669,17 +687,17 @@ Collocated.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -689,13 +707,14 @@ Collocated.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -725,6 +744,7 @@ Collocated.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ diff --git a/cpp/test/Ice/background/.depend.mak b/cpp/test/Ice/background/.depend.mak index 723fe082531..cc85278f7c9 100755 --- a/cpp/test/Ice/background/.depend.mak +++ b/cpp/test/Ice/background/.depend.mak @@ -64,13 +64,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -78,9 +80,9 @@ Test.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Endpoint.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -161,8 +163,8 @@ Configuration.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -250,8 +252,8 @@ Connector.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -274,6 +276,8 @@ Connector.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ Acceptor.obj: \ Acceptor.cpp \ @@ -341,19 +345,20 @@ Acceptor.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\LoggerF.h" \ "..\..\..\src\Ice\ProtocolInstanceF.h" \ "EndpointI.h" \ "..\..\..\src\Ice\EndpointI.h" \ "$(includedir)\Ice\Endpoint.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ "..\..\..\src\Ice\ConnectorF.h" \ "Test.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -363,6 +368,8 @@ Acceptor.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "Configuration.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -371,7 +378,6 @@ Acceptor.obj: \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\UUID.h" \ - "$(includedir)\Ice\LocalException.h" \ "..\..\..\src\Ice\Selector.h" \ "$(includedir)\IceUtil\StringUtil.h" \ "..\..\..\src\Ice\EventHandlerF.h" \ @@ -444,13 +450,14 @@ EndpointI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -458,6 +465,8 @@ EndpointI.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "Configuration.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -466,7 +475,6 @@ EndpointI.obj: \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\UUID.h" \ - "$(includedir)\Ice\LocalException.h" \ "..\..\..\src\Ice\Selector.h" \ "$(includedir)\IceUtil\StringUtil.h" \ "..\..\..\src\Ice\Network.h" \ @@ -548,13 +556,15 @@ Transceiver.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\LoggerF.h" \ "..\..\..\src\Ice\ProtocolInstanceF.h" \ "Configuration.h" \ @@ -566,8 +576,6 @@ Transceiver.obj: \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\UUID.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ "..\..\..\src\Ice\Selector.h" \ "$(includedir)\IceUtil\StringUtil.h" \ "..\..\..\src\Ice\EventHandlerF.h" \ @@ -646,13 +654,14 @@ EndpointFactory.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -660,6 +669,8 @@ EndpointFactory.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "Configuration.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -668,7 +679,6 @@ EndpointFactory.obj: \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\UUID.h" \ - "$(includedir)\Ice\LocalException.h" \ "..\..\..\src\Ice\Selector.h" \ "$(includedir)\IceUtil\StringUtil.h" \ "..\..\..\src\Ice\Network.h" \ @@ -738,17 +748,18 @@ PluginI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Plugin.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ "..\..\..\src\Ice\ProtocolPluginFacade.h" \ @@ -766,7 +777,6 @@ PluginI.obj: \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\UUID.h" \ - "$(includedir)\Ice\LocalException.h" \ "..\..\..\src\Ice\Selector.h" \ "$(includedir)\IceUtil\StringUtil.h" \ "..\..\..\src\Ice\Network.h" \ @@ -782,6 +792,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -842,17 +853,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -862,13 +873,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -898,6 +910,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -943,6 +956,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\Random.h" \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\Ice\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -986,17 +1000,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\Ice\Value.h" \ @@ -1005,13 +1019,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -1040,6 +1055,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "Test.h" \ "PluginI.h" \ @@ -1111,13 +1127,15 @@ TestI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -1125,7 +1143,8 @@ TestI.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Endpoint.h" \ "Configuration.h" \ "$(includedir)\IceUtil\IceUtil.h" \ @@ -1135,7 +1154,6 @@ TestI.obj: \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\UUID.h" \ - "$(includedir)\Ice\LocalException.h" \ "..\..\..\src\Ice\Selector.h" \ "$(includedir)\IceUtil\StringUtil.h" \ "..\..\..\src\Ice\Network.h" \ @@ -1146,6 +1164,7 @@ TestI.obj: \ "..\..\..\src\Ice\ProtocolInstanceF.h" \ "..\..\..\src\Ice\EventHandlerF.h" \ "$(includedir)\Ice\Ice.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\Plugin.h" \ "$(includedir)\Ice\Initialize.h" \ @@ -1158,9 +1177,8 @@ TestI.obj: \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -1188,6 +1206,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ Server.obj: \ Server.cpp \ @@ -1195,6 +1214,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -1255,17 +1275,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -1275,13 +1295,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -1311,6 +1332,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ "Configuration.h" \ diff --git a/cpp/test/Ice/binding/.depend.mak b/cpp/test/Ice/binding/.depend.mak index 18a8a89bb98..df20c95415e 100755 --- a/cpp/test/Ice/binding/.depend.mak +++ b/cpp/test/Ice/binding/.depend.mak @@ -60,13 +60,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -74,8 +76,8 @@ Test.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -88,6 +90,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -148,17 +151,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -168,13 +171,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -204,6 +208,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -219,6 +224,7 @@ AllTests.obj: \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -278,17 +284,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -298,13 +304,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -334,6 +341,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -347,6 +355,7 @@ TestI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -407,17 +416,17 @@ TestI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -427,13 +436,14 @@ TestI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -463,6 +473,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ @@ -472,6 +483,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -532,17 +544,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -552,13 +564,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -588,6 +601,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ diff --git a/cpp/test/Ice/checksum/.depend.mak b/cpp/test/Ice/checksum/.depend.mak index 9b011f090ef..fe8efe3effe 100755 --- a/cpp/test/Ice/checksum/.depend.mak +++ b/cpp/test/Ice/checksum/.depend.mak @@ -64,13 +64,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -78,9 +80,9 @@ Test.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -146,13 +148,15 @@ Types.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -161,9 +165,7 @@ Types.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -178,6 +180,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -238,17 +241,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -258,13 +261,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -294,6 +298,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -307,6 +312,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -367,17 +373,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -387,13 +393,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -423,6 +430,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ diff --git a/cpp/test/Ice/checksum/server/.depend.mak b/cpp/test/Ice/checksum/server/.depend.mak index c258390bd20..590bdab5e2a 100755 --- a/cpp/test/Ice/checksum/server/.depend.mak +++ b/cpp/test/Ice/checksum/server/.depend.mak @@ -64,13 +64,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -78,9 +80,9 @@ Test.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\SliceChecksumDict.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -146,13 +148,15 @@ Types.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -161,9 +165,7 @@ Types.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -178,6 +180,7 @@ TestI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -238,17 +241,17 @@ TestI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -258,13 +261,14 @@ TestI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -294,6 +298,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ @@ -303,6 +308,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -363,17 +369,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -383,13 +389,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -419,6 +426,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ diff --git a/cpp/test/Ice/custom/.depend.mak b/cpp/test/Ice/custom/.depend.mak index a4631617e10..303525095df 100755 --- a/cpp/test/Ice/custom/.depend.mak +++ b/cpp/test/Ice/custom/.depend.mak @@ -69,13 +69,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -84,16 +86,16 @@ Test.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "MyByteSeq.h" \ "CustomMap.h" \ "CustomBuffer.h" \ "StringView.h" \ "$(includedir)\Ice\Ice.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\Plugin.h" \ "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ @@ -101,7 +103,6 @@ Test.obj: \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\Properties.h" \ @@ -109,6 +110,7 @@ Test.obj: \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -138,6 +140,7 @@ Test.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\Ice\Outgoing.h" \ Wstring.obj: \ @@ -198,13 +201,15 @@ Wstring.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -213,9 +218,7 @@ Wstring.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -228,6 +231,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -288,17 +292,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -308,13 +312,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -344,6 +349,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -362,6 +368,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -422,17 +429,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -442,13 +449,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -478,6 +486,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -564,13 +573,15 @@ TestI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -579,25 +590,26 @@ TestI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ "$(includedir)\Ice\ImplicitContextF.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\FacetMap.h" \ "TestI.h" \ "Test.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "MyByteSeq.h" \ "CustomMap.h" \ "CustomBuffer.h" \ "StringView.h" \ "$(includedir)\Ice\Ice.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\Plugin.h" \ "$(includedir)\Ice\Initialize.h" \ @@ -606,7 +618,6 @@ TestI.obj: \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ @@ -634,6 +645,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ WstringI.obj: \ WstringI.cpp \ @@ -694,13 +706,15 @@ WstringI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -709,7 +723,7 @@ WstringI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ Server.obj: \ Server.cpp \ @@ -717,6 +731,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -777,17 +792,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -797,13 +812,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -833,6 +849,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -906,13 +923,15 @@ TestAMD.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -922,16 +941,16 @@ TestAMD.obj: \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "MyByteSeq.h" \ "CustomMap.h" \ "CustomBuffer.h" \ "StringView.h" \ "$(includedir)\Ice\Ice.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\Plugin.h" \ "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ @@ -939,13 +958,13 @@ TestAMD.obj: \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -975,6 +994,7 @@ TestAMD.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\Ice\Outgoing.h" \ TestAMDI.obj: \ @@ -1035,13 +1055,15 @@ TestAMDI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -1050,25 +1072,26 @@ TestAMDI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ "$(includedir)\Ice\ImplicitContextF.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\FacetMap.h" \ "TestAMDI.h" \ "TestAMD.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "MyByteSeq.h" \ "CustomMap.h" \ "CustomBuffer.h" \ "StringView.h" \ "$(includedir)\Ice\Ice.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\Plugin.h" \ "$(includedir)\Ice\Initialize.h" \ @@ -1077,7 +1100,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ @@ -1105,6 +1127,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ WstringAMD.obj: \ WstringAMD.cpp \ @@ -1164,13 +1187,15 @@ WstringAMD.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -1180,9 +1205,7 @@ WstringAMD.obj: \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -1248,13 +1271,15 @@ WstringAMDI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -1264,7 +1289,7 @@ WstringAMDI.obj: \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ ServerAMD.obj: \ ServerAMD.cpp \ @@ -1272,6 +1297,7 @@ ServerAMD.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -1332,17 +1358,17 @@ ServerAMD.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -1352,13 +1378,14 @@ ServerAMD.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -1388,6 +1415,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -1409,6 +1437,7 @@ Collocated.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -1469,17 +1498,17 @@ Collocated.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -1489,13 +1518,14 @@ Collocated.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -1525,6 +1555,7 @@ Collocated.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ diff --git a/cpp/test/Ice/defaultServant/.depend.mak b/cpp/test/Ice/defaultServant/.depend.mak index aa867b02ebb..261ffe856c2 100755 --- a/cpp/test/Ice/defaultServant/.depend.mak +++ b/cpp/test/Ice/defaultServant/.depend.mak @@ -60,13 +60,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -74,8 +76,8 @@ Test.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -88,6 +90,7 @@ TestI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -148,17 +151,17 @@ TestI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -168,13 +171,14 @@ TestI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -204,6 +208,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ @@ -213,6 +218,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -273,17 +279,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -293,13 +299,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -329,6 +336,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -342,6 +350,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -402,17 +411,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -422,13 +431,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -458,6 +468,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ diff --git a/cpp/test/Ice/defaultValue/.depend.mak b/cpp/test/Ice/defaultValue/.depend.mak index ec085a7c21b..ffa80a9ec28 100755 --- a/cpp/test/Ice/defaultValue/.depend.mak +++ b/cpp/test/Ice/defaultValue/.depend.mak @@ -60,13 +60,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -75,9 +77,7 @@ Test.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -90,6 +90,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -150,17 +151,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -170,13 +171,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -206,6 +208,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -219,6 +222,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -279,17 +283,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -299,13 +303,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -335,6 +340,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ diff --git a/cpp/test/Ice/dispatcher/.depend.mak b/cpp/test/Ice/dispatcher/.depend.mak index 5f13f091b96..90ff6c2dd65 100755 --- a/cpp/test/Ice/dispatcher/.depend.mak +++ b/cpp/test/Ice/dispatcher/.depend.mak @@ -64,13 +64,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -78,9 +80,9 @@ Test.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Endpoint.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -93,6 +95,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -153,17 +156,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -173,13 +176,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -209,6 +213,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -223,6 +228,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -283,17 +289,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -303,13 +309,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -339,6 +346,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceUtil\Random.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ @@ -455,13 +463,15 @@ TestI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -469,9 +479,11 @@ TestI.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Endpoint.h" \ "$(includedir)\Ice\Ice.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\Plugin.h" \ "$(includedir)\Ice\LoggerF.h" \ @@ -482,16 +494,14 @@ TestI.obj: \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -520,6 +530,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "Dispatcher.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ @@ -533,6 +544,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -593,17 +605,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -613,13 +625,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -649,6 +662,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ @@ -664,6 +678,7 @@ Collocated.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -724,17 +739,17 @@ Collocated.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -744,13 +759,14 @@ Collocated.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -780,6 +796,7 @@ Collocated.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ diff --git a/cpp/test/Ice/echo/.depend.mak b/cpp/test/Ice/echo/.depend.mak index 8d75489e052..5f6544ab546 100755 --- a/cpp/test/Ice/echo/.depend.mak +++ b/cpp/test/Ice/echo/.depend.mak @@ -60,13 +60,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -74,8 +76,8 @@ Test.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -88,6 +90,7 @@ BlobjectI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -148,17 +151,17 @@ BlobjectI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -168,13 +171,14 @@ BlobjectI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -204,6 +208,7 @@ BlobjectI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "BlobjectI.h" \ Server.obj: \ @@ -212,6 +217,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -272,17 +278,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -292,13 +298,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -328,6 +335,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ diff --git a/cpp/test/Ice/enums/.depend.mak b/cpp/test/Ice/enums/.depend.mak index 40de27ede41..48b28a3717b 100755 --- a/cpp/test/Ice/enums/.depend.mak +++ b/cpp/test/Ice/enums/.depend.mak @@ -60,13 +60,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -74,8 +76,8 @@ Test.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -88,6 +90,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -148,17 +151,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -168,13 +171,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -204,6 +208,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -217,6 +222,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -277,17 +283,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -297,13 +303,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -333,6 +340,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -346,6 +354,7 @@ TestI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -406,17 +415,17 @@ TestI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -426,13 +435,14 @@ TestI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -462,8 +472,14 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ + "$(includedir)\IceUtil\IceUtil.h" \ + "$(includedir)\IceUtil\CtrlCHandler.h" \ + "$(includedir)\IceUtil\RecMutex.h" \ + "$(includedir)\IceUtil\UUID.h" \ Server.obj: \ Server.cpp \ @@ -471,6 +487,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -531,17 +548,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -551,13 +568,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -587,6 +605,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ diff --git a/cpp/test/Ice/exceptions/.depend.mak b/cpp/test/Ice/exceptions/.depend.mak index 4523ae2327e..7e267a2077d 100755 --- a/cpp/test/Ice/exceptions/.depend.mak +++ b/cpp/test/Ice/exceptions/.depend.mak @@ -65,13 +65,15 @@ ExceptionsI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -80,8 +82,7 @@ ExceptionsI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ Test.obj: \ Test.cpp \ @@ -141,13 +142,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -156,9 +159,7 @@ Test.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -171,6 +172,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -231,17 +233,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -251,13 +253,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -287,6 +290,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -300,6 +304,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -360,17 +365,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -380,13 +385,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -416,6 +422,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -429,6 +436,7 @@ TestI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -489,17 +497,17 @@ TestI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -509,13 +517,14 @@ TestI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -545,6 +554,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ @@ -559,6 +569,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -619,17 +630,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -639,13 +650,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -675,6 +687,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -741,13 +754,15 @@ TestAMD.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -757,9 +772,7 @@ TestAMD.obj: \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -772,6 +785,7 @@ TestAMDI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -832,17 +846,17 @@ TestAMDI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -852,13 +866,14 @@ TestAMDI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -888,6 +903,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestAMDI.h" \ "TestAMD.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ @@ -902,6 +918,7 @@ ServerAMD.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -962,17 +979,17 @@ ServerAMD.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -982,13 +999,14 @@ ServerAMD.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -1018,6 +1036,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -1032,6 +1051,7 @@ Collocated.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -1092,17 +1112,17 @@ Collocated.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -1112,13 +1132,14 @@ Collocated.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -1148,6 +1169,7 @@ Collocated.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ diff --git a/cpp/test/Ice/facets/.depend.mak b/cpp/test/Ice/facets/.depend.mak index bf715fbacf8..5c32ecd776e 100755 --- a/cpp/test/Ice/facets/.depend.mak +++ b/cpp/test/Ice/facets/.depend.mak @@ -60,13 +60,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -74,8 +76,8 @@ Test.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -88,6 +90,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -148,17 +151,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -168,13 +171,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -204,6 +208,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -217,6 +222,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -277,17 +283,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -297,13 +303,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -333,6 +340,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ @@ -346,6 +354,7 @@ TestI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -406,17 +415,17 @@ TestI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -426,13 +435,14 @@ TestI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -462,6 +472,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ @@ -471,6 +482,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -531,17 +543,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -551,13 +563,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -587,6 +600,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -601,6 +615,7 @@ Collocated.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -661,17 +676,17 @@ Collocated.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -681,13 +696,14 @@ Collocated.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -717,6 +733,7 @@ Collocated.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ diff --git a/cpp/test/Ice/faultTolerance/.depend.mak b/cpp/test/Ice/faultTolerance/.depend.mak index 7fb800b42f0..bba51112cce 100755 --- a/cpp/test/Ice/faultTolerance/.depend.mak +++ b/cpp/test/Ice/faultTolerance/.depend.mak @@ -60,13 +60,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -74,8 +76,8 @@ Test.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -88,6 +90,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -148,17 +151,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -168,13 +171,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -204,6 +208,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -217,6 +222,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -277,17 +283,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -297,13 +303,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -333,6 +340,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -346,6 +354,7 @@ TestI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -406,17 +415,17 @@ TestI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -426,13 +435,14 @@ TestI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -462,6 +472,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ @@ -471,6 +482,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -531,17 +543,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -551,13 +563,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -587,5 +600,6 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ diff --git a/cpp/test/Ice/gc/.depend.mak b/cpp/test/Ice/gc/.depend.mak index e9a93d9a3b7..a27b7e4c092 100755 --- a/cpp/test/Ice/gc/.depend.mak +++ b/cpp/test/Ice/gc/.depend.mak @@ -60,13 +60,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -75,9 +77,7 @@ Test.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -102,6 +102,7 @@ Client.obj: \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -152,17 +153,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\Ice\Value.h" \ @@ -171,13 +172,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -207,6 +209,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ diff --git a/cpp/test/Ice/hash/.depend.mak b/cpp/test/Ice/hash/.depend.mak index 19071fcf13f..23f2f147fb0 100755 --- a/cpp/test/Ice/hash/.depend.mak +++ b/cpp/test/Ice/hash/.depend.mak @@ -60,13 +60,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -75,9 +77,7 @@ Test.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -90,6 +90,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -150,17 +151,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -170,13 +171,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -206,6 +208,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceUtil\Random.h" \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ diff --git a/cpp/test/Ice/hold/.depend.mak b/cpp/test/Ice/hold/.depend.mak index f10f0c6f4b1..d87114964e0 100755 --- a/cpp/test/Ice/hold/.depend.mak +++ b/cpp/test/Ice/hold/.depend.mak @@ -60,13 +60,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -74,8 +76,8 @@ Test.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -88,6 +90,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -148,17 +151,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -168,13 +171,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -204,6 +208,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -217,6 +222,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -277,17 +283,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -297,13 +303,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -333,6 +340,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceUtil\Random.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ @@ -347,6 +355,7 @@ TestI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -407,17 +416,17 @@ TestI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -427,13 +436,14 @@ TestI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -463,6 +473,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ @@ -477,6 +488,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -537,17 +549,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -557,13 +569,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -593,6 +606,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ diff --git a/cpp/test/Ice/info/.depend.mak b/cpp/test/Ice/info/.depend.mak index 09facf2b454..ab4cd04474c 100755 --- a/cpp/test/Ice/info/.depend.mak +++ b/cpp/test/Ice/info/.depend.mak @@ -65,13 +65,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -79,8 +81,8 @@ Test.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -93,6 +95,7 @@ TestI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -153,17 +156,17 @@ TestI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -173,13 +176,14 @@ TestI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -209,6 +213,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceSSL\IceSSL.h" \ "$(includedir)\IceSSL\Plugin.h" \ "$(includedir)\IceSSL\Config.h" \ @@ -228,6 +233,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -288,17 +294,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -308,13 +314,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -344,6 +351,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -357,6 +365,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -417,17 +426,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -437,13 +446,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -473,6 +483,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceSSL\IceSSL.h" \ "$(includedir)\IceSSL\Plugin.h" \ "$(includedir)\IceSSL\Config.h" \ @@ -492,6 +503,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -552,17 +564,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -572,13 +584,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -608,6 +621,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ diff --git a/cpp/test/Ice/inheritance/.depend.mak b/cpp/test/Ice/inheritance/.depend.mak index 640ed696dcf..1a11fa7d2c0 100755 --- a/cpp/test/Ice/inheritance/.depend.mak +++ b/cpp/test/Ice/inheritance/.depend.mak @@ -60,13 +60,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -75,9 +77,7 @@ Test.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -90,6 +90,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -150,17 +151,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -170,13 +171,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -206,6 +208,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -219,6 +222,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -279,17 +283,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -299,13 +303,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -335,6 +340,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -348,6 +354,7 @@ TestI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -408,17 +415,17 @@ TestI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -428,13 +435,14 @@ TestI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -464,8 +472,14 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ + "$(includedir)\IceUtil\IceUtil.h" \ + "$(includedir)\IceUtil\CtrlCHandler.h" \ + "$(includedir)\IceUtil\RecMutex.h" \ + "$(includedir)\IceUtil\UUID.h" \ Server.obj: \ Server.cpp \ @@ -473,6 +487,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -533,17 +548,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -553,13 +568,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -589,6 +605,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -603,6 +620,7 @@ Collocated.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -663,17 +681,17 @@ Collocated.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -683,13 +701,14 @@ Collocated.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -719,6 +738,7 @@ Collocated.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ diff --git a/cpp/test/Ice/interceptor/.depend.mak b/cpp/test/Ice/interceptor/.depend.mak index 9e0737a341a..915e1dfe07e 100755 --- a/cpp/test/Ice/interceptor/.depend.mak +++ b/cpp/test/Ice/interceptor/.depend.mak @@ -8,6 +8,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -68,17 +69,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -88,13 +89,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -124,6 +126,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -141,6 +144,7 @@ InterceptorI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -201,17 +205,17 @@ InterceptorI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -221,13 +225,14 @@ InterceptorI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -257,6 +262,7 @@ InterceptorI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ @@ -273,6 +279,7 @@ AMDInterceptorI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -333,17 +340,17 @@ AMDInterceptorI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -353,13 +360,14 @@ AMDInterceptorI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -389,6 +397,7 @@ AMDInterceptorI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ @@ -402,6 +411,7 @@ MyObjectI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -462,17 +472,17 @@ MyObjectI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -482,13 +492,14 @@ MyObjectI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -518,6 +529,7 @@ MyObjectI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "MyObjectI.h" \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ @@ -584,13 +596,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -600,9 +614,7 @@ Test.obj: \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -615,6 +627,7 @@ TestI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -675,17 +688,17 @@ TestI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -695,13 +708,14 @@ TestI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -731,4 +745,5 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "Test.h" \ diff --git a/cpp/test/Ice/invoke/.depend.mak b/cpp/test/Ice/invoke/.depend.mak index 888e9a27c13..8d748d39291 100755 --- a/cpp/test/Ice/invoke/.depend.mak +++ b/cpp/test/Ice/invoke/.depend.mak @@ -60,13 +60,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -75,9 +77,7 @@ Test.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -90,6 +90,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -150,17 +151,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -170,13 +171,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -206,6 +208,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -219,6 +222,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -279,17 +283,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -299,13 +303,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -335,6 +340,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -348,6 +354,7 @@ BlobjectI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -408,17 +415,17 @@ BlobjectI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -428,13 +435,14 @@ BlobjectI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -464,6 +472,7 @@ BlobjectI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "BlobjectI.h" \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ @@ -478,6 +487,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -538,17 +548,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -558,13 +568,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -594,6 +605,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ diff --git a/cpp/test/Ice/location/.depend.mak b/cpp/test/Ice/location/.depend.mak index aaf731b95f1..7e20c433184 100755 --- a/cpp/test/Ice/location/.depend.mak +++ b/cpp/test/Ice/location/.depend.mak @@ -63,13 +63,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -79,11 +81,9 @@ Test.obj: \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Process.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -96,6 +96,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -156,17 +157,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -176,13 +177,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -212,6 +214,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -225,6 +228,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -285,17 +289,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -305,13 +309,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -341,6 +346,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ @@ -354,6 +360,7 @@ TestI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -414,17 +421,17 @@ TestI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -434,13 +441,14 @@ TestI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -470,6 +478,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ "ServerLocator.h" \ @@ -480,6 +489,7 @@ ServerLocator.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -540,17 +550,17 @@ ServerLocator.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -560,13 +570,14 @@ ServerLocator.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -596,6 +607,7 @@ ServerLocator.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -610,6 +622,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -670,17 +683,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -690,13 +703,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -726,6 +740,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "ServerLocator.h" \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ diff --git a/cpp/test/Ice/logger/.depend.mak b/cpp/test/Ice/logger/.depend.mak index 14f054556ec..4a2b2f9bd21 100755 --- a/cpp/test/Ice/logger/.depend.mak +++ b/cpp/test/Ice/logger/.depend.mak @@ -5,6 +5,7 @@ Client1.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -65,17 +66,17 @@ Client1.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -85,13 +86,14 @@ Client1.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -121,6 +123,7 @@ Client1.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -133,6 +136,7 @@ Client2.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -193,17 +197,17 @@ Client2.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -213,13 +217,14 @@ Client2.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -249,6 +254,7 @@ Client2.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -261,6 +267,7 @@ Client3.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -321,17 +328,17 @@ Client3.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -341,13 +348,14 @@ Client3.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -377,6 +385,7 @@ Client3.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -389,6 +398,7 @@ Client4.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -449,17 +459,17 @@ Client4.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -469,13 +479,14 @@ Client4.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -505,6 +516,7 @@ Client4.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ diff --git a/cpp/test/Ice/metrics/.depend.mak b/cpp/test/Ice/metrics/.depend.mak index 18aed21adc4..05707946fed 100755 --- a/cpp/test/Ice/metrics/.depend.mak +++ b/cpp/test/Ice/metrics/.depend.mak @@ -63,13 +63,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -78,9 +80,7 @@ Test.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -93,6 +93,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -153,17 +154,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -173,13 +174,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -209,6 +211,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -223,6 +226,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -283,17 +287,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -303,13 +307,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -339,6 +344,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -353,6 +359,7 @@ TestI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -413,17 +420,17 @@ TestI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -433,13 +440,14 @@ TestI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -469,6 +477,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ @@ -478,6 +487,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -538,17 +548,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -558,13 +568,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -594,6 +605,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -660,13 +672,15 @@ TestAMD.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -676,9 +690,7 @@ TestAMD.obj: \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -691,6 +703,7 @@ TestAMDI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -751,17 +764,17 @@ TestAMDI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -771,13 +784,14 @@ TestAMDI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -807,6 +821,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestAMDI.h" \ "TestAMD.h" \ @@ -816,6 +831,7 @@ ServerAMD.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -876,17 +892,17 @@ ServerAMD.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -896,13 +912,14 @@ ServerAMD.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -932,6 +949,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -946,6 +964,7 @@ Collocated.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -1006,17 +1025,17 @@ Collocated.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -1026,13 +1045,14 @@ Collocated.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -1062,6 +1082,7 @@ Collocated.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ diff --git a/cpp/test/Ice/networkProxy/.depend.mak b/cpp/test/Ice/networkProxy/.depend.mak index 3e6789ff9c6..0fdca2b6cbb 100755 --- a/cpp/test/Ice/networkProxy/.depend.mak +++ b/cpp/test/Ice/networkProxy/.depend.mak @@ -60,13 +60,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -74,8 +76,8 @@ Test.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -88,6 +90,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -148,17 +151,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -168,13 +171,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -204,6 +208,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -217,6 +222,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -277,17 +283,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -297,13 +303,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -333,6 +340,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -346,6 +354,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -406,17 +415,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -426,13 +435,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -462,6 +472,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ diff --git a/cpp/test/Ice/objects/.depend.mak b/cpp/test/Ice/objects/.depend.mak index 35104594691..d9a783fff42 100755 --- a/cpp/test/Ice/objects/.depend.mak +++ b/cpp/test/Ice/objects/.depend.mak @@ -60,13 +60,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -75,9 +77,7 @@ Test.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -90,6 +90,7 @@ TestI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -150,17 +151,17 @@ TestI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -170,13 +171,14 @@ TestI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -206,8 +208,14 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ + "$(includedir)\IceUtil\IceUtil.h" \ + "$(includedir)\IceUtil\CtrlCHandler.h" \ + "$(includedir)\IceUtil\RecMutex.h" \ + "$(includedir)\IceUtil\UUID.h" \ Client.obj: \ Client.cpp \ @@ -215,6 +223,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -275,17 +284,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -295,13 +304,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -331,6 +341,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -345,6 +356,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -405,17 +417,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -425,13 +437,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -461,6 +474,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -474,6 +488,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -534,17 +549,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -554,13 +569,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -590,6 +606,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -604,6 +621,7 @@ Collocated.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -664,17 +682,17 @@ Collocated.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -684,13 +702,14 @@ Collocated.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -720,6 +739,7 @@ Collocated.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ diff --git a/cpp/test/Ice/operations/.depend.mak b/cpp/test/Ice/operations/.depend.mak index e1f09c8229c..a65251b9094 100755 --- a/cpp/test/Ice/operations/.depend.mak +++ b/cpp/test/Ice/operations/.depend.mak @@ -73,13 +73,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -88,9 +90,7 @@ Test.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -103,6 +103,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -163,17 +164,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -183,13 +184,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -219,6 +221,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -232,6 +235,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -292,17 +296,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -312,13 +316,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -348,6 +353,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -361,6 +367,7 @@ Twoways.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -421,17 +428,17 @@ Twoways.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -441,13 +448,14 @@ Twoways.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -477,7 +485,7 @@ Twoways.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ - "$(includedir)\Ice\Comparable.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -491,6 +499,7 @@ Oneways.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -551,17 +560,17 @@ Oneways.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -571,13 +580,14 @@ Oneways.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -607,6 +617,7 @@ Oneways.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -620,6 +631,7 @@ TwowaysAMI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -680,17 +692,17 @@ TwowaysAMI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -700,13 +712,14 @@ TwowaysAMI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -736,6 +749,7 @@ TwowaysAMI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -749,6 +763,7 @@ OnewaysAMI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -809,17 +824,17 @@ OnewaysAMI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -829,13 +844,14 @@ OnewaysAMI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -865,6 +881,7 @@ OnewaysAMI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -878,6 +895,7 @@ BatchOneways.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -938,17 +956,17 @@ BatchOneways.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -958,13 +976,14 @@ BatchOneways.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -994,6 +1013,7 @@ BatchOneways.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -1007,6 +1027,7 @@ BatchOnewaysAMI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -1067,17 +1088,17 @@ BatchOnewaysAMI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -1087,13 +1108,14 @@ BatchOnewaysAMI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -1123,6 +1145,7 @@ BatchOnewaysAMI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -1136,6 +1159,7 @@ TestI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -1196,17 +1220,17 @@ TestI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -1216,13 +1240,14 @@ TestI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -1252,6 +1277,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ @@ -1266,6 +1292,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -1326,17 +1353,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -1346,13 +1373,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -1382,6 +1410,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -1448,13 +1477,15 @@ TestAMD.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -1464,9 +1495,7 @@ TestAMD.obj: \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -1479,6 +1508,7 @@ TestAMDI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -1539,17 +1569,17 @@ TestAMDI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -1559,13 +1589,14 @@ TestAMDI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -1595,6 +1626,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestAMDI.h" \ "TestAMD.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ @@ -1609,6 +1641,7 @@ ServerAMD.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -1669,17 +1702,17 @@ ServerAMD.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -1689,13 +1722,14 @@ ServerAMD.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -1725,6 +1759,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -1739,6 +1774,7 @@ Collocated.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -1799,17 +1835,17 @@ Collocated.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -1819,13 +1855,14 @@ Collocated.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -1855,6 +1892,7 @@ Collocated.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ diff --git a/cpp/test/Ice/optional/.depend.mak b/cpp/test/Ice/optional/.depend.mak index 8283d3a8e32..45116743e89 100755 --- a/cpp/test/Ice/optional/.depend.mak +++ b/cpp/test/Ice/optional/.depend.mak @@ -63,13 +63,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -78,14 +80,14 @@ Test.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "CustomMap.h" \ "StringView.h" \ "$(includedir)\Ice\Ice.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\Plugin.h" \ "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ @@ -93,7 +95,6 @@ Test.obj: \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\Properties.h" \ @@ -101,6 +102,7 @@ Test.obj: \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -130,6 +132,7 @@ Test.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\Ice\Outgoing.h" \ TestI.obj: \ @@ -138,6 +141,7 @@ TestI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -198,17 +202,17 @@ TestI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -218,13 +222,14 @@ TestI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -254,6 +259,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ "CustomMap.h" \ @@ -265,6 +271,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -325,17 +332,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -345,13 +352,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -381,6 +389,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -397,6 +406,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -457,17 +467,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -477,13 +487,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -513,6 +524,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -528,6 +540,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -588,17 +601,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -608,13 +621,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -644,6 +658,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -712,13 +727,15 @@ TestAMD.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -728,14 +745,14 @@ TestAMD.obj: \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "CustomMap.h" \ "StringView.h" \ "$(includedir)\Ice\Ice.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\Plugin.h" \ "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ @@ -743,13 +760,13 @@ TestAMD.obj: \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -779,6 +796,7 @@ TestAMD.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\Ice\Outgoing.h" \ TestAMDI.obj: \ @@ -787,6 +805,7 @@ TestAMDI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -847,17 +866,17 @@ TestAMDI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -867,13 +886,14 @@ TestAMDI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -903,6 +923,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestAMDI.h" \ "TestAMD.h" \ "CustomMap.h" \ @@ -914,6 +935,7 @@ ServerAMD.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -974,17 +996,17 @@ ServerAMD.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -994,13 +1016,14 @@ ServerAMD.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -1030,6 +1053,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ diff --git a/cpp/test/Ice/plugin/.depend.mak b/cpp/test/Ice/plugin/.depend.mak index bc8a2cd7584..4835210dd5e 100755 --- a/cpp/test/Ice/plugin/.depend.mak +++ b/cpp/test/Ice/plugin/.depend.mak @@ -5,6 +5,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -65,17 +66,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -85,13 +86,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -121,6 +123,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -133,6 +136,7 @@ Plugin.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -193,17 +197,17 @@ Plugin.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -213,13 +217,14 @@ Plugin.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -249,6 +254,7 @@ Plugin.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ diff --git a/cpp/test/Ice/properties/.depend.mak b/cpp/test/Ice/properties/.depend.mak index ba2e103148d..b969197fdb3 100755 --- a/cpp/test/Ice/properties/.depend.mak +++ b/cpp/test/Ice/properties/.depend.mak @@ -5,6 +5,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -65,17 +66,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -85,13 +86,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -121,6 +123,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ diff --git a/cpp/test/Ice/proxy/.depend.mak b/cpp/test/Ice/proxy/.depend.mak index f38c3b9ccfe..bc55a29447b 100755 --- a/cpp/test/Ice/proxy/.depend.mak +++ b/cpp/test/Ice/proxy/.depend.mak @@ -73,13 +73,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -87,8 +89,8 @@ Test.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -101,6 +103,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -161,17 +164,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -181,13 +184,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -217,6 +221,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -230,6 +235,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -290,17 +296,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -310,13 +316,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -346,6 +353,12 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ + "..\..\..\src\Ice\EndpointI.h" \ + "..\..\..\src\Ice\EndpointIF.h" \ + "..\..\..\src\Ice\TransceiverF.h" \ + "..\..\..\src\Ice\ConnectorF.h" \ + "..\..\..\src\Ice\AcceptorF.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -359,6 +372,7 @@ TestI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -419,17 +433,17 @@ TestI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -439,13 +453,14 @@ TestI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -475,6 +490,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ @@ -489,6 +505,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -549,17 +566,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -569,13 +586,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -605,6 +623,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -671,13 +690,15 @@ TestAMD.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -686,8 +707,8 @@ TestAMD.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -700,6 +721,7 @@ TestAMDI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -760,17 +782,17 @@ TestAMDI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -780,13 +802,14 @@ TestAMDI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -816,6 +839,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestAMDI.h" \ "TestAMD.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ @@ -830,6 +854,7 @@ ServerAMD.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -890,17 +915,17 @@ ServerAMD.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -910,13 +935,14 @@ ServerAMD.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -946,6 +972,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -960,6 +987,7 @@ Collocated.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -1020,17 +1048,17 @@ Collocated.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -1040,13 +1068,14 @@ Collocated.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -1076,6 +1105,7 @@ Collocated.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ diff --git a/cpp/test/Ice/retry/.depend.mak b/cpp/test/Ice/retry/.depend.mak index adb5a97e8da..dae36e541b4 100755 --- a/cpp/test/Ice/retry/.depend.mak +++ b/cpp/test/Ice/retry/.depend.mak @@ -60,13 +60,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -74,8 +76,8 @@ Test.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -88,6 +90,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -148,17 +151,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -168,13 +171,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -204,6 +208,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -218,6 +223,7 @@ InstrumentationI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -278,17 +284,17 @@ InstrumentationI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -298,13 +304,14 @@ InstrumentationI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -334,6 +341,7 @@ InstrumentationI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -346,6 +354,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -406,17 +415,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -426,13 +435,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -462,6 +472,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -477,6 +488,7 @@ TestI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -537,17 +549,17 @@ TestI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -557,13 +569,14 @@ TestI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -593,6 +606,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ "SystemFailure.h" \ @@ -603,6 +617,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -663,17 +678,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -683,13 +698,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -719,6 +735,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -733,6 +750,7 @@ Collocated.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -793,17 +811,17 @@ Collocated.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -813,13 +831,14 @@ Collocated.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -849,6 +868,7 @@ Collocated.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ diff --git a/cpp/test/Ice/servantLocator/.depend.mak b/cpp/test/Ice/servantLocator/.depend.mak index c12e76ab764..33035a6aeaf 100755 --- a/cpp/test/Ice/servantLocator/.depend.mak +++ b/cpp/test/Ice/servantLocator/.depend.mak @@ -63,13 +63,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -78,9 +80,7 @@ Test.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -94,6 +94,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -154,17 +155,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -174,13 +175,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -209,6 +211,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -222,6 +225,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -282,17 +286,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -302,13 +306,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -338,6 +343,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -374,6 +380,7 @@ TestI.obj: \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\Ice\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -417,17 +424,17 @@ TestI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\Ice\Value.h" \ @@ -436,13 +443,14 @@ TestI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -471,6 +479,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ @@ -481,6 +490,7 @@ ServantLocatorI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -541,17 +551,17 @@ ServantLocatorI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -561,13 +571,14 @@ ServantLocatorI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -597,6 +608,7 @@ ServantLocatorI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ @@ -611,6 +623,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -671,17 +684,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -691,13 +704,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -726,6 +740,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "ServantLocatorI.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ @@ -793,13 +808,15 @@ TestAMD.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -809,9 +826,7 @@ TestAMD.obj: \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -847,6 +862,7 @@ TestAMDI.obj: \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\Ice\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -890,17 +906,17 @@ TestAMDI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\Ice\Value.h" \ @@ -909,13 +925,14 @@ TestAMDI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -944,6 +961,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestAMDI.h" \ "TestAMD.h" \ @@ -954,6 +972,7 @@ ServerAMD.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -1014,17 +1033,17 @@ ServerAMD.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -1034,13 +1053,14 @@ ServerAMD.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -1069,6 +1089,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "ServantLocatorI.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ @@ -1085,6 +1106,7 @@ Collocated.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -1145,17 +1167,17 @@ Collocated.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -1165,13 +1187,14 @@ Collocated.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -1200,6 +1223,7 @@ Collocated.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "ServantLocatorI.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ diff --git a/cpp/test/Ice/services/.depend.mak b/cpp/test/Ice/services/.depend.mak index d3ae3494aa7..a9774bfaff5 100755 --- a/cpp/test/Ice/services/.depend.mak +++ b/cpp/test/Ice/services/.depend.mak @@ -60,13 +60,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -74,8 +76,8 @@ Test.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -88,6 +90,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -148,17 +151,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -168,13 +171,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -204,6 +208,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -217,6 +222,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -277,17 +283,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -297,13 +303,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -333,6 +340,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\Glacier2\Glacier2.h" \ "$(includedir)\Glacier2\Router.h" \ "$(includedir)\Glacier2\Session.h" \ diff --git a/cpp/test/Ice/slicing/exceptions/.depend.mak b/cpp/test/Ice/slicing/exceptions/.depend.mak index 9abe3d1215d..4067f498a59 100755 --- a/cpp/test/Ice/slicing/exceptions/.depend.mak +++ b/cpp/test/Ice/slicing/exceptions/.depend.mak @@ -75,13 +75,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -90,9 +92,7 @@ Test.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -106,6 +106,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -166,17 +167,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -186,13 +187,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -222,6 +224,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -287,13 +290,15 @@ ClientPrivate.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -302,10 +307,8 @@ ClientPrivate.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "Test.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -319,6 +322,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -379,17 +383,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -399,13 +403,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -435,6 +440,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -501,13 +507,15 @@ ServerPrivate.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -516,10 +524,8 @@ ServerPrivate.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "Test.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -586,13 +592,15 @@ TestI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -601,13 +609,13 @@ TestI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "Test.h" \ "$(includedir)\Ice\Ice.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\Plugin.h" \ "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ @@ -615,7 +623,6 @@ TestI.obj: \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\Properties.h" \ @@ -623,6 +630,7 @@ TestI.obj: \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -652,6 +660,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -664,6 +673,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -724,17 +734,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -744,13 +754,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -780,6 +791,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "ServerPrivate.h" \ "Test.h" \ @@ -847,13 +859,15 @@ TestAMD.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -863,9 +877,7 @@ TestAMD.obj: \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -931,13 +943,15 @@ ServerPrivateAMD.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -947,10 +961,8 @@ ServerPrivateAMD.obj: \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "TestAMD.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -1017,13 +1029,15 @@ TestAMDI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -1033,13 +1047,13 @@ TestAMDI.obj: \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "TestAMD.h" \ "$(includedir)\Ice\Ice.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\Plugin.h" \ "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ @@ -1047,13 +1061,13 @@ TestAMDI.obj: \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -1083,6 +1097,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -1095,6 +1110,7 @@ ServerAMD.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -1155,17 +1171,17 @@ ServerAMD.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -1175,13 +1191,14 @@ ServerAMD.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -1211,6 +1228,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestAMDI.h" \ "ServerPrivateAMD.h" \ "TestAMD.h" \ diff --git a/cpp/test/Ice/slicing/objects/.depend.mak b/cpp/test/Ice/slicing/objects/.depend.mak index 6fac2ce0ead..b0ea2d3a004 100755 --- a/cpp/test/Ice/slicing/objects/.depend.mak +++ b/cpp/test/Ice/slicing/objects/.depend.mak @@ -17,9 +17,6 @@ ServerPrivateAMD.h: \ ServerPrivateAMD.ice \ ./TestAMD.ice -Forward.h: \ - Forward.ice - Test.obj: \ Test.cpp \ "Test.h" \ @@ -78,13 +75,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -94,9 +93,7 @@ Test.obj: \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -162,13 +159,15 @@ ClientPrivate.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -178,10 +177,8 @@ ClientPrivate.obj: \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "Test.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -195,6 +192,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -255,17 +253,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -275,13 +273,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -311,6 +310,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -325,6 +325,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -385,17 +386,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -405,13 +406,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -441,6 +443,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -449,88 +452,6 @@ AllTests.obj: \ "ClientPrivate.h" \ "Test.h" \ -Forward.obj: \ - Forward.cpp \ - "Forward.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\Ice\ProxyF.h" \ - "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\Ice\Config.h" \ - "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\Ice\ValueF.h" \ - "$(includedir)\Ice\Exception.h" \ - "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ - "$(includedir)\Ice\LocalObject.h" \ - "$(includedir)\Ice\LocalObjectF.h" \ - "$(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" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\Ice\ProxyFactoryF.h" \ - "$(includedir)\Ice\ConnectionIF.h" \ - "$(includedir)\Ice\RequestHandlerF.h" \ - "$(includedir)\Ice\EndpointF.h" \ - "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\EndpointTypes.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\Ice\ReferenceF.h" \ - "$(includedir)\Ice\BatchRequestQueueF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(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\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\Outgoing.h" \ - "$(includedir)\Ice\OutgoingAsync.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\Ice\OutgoingAsyncF.h" \ - ServerPrivate.obj: \ ServerPrivate.cpp \ "ServerPrivate.h" \ @@ -589,13 +510,15 @@ ServerPrivate.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -605,10 +528,8 @@ ServerPrivate.obj: \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "Test.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -675,13 +596,15 @@ TestI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -691,28 +614,33 @@ TestI.obj: \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "Test.h" \ - "Forward.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ + "$(includedir)\IceUtil\IceUtil.h" \ + "$(includedir)\IceUtil\CtrlCHandler.h" \ + "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\RecMutex.h" \ + "$(includedir)\IceUtil\Thread.h" \ + "$(includedir)\IceUtil\Timer.h" \ + "$(includedir)\IceUtil\UUID.h" \ "$(includedir)\Ice\Ice.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\Plugin.h" \ "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Initialize.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -730,7 +658,6 @@ TestI.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\IceUtil\Functional.h" \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ @@ -742,11 +669,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ - "$(top_srcdir)\test\include\TestCommon.h" \ - "$(includedir)\IceUtil\IceUtil.h" \ - "$(includedir)\IceUtil\CtrlCHandler.h" \ - "$(includedir)\IceUtil\RecMutex.h" \ - "$(includedir)\IceUtil\UUID.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ Server.obj: \ Server.cpp \ @@ -754,6 +677,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -814,17 +738,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -834,13 +758,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -870,10 +795,10 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "ServerPrivate.h" \ "Test.h" \ - "Forward.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -938,13 +863,15 @@ TestAMD.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -954,9 +881,7 @@ TestAMD.obj: \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -1022,13 +947,15 @@ ServerPrivateAMD.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -1038,10 +965,8 @@ ServerPrivateAMD.obj: \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "TestAMD.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -1108,13 +1033,15 @@ TestAMDI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -1124,14 +1051,13 @@ TestAMDI.obj: \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "TestAMD.h" \ - "Forward.h" \ "$(includedir)\Ice\Ice.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\Plugin.h" \ "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ @@ -1139,13 +1065,13 @@ TestAMDI.obj: \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -1175,6 +1101,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -1187,6 +1114,7 @@ ServerAMD.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -1247,17 +1175,17 @@ ServerAMD.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -1267,13 +1195,14 @@ ServerAMD.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -1303,10 +1232,10 @@ ServerAMD.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestAMDI.h" \ "ServerPrivateAMD.h" \ "TestAMD.h" \ - "Forward.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ diff --git a/cpp/test/Ice/slicing/objects/Makefile.mak b/cpp/test/Ice/slicing/objects/Makefile.mak index 872cbce6b6c..c708e09ff51 100644 --- a/cpp/test/Ice/slicing/objects/Makefile.mak +++ b/cpp/test/Ice/slicing/objects/Makefile.mak @@ -20,25 +20,21 @@ SLICE_OBJS = .\Test.obj \ .\ClientPrivate.obj \ .\ServerPrivate.obj \ .\ServerPrivateAMD.obj \ - .\Forward.obj COBJS = .\Test.obj \ .\ClientPrivate.obj \ .\Client.obj \ .\AllTests.obj \ - .\Forward.obj SOBJS = .\Test.obj \ .\ServerPrivate.obj \ .\TestI.obj \ .\Server.obj \ - .\Forward.obj SAMDOBJS = .\TestAMD.obj \ .\ServerPrivateAMD.obj \ .\TestAMDI.obj \ .\ServerAMD.obj \ - .\Forward.obj OBJS = $(COBJS) \ $(SOBJS) \ @@ -77,4 +73,3 @@ clean:: del /q ClientPrivate.cpp ClientPrivate.h del /q ServerPrivate.cpp ServerPrivate.h del /q ServerPrivateAMD.cpp ServerPrivateAMD.h - del /q Forward.cpp Forward.h diff --git a/cpp/test/Ice/stream/.depend.mak b/cpp/test/Ice/stream/.depend.mak index 96709144f71..c7b7d9f3482 100755 --- a/cpp/test/Ice/stream/.depend.mak +++ b/cpp/test/Ice/stream/.depend.mak @@ -61,13 +61,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -76,9 +78,7 @@ Test.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -92,6 +92,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -152,17 +153,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -172,13 +173,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -208,6 +210,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ diff --git a/cpp/test/Ice/stringConverter/.depend.mak b/cpp/test/Ice/stringConverter/.depend.mak index 14fb5c6f44f..6c83bfea4ef 100755 --- a/cpp/test/Ice/stringConverter/.depend.mak +++ b/cpp/test/Ice/stringConverter/.depend.mak @@ -60,13 +60,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -75,9 +77,7 @@ Test.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -90,6 +90,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -150,17 +151,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -170,13 +171,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -206,6 +208,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -219,6 +222,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -279,17 +283,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -299,13 +303,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -335,6 +340,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ diff --git a/cpp/test/Ice/threadPoolPriority/.depend.mak b/cpp/test/Ice/threadPoolPriority/.depend.mak index ffbfce8d58f..49f825095f1 100755 --- a/cpp/test/Ice/threadPoolPriority/.depend.mak +++ b/cpp/test/Ice/threadPoolPriority/.depend.mak @@ -60,13 +60,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -74,8 +76,8 @@ Test.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -88,6 +90,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -148,17 +151,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -168,13 +171,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -204,6 +208,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -217,6 +222,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -277,17 +283,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -297,13 +303,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -333,6 +340,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -346,6 +354,7 @@ TestI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -406,17 +415,17 @@ TestI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -426,13 +435,14 @@ TestI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -462,6 +472,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ @@ -471,6 +482,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -531,17 +543,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -551,13 +563,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -587,6 +600,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ @@ -601,6 +615,7 @@ ServerCustomThreadPool.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -661,17 +676,17 @@ ServerCustomThreadPool.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -681,13 +696,14 @@ ServerCustomThreadPool.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -717,6 +733,7 @@ ServerCustomThreadPool.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ diff --git a/cpp/test/Ice/timeout/.depend.mak b/cpp/test/Ice/timeout/.depend.mak index df7c1716b35..fafff21be5e 100755 --- a/cpp/test/Ice/timeout/.depend.mak +++ b/cpp/test/Ice/timeout/.depend.mak @@ -60,13 +60,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -74,8 +76,8 @@ Test.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -141,13 +143,15 @@ TestI.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -155,28 +159,34 @@ TestI.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ + "$(includedir)\IceUtil\IceUtil.h" \ + "$(includedir)\IceUtil\CtrlCHandler.h" \ + "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\RecMutex.h" \ + "$(includedir)\IceUtil\Thread.h" \ + "$(includedir)\IceUtil\Timer.h" \ + "$(includedir)\IceUtil\UUID.h" \ "$(includedir)\Ice\Ice.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\Plugin.h" \ "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Initialize.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -194,7 +204,6 @@ TestI.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\IceUtil\Functional.h" \ "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ @@ -206,6 +215,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ Client.obj: \ Client.cpp \ @@ -213,6 +223,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -273,17 +284,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -293,13 +304,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -329,6 +341,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -342,6 +355,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -402,17 +416,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -422,13 +436,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -458,6 +473,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -472,6 +488,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -532,17 +549,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -552,13 +569,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -588,6 +606,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ diff --git a/cpp/test/Ice/udp/.depend.mak b/cpp/test/Ice/udp/.depend.mak index 014f4090a05..031422890ae 100755 --- a/cpp/test/Ice/udp/.depend.mak +++ b/cpp/test/Ice/udp/.depend.mak @@ -61,13 +61,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -75,8 +77,8 @@ Test.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -89,6 +91,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -149,17 +152,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -169,13 +172,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -205,6 +209,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -218,6 +223,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -278,17 +284,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -298,13 +304,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -334,6 +341,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -370,6 +378,7 @@ TestI.obj: \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\Ice\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -413,17 +422,17 @@ TestI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\Ice\Value.h" \ @@ -432,13 +441,14 @@ TestI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -467,8 +477,10 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ Server.obj: \ Server.cpp \ @@ -476,6 +488,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -536,17 +549,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -556,13 +569,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -592,6 +606,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ diff --git a/cpp/test/IceBox/admin/.depend.mak b/cpp/test/IceBox/admin/.depend.mak index 9dd22223f74..2786c5755f0 100755 --- a/cpp/test/IceBox/admin/.depend.mak +++ b/cpp/test/IceBox/admin/.depend.mak @@ -63,13 +63,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -78,10 +80,10 @@ Test.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -94,6 +96,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -154,17 +157,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -174,13 +177,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -210,6 +214,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ @@ -223,6 +228,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -283,17 +289,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -303,13 +309,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -339,6 +346,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -352,6 +360,7 @@ TestI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -412,17 +421,17 @@ TestI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -432,13 +441,14 @@ TestI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -468,6 +478,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ @@ -477,6 +488,7 @@ Service.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -537,17 +549,17 @@ Service.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -557,13 +569,14 @@ Service.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -593,6 +606,7 @@ Service.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceBox\IceBox.h" \ "$(includedir)\IceBox\Config.h" \ "TestI.h" \ diff --git a/cpp/test/IceBox/configuration/.depend.mak b/cpp/test/IceBox/configuration/.depend.mak index fe2953e966b..456a7b83fb9 100755 --- a/cpp/test/IceBox/configuration/.depend.mak +++ b/cpp/test/IceBox/configuration/.depend.mak @@ -61,13 +61,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -75,8 +77,8 @@ Test.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -89,6 +91,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -149,17 +152,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -169,13 +172,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -205,6 +209,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ @@ -218,6 +223,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -278,17 +284,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -298,13 +304,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -334,6 +341,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -347,6 +355,7 @@ TestI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -407,17 +416,17 @@ TestI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -427,13 +436,14 @@ TestI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -463,6 +473,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ @@ -472,6 +483,7 @@ Service.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -532,17 +544,17 @@ Service.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -552,13 +564,14 @@ Service.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -588,6 +601,7 @@ Service.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceBox\IceBox.h" \ "$(includedir)\IceBox\Config.h" \ "TestI.h" \ diff --git a/cpp/test/IceDiscovery/simple/.depend.mak b/cpp/test/IceDiscovery/simple/.depend.mak index fc201e5e491..8f0e0560223 100755 --- a/cpp/test/IceDiscovery/simple/.depend.mak +++ b/cpp/test/IceDiscovery/simple/.depend.mak @@ -60,13 +60,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -74,8 +76,8 @@ Test.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -88,6 +90,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -148,17 +151,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -168,13 +171,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -204,6 +208,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -217,6 +222,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -277,17 +283,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -297,13 +303,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -333,6 +340,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -369,6 +377,7 @@ TestI.obj: \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\Ice\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -412,17 +421,17 @@ TestI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\Ice\Value.h" \ @@ -431,13 +440,14 @@ TestI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -466,8 +476,10 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ + "$(top_srcdir)\test\include\TestCommon.h" \ Server.obj: \ Server.cpp \ @@ -475,6 +487,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -535,17 +548,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -555,13 +568,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -591,6 +605,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ diff --git a/cpp/test/IceGrid/activation/.depend.mak b/cpp/test/IceGrid/activation/.depend.mak index 0a8e26ec134..11a0fc5539f 100755 --- a/cpp/test/IceGrid/activation/.depend.mak +++ b/cpp/test/IceGrid/activation/.depend.mak @@ -60,13 +60,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -74,8 +76,8 @@ Test.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -88,6 +90,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -148,17 +151,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -168,13 +171,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -204,6 +208,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -217,6 +222,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -277,17 +283,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -297,13 +303,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -333,6 +340,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceGrid\IceGrid.h" \ "$(includedir)\IceGrid\Admin.h" \ "$(includedir)\Glacier2\Session.h" \ @@ -362,6 +370,7 @@ TestI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -422,17 +431,17 @@ TestI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -442,13 +451,14 @@ TestI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -478,6 +488,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ @@ -487,6 +498,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -547,17 +559,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -567,13 +579,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -603,5 +616,6 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ diff --git a/cpp/test/IceGrid/admin/.depend.mak b/cpp/test/IceGrid/admin/.depend.mak index 441e01cda0c..36cb4464ffc 100755 --- a/cpp/test/IceGrid/admin/.depend.mak +++ b/cpp/test/IceGrid/admin/.depend.mak @@ -5,6 +5,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -65,17 +66,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -85,13 +86,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -121,3 +123,4 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ diff --git a/cpp/test/IceGrid/allocation/.depend.mak b/cpp/test/IceGrid/allocation/.depend.mak index 395461c6468..8b64d5f5fa5 100755 --- a/cpp/test/IceGrid/allocation/.depend.mak +++ b/cpp/test/IceGrid/allocation/.depend.mak @@ -60,13 +60,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -74,8 +76,8 @@ Test.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -88,6 +90,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -148,17 +151,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -168,13 +171,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -204,6 +208,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -228,6 +233,7 @@ AllTests.obj: \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -278,17 +284,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -298,13 +304,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -334,6 +341,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceGrid\IceGrid.h" \ "$(includedir)\IceGrid\Admin.h" \ "$(includedir)\Glacier2\Session.h" \ @@ -365,6 +373,7 @@ TestI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -425,17 +434,17 @@ TestI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -445,13 +454,14 @@ TestI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -481,6 +491,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ @@ -490,6 +501,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -550,17 +562,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -570,13 +582,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -606,6 +619,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ @@ -620,6 +634,7 @@ PermissionsVerifier.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -680,17 +695,17 @@ PermissionsVerifier.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -700,13 +715,14 @@ PermissionsVerifier.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -736,6 +752,7 @@ PermissionsVerifier.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\Glacier2\PermissionsVerifier.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Glacier2\Config.h" \ diff --git a/cpp/test/IceGrid/deployer/.depend.mak b/cpp/test/IceGrid/deployer/.depend.mak index 76ce806d5ff..ed27deee656 100755 --- a/cpp/test/IceGrid/deployer/.depend.mak +++ b/cpp/test/IceGrid/deployer/.depend.mak @@ -60,13 +60,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -74,8 +76,8 @@ Test.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -88,6 +90,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -148,17 +151,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -168,13 +171,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -204,6 +208,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -217,6 +222,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -277,17 +283,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -297,13 +303,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -333,6 +340,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceGrid\IceGrid.h" \ "$(includedir)\IceGrid\Admin.h" \ "$(includedir)\Glacier2\Session.h" \ @@ -362,6 +370,7 @@ TestI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -422,17 +431,17 @@ TestI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -442,13 +451,14 @@ TestI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -478,6 +488,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ @@ -488,6 +499,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -548,17 +560,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -568,13 +580,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -604,6 +617,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ @@ -618,6 +632,7 @@ Service.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -678,17 +693,17 @@ Service.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -698,13 +713,14 @@ Service.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -734,6 +750,7 @@ Service.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceBox\IceBox.h" \ "$(includedir)\IceBox\Config.h" \ "TestI.h" \ diff --git a/cpp/test/IceGrid/distribution/.depend.mak b/cpp/test/IceGrid/distribution/.depend.mak index 2fc87e56322..6158b5638ce 100755 --- a/cpp/test/IceGrid/distribution/.depend.mak +++ b/cpp/test/IceGrid/distribution/.depend.mak @@ -60,13 +60,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -74,8 +76,8 @@ Test.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -88,6 +90,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -148,17 +151,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -168,13 +171,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -204,6 +208,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -227,6 +232,7 @@ AllTests.obj: \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -277,17 +283,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -297,13 +303,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -333,6 +340,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceGrid\IceGrid.h" \ "$(includedir)\IceGrid\Admin.h" \ "$(includedir)\Glacier2\Session.h" \ @@ -362,6 +370,7 @@ TestI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -422,17 +431,17 @@ TestI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -442,13 +451,14 @@ TestI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -478,6 +488,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ @@ -487,6 +498,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -547,17 +559,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -567,13 +579,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -603,6 +616,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ diff --git a/cpp/test/IceGrid/noRestartUpdate/.depend.mak b/cpp/test/IceGrid/noRestartUpdate/.depend.mak index d99a3a60369..c4a923a883b 100755 --- a/cpp/test/IceGrid/noRestartUpdate/.depend.mak +++ b/cpp/test/IceGrid/noRestartUpdate/.depend.mak @@ -60,13 +60,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -74,8 +76,8 @@ Test.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -88,6 +90,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -148,17 +151,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -168,13 +171,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -204,6 +208,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -227,6 +232,7 @@ AllTests.obj: \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -277,17 +283,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -297,13 +303,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -333,6 +340,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceGrid\IceGrid.h" \ "$(includedir)\IceGrid\Admin.h" \ "$(includedir)\Glacier2\Session.h" \ @@ -362,6 +370,7 @@ TestI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -422,17 +431,17 @@ TestI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -442,13 +451,14 @@ TestI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -478,6 +488,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ @@ -487,6 +498,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -547,17 +559,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -567,13 +579,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -603,6 +616,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ @@ -617,6 +631,7 @@ Service.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -677,17 +692,17 @@ Service.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -697,13 +712,14 @@ Service.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -733,6 +749,7 @@ Service.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceBox\IceBox.h" \ "$(includedir)\IceBox\Config.h" \ "TestI.h" \ diff --git a/cpp/test/IceGrid/replicaGroup/.depend.mak b/cpp/test/IceGrid/replicaGroup/.depend.mak index 78a0378a133..c6e287c0eba 100755 --- a/cpp/test/IceGrid/replicaGroup/.depend.mak +++ b/cpp/test/IceGrid/replicaGroup/.depend.mak @@ -60,13 +60,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -74,8 +76,8 @@ Test.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -88,6 +90,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -148,17 +151,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -168,13 +171,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -204,6 +208,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -217,6 +222,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -277,17 +283,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -297,13 +303,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -333,6 +340,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceGrid\IceGrid.h" \ "$(includedir)\IceGrid\Admin.h" \ "$(includedir)\Glacier2\Session.h" \ @@ -362,6 +370,7 @@ TestI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -422,17 +431,17 @@ TestI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -442,13 +451,14 @@ TestI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -478,6 +488,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ @@ -487,6 +498,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -547,17 +559,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -567,13 +579,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -603,6 +616,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ @@ -617,6 +631,7 @@ Service.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -677,17 +692,17 @@ Service.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -697,13 +712,14 @@ Service.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -733,6 +749,7 @@ Service.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceBox\IceBox.h" \ "$(includedir)\IceBox\Config.h" \ "TestI.h" \ diff --git a/cpp/test/IceGrid/replication/.depend.mak b/cpp/test/IceGrid/replication/.depend.mak index 424ac8034e2..29d8f25e8ad 100755 --- a/cpp/test/IceGrid/replication/.depend.mak +++ b/cpp/test/IceGrid/replication/.depend.mak @@ -60,13 +60,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -74,8 +76,8 @@ Test.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -88,6 +90,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -148,17 +151,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -168,13 +171,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -204,6 +208,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -217,6 +222,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -277,17 +283,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -297,13 +303,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -333,6 +340,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceGrid\IceGrid.h" \ "$(includedir)\IceGrid\Admin.h" \ "$(includedir)\Glacier2\Session.h" \ @@ -362,6 +370,7 @@ TestI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -422,17 +431,17 @@ TestI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -442,13 +451,14 @@ TestI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -478,6 +488,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ @@ -487,6 +498,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -547,17 +559,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -567,13 +579,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -603,6 +616,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ diff --git a/cpp/test/IceGrid/session/.depend.mak b/cpp/test/IceGrid/session/.depend.mak index 933177e4034..ec31c5dfdc9 100755 --- a/cpp/test/IceGrid/session/.depend.mak +++ b/cpp/test/IceGrid/session/.depend.mak @@ -63,13 +63,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -78,12 +80,10 @@ Test.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Glacier2\PermissionsVerifier.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Glacier2\Config.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -97,6 +97,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -157,17 +158,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -177,13 +178,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -213,6 +215,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -235,6 +238,7 @@ AllTests.obj: \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -285,17 +289,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -305,13 +309,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -341,6 +346,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceGrid\IceGrid.h" \ "$(includedir)\IceGrid\Admin.h" \ "$(includedir)\Glacier2\Session.h" \ @@ -372,6 +378,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -432,17 +439,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -452,13 +459,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -488,6 +496,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\Glacier2\PermissionsVerifier.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Glacier2\Config.h" \ @@ -507,6 +516,7 @@ PermissionsVerifier.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -567,17 +577,17 @@ PermissionsVerifier.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -587,13 +597,14 @@ PermissionsVerifier.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -623,6 +634,7 @@ PermissionsVerifier.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\Glacier2\PermissionsVerifier.h" \ "$(includedir)\Glacier2\SSLInfo.h" \ "$(includedir)\Glacier2\Config.h" \ diff --git a/cpp/test/IceGrid/simple/.depend.mak b/cpp/test/IceGrid/simple/.depend.mak index ba2e54050a4..ffedfe18fe7 100755 --- a/cpp/test/IceGrid/simple/.depend.mak +++ b/cpp/test/IceGrid/simple/.depend.mak @@ -60,13 +60,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -74,8 +76,8 @@ Test.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -88,6 +90,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -148,17 +151,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -168,13 +171,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -204,6 +208,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ @@ -240,6 +245,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\Ice\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -283,17 +289,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\Ice\Value.h" \ @@ -302,13 +308,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -337,6 +344,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceGrid\IceGrid.h" \ "$(includedir)\IceGrid\Admin.h" \ "$(includedir)\Glacier2\Session.h" \ @@ -362,6 +370,7 @@ TestI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -422,17 +431,17 @@ TestI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -442,13 +451,14 @@ TestI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -478,6 +488,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ @@ -487,6 +498,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -547,17 +559,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -567,13 +579,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -603,5 +616,6 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ diff --git a/cpp/test/IceGrid/update/.depend.mak b/cpp/test/IceGrid/update/.depend.mak index 2fc87e56322..6158b5638ce 100755 --- a/cpp/test/IceGrid/update/.depend.mak +++ b/cpp/test/IceGrid/update/.depend.mak @@ -60,13 +60,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -74,8 +76,8 @@ Test.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -88,6 +90,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -148,17 +151,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -168,13 +171,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -204,6 +208,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ @@ -227,6 +232,7 @@ AllTests.obj: \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -277,17 +283,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -297,13 +303,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -333,6 +340,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceGrid\IceGrid.h" \ "$(includedir)\IceGrid\Admin.h" \ "$(includedir)\Glacier2\Session.h" \ @@ -362,6 +370,7 @@ TestI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -422,17 +431,17 @@ TestI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -442,13 +451,14 @@ TestI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -478,6 +488,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ @@ -487,6 +498,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -547,17 +559,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -567,13 +579,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -603,6 +616,7 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ diff --git a/cpp/test/IceSSL/configuration/.depend.mak b/cpp/test/IceSSL/configuration/.depend.mak index d404ab117a9..29c1bafaef0 100755 --- a/cpp/test/IceSSL/configuration/.depend.mak +++ b/cpp/test/IceSSL/configuration/.depend.mak @@ -60,13 +60,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -74,8 +76,8 @@ Test.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -88,6 +90,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -148,17 +151,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -168,13 +171,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -204,6 +208,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceSSL\IceSSL.h" \ "$(includedir)\IceSSL\Plugin.h" \ "$(includedir)\IceSSL\Config.h" \ @@ -216,6 +221,7 @@ AllTests.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -276,17 +282,17 @@ AllTests.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -296,13 +302,14 @@ AllTests.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -332,6 +339,7 @@ AllTests.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceSSL\Plugin.h" \ "$(includedir)\IceSSL\Config.h" \ "$(includedir)\IceSSL\ConnectionInfo.h" \ @@ -348,6 +356,7 @@ TestI.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -408,17 +417,17 @@ TestI.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -428,13 +437,14 @@ TestI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -464,6 +474,7 @@ TestI.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ @@ -481,6 +492,7 @@ Server.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -541,17 +553,17 @@ Server.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -561,13 +573,14 @@ Server.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -597,5 +610,6 @@ Server.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "TestI.h" \ "Test.h" \ diff --git a/cpp/test/IceStorm/federation/.depend.mak b/cpp/test/IceStorm/federation/.depend.mak index d47a900c4b7..6d51b0377ed 100755 --- a/cpp/test/IceStorm/federation/.depend.mak +++ b/cpp/test/IceStorm/federation/.depend.mak @@ -60,13 +60,15 @@ Event.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -74,8 +76,8 @@ Event.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -88,6 +90,7 @@ Publisher.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -148,17 +151,17 @@ Publisher.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -168,13 +171,14 @@ Publisher.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -204,6 +208,7 @@ Publisher.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\IceStorm\Metrics.h" \ "$(includedir)\IceStorm\Config.h" \ @@ -215,6 +220,7 @@ Subscriber.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -275,17 +281,17 @@ Subscriber.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -295,13 +301,14 @@ Subscriber.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -331,6 +338,7 @@ Subscriber.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\IceStorm\Metrics.h" \ "$(includedir)\IceStorm\Config.h" \ diff --git a/cpp/test/IceStorm/federation2/.depend.mak b/cpp/test/IceStorm/federation2/.depend.mak index 46a81acef02..3716303bd85 100755 --- a/cpp/test/IceStorm/federation2/.depend.mak +++ b/cpp/test/IceStorm/federation2/.depend.mak @@ -60,13 +60,15 @@ Event.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -74,8 +76,8 @@ Event.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -112,6 +114,7 @@ Publisher.obj: \ "$(includedir)\IceUtil\Options.h" \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\Ice\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -155,17 +158,17 @@ Publisher.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\Ice\Value.h" \ @@ -174,13 +177,14 @@ Publisher.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -209,6 +213,7 @@ Publisher.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\IceStorm\Metrics.h" \ "$(includedir)\IceStorm\Config.h" \ @@ -220,6 +225,7 @@ Subscriber.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -280,17 +286,17 @@ Subscriber.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -300,13 +306,14 @@ Subscriber.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -336,6 +343,7 @@ Subscriber.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\IceStorm\Metrics.h" \ "$(includedir)\IceStorm\Config.h" \ diff --git a/cpp/test/IceStorm/rep1/.depend.mak b/cpp/test/IceStorm/rep1/.depend.mak index 64d7a1b0430..388336b7be6 100755 --- a/cpp/test/IceStorm/rep1/.depend.mak +++ b/cpp/test/IceStorm/rep1/.depend.mak @@ -60,13 +60,15 @@ Single.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -74,8 +76,8 @@ Single.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -88,6 +90,7 @@ Publisher.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -148,17 +151,17 @@ Publisher.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -168,13 +171,14 @@ Publisher.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -204,6 +208,7 @@ Publisher.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceUtil\Options.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\IceUtil.h" \ @@ -244,6 +249,7 @@ Subscriber.obj: \ "$(includedir)\IceUtil\Options.h" \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\Ice\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -287,17 +293,17 @@ Subscriber.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\Ice\Value.h" \ @@ -306,13 +312,14 @@ Subscriber.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -341,6 +348,7 @@ Subscriber.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\IceStorm\Metrics.h" \ "$(includedir)\IceStorm\Config.h" \ @@ -377,6 +385,7 @@ Sub.obj: \ "$(includedir)\IceUtil\Options.h" \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\Ice\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -420,17 +429,17 @@ Sub.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\Ice\Value.h" \ @@ -439,13 +448,14 @@ Sub.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -474,6 +484,7 @@ Sub.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\IceStorm\Metrics.h" \ "$(includedir)\IceStorm\Config.h" \ diff --git a/cpp/test/IceStorm/repgrid/.depend.mak b/cpp/test/IceStorm/repgrid/.depend.mak index cc8cea436d7..512712215ad 100755 --- a/cpp/test/IceStorm/repgrid/.depend.mak +++ b/cpp/test/IceStorm/repgrid/.depend.mak @@ -60,13 +60,15 @@ Single.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -74,8 +76,8 @@ Single.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -88,6 +90,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -148,17 +151,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -168,13 +171,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -204,6 +208,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\IceStorm\Metrics.h" \ "$(includedir)\IceStorm\Config.h" \ diff --git a/cpp/test/IceStorm/repstress/.depend.mak b/cpp/test/IceStorm/repstress/.depend.mak index 744bff612e3..5ab4ed47cb5 100755 --- a/cpp/test/IceStorm/repstress/.depend.mak +++ b/cpp/test/IceStorm/repstress/.depend.mak @@ -63,13 +63,15 @@ Single.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -77,8 +79,8 @@ Single.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -143,13 +145,15 @@ Controller.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -157,8 +161,8 @@ Controller.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -171,6 +175,7 @@ Publisher.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -231,17 +236,17 @@ Publisher.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -251,13 +256,14 @@ Publisher.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -287,6 +293,7 @@ Publisher.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ "$(includedir)\IceUtil\RecMutex.h" \ @@ -326,6 +333,7 @@ Subscriber.obj: \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ "$(includedir)\Ice\Ice.h" \ "$(includedir)\Ice\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -369,17 +377,17 @@ Subscriber.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\Ice\Value.h" \ @@ -388,13 +396,14 @@ Subscriber.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -423,6 +432,7 @@ Subscriber.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\IceStorm\Metrics.h" \ "$(includedir)\IceStorm\Config.h" \ @@ -436,6 +446,7 @@ Control.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -496,17 +507,17 @@ Control.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -516,13 +527,14 @@ Control.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -552,4 +564,5 @@ Control.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "Controller.h" \ diff --git a/cpp/test/IceStorm/single/.depend.mak b/cpp/test/IceStorm/single/.depend.mak index fd6375acde5..ff28955c783 100755 --- a/cpp/test/IceStorm/single/.depend.mak +++ b/cpp/test/IceStorm/single/.depend.mak @@ -60,13 +60,15 @@ Single.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -74,8 +76,8 @@ Single.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -88,6 +90,7 @@ Publisher.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -148,17 +151,17 @@ Publisher.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -168,13 +171,14 @@ Publisher.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -204,6 +208,7 @@ Publisher.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\IceStorm\Metrics.h" \ "$(includedir)\IceStorm\Config.h" \ @@ -215,6 +220,7 @@ Subscriber.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -275,17 +281,17 @@ Subscriber.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -295,13 +301,14 @@ Subscriber.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -331,6 +338,7 @@ Subscriber.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\IceStorm\Metrics.h" \ "$(includedir)\IceStorm\Config.h" \ diff --git a/cpp/test/IceStorm/stress/.depend.mak b/cpp/test/IceStorm/stress/.depend.mak index fd67bc06cc3..f2eb3506f55 100755 --- a/cpp/test/IceStorm/stress/.depend.mak +++ b/cpp/test/IceStorm/stress/.depend.mak @@ -60,13 +60,15 @@ Event.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -74,8 +76,8 @@ Event.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -88,6 +90,7 @@ Publisher.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -148,17 +151,17 @@ Publisher.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -168,13 +171,14 @@ Publisher.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -204,6 +208,7 @@ Publisher.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceUtil\Options.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceStorm\IceStorm.h" \ @@ -217,6 +222,7 @@ Subscriber.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -277,17 +283,17 @@ Subscriber.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -297,13 +303,14 @@ Subscriber.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -333,6 +340,7 @@ Subscriber.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(includedir)\IceStorm\IceStorm.h" \ "$(includedir)\IceStorm\Metrics.h" \ "$(includedir)\IceStorm\Config.h" \ diff --git a/cpp/test/Slice/keyword/.depend.mak b/cpp/test/Slice/keyword/.depend.mak index eb0c6006bbc..ae119daa295 100755 --- a/cpp/test/Slice/keyword/.depend.mak +++ b/cpp/test/Slice/keyword/.depend.mak @@ -60,13 +60,15 @@ Key.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -76,9 +78,7 @@ Key.obj: \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -92,6 +92,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -152,17 +153,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -172,13 +173,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -208,6 +210,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ diff --git a/cpp/test/Slice/macros/.depend.mak b/cpp/test/Slice/macros/.depend.mak index e850ed85d00..84c73a1e0d1 100755 --- a/cpp/test/Slice/macros/.depend.mak +++ b/cpp/test/Slice/macros/.depend.mak @@ -60,13 +60,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -75,9 +77,7 @@ Test.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -90,6 +90,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -150,17 +151,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -170,13 +171,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -206,6 +208,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ diff --git a/cpp/test/Slice/parser/.depend.mak b/cpp/test/Slice/parser/.depend.mak index 4b73fea7084..3397be14b47 100755 --- a/cpp/test/Slice/parser/.depend.mak +++ b/cpp/test/Slice/parser/.depend.mak @@ -65,13 +65,15 @@ CircularA.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -79,9 +81,9 @@ CircularA.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "CircularB.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -146,13 +148,15 @@ CircularB.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -160,9 +164,9 @@ CircularB.obj: \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "CircularA.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.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 e73374df995..aeac5d308b9 100755 --- a/cpp/test/Slice/structure/.depend.mak +++ b/cpp/test/Slice/structure/.depend.mak @@ -63,13 +63,15 @@ Test.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ @@ -78,9 +80,7 @@ Test.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -145,13 +145,15 @@ Forward.obj: \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ Client.obj: \ Client.cpp \ @@ -159,6 +161,7 @@ Client.obj: \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\DeprecatedStringConverter.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -219,17 +222,17 @@ Client.obj: \ "$(includedir)\Ice\BasicStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -239,13 +242,14 @@ Client.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\RemoteLogger.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultObjectFactory.h" \ "$(includedir)\Ice\Communicator.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\PluginF.h" \ @@ -275,6 +279,7 @@ Client.obj: \ "$(includedir)\Ice\SliceChecksumDict.h" \ "$(includedir)\Ice\Service.h" \ "$(includedir)\Ice\RegisterPlugins.h" \ + "$(includedir)\Ice\InterfaceByValue.h" \ "$(top_srcdir)\test\include\TestCommon.h" \ "$(includedir)\IceUtil\IceUtil.h" \ "$(includedir)\IceUtil\CtrlCHandler.h" \ |