diff options
Diffstat (limited to 'cpp/test')
110 files changed, 2017 insertions, 2821 deletions
diff --git a/cpp/test/Common/.depend.mak b/cpp/test/Common/.depend.mak index c071e31c3db..60c0f82777b 100644..100755 --- a/cpp/test/Common/.depend.mak +++ b/cpp/test/Common/.depend.mak @@ -19,7 +19,6 @@ Controller.obj: \ "$(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" \ @@ -56,12 +55,12 @@ Controller.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Controller.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -103,7 +103,6 @@ TestCommon.obj: \ "$(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" \ @@ -149,11 +148,11 @@ TestCommon.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -167,12 +166,12 @@ TestCommon.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\IncomingAsync.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ diff --git a/cpp/test/Glacier2/attack/.depend.mak b/cpp/test/Glacier2/attack/.depend.mak index c857c9fd67b..37b98005da8 100755 --- a/cpp/test/Glacier2/attack/.depend.mak +++ b/cpp/test/Glacier2/attack/.depend.mak @@ -19,7 +19,6 @@ Backend.obj: \ "$(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" \ @@ -56,12 +55,12 @@ Backend.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Backend.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ BackendI.obj: \ "$(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" \ @@ -144,12 +143,12 @@ BackendI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ BackendI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ BackendI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ BackendI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -244,7 +242,6 @@ Client.obj: \ "$(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" \ @@ -274,12 +271,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -288,7 +285,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -300,6 +296,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -327,7 +324,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -381,7 +377,6 @@ Server.obj: \ "$(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" \ @@ -411,12 +406,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -425,7 +420,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -437,6 +431,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -464,7 +459,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Glacier2/dynamicFiltering/.depend.mak b/cpp/test/Glacier2/dynamicFiltering/.depend.mak index b2d37260dd7..22f5d24e995 100755 --- a/cpp/test/Glacier2/dynamicFiltering/.depend.mak +++ b/cpp/test/Glacier2/dynamicFiltering/.depend.mak @@ -23,7 +23,6 @@ Test.obj: \ "$(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" \ @@ -60,12 +59,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -80,6 +79,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -123,7 +123,6 @@ Client.obj: \ "$(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" \ @@ -153,12 +152,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -167,7 +166,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -179,6 +177,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -206,7 +205,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -260,7 +258,6 @@ Server.obj: \ "$(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" \ @@ -290,12 +287,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -304,7 +301,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -316,6 +312,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -343,7 +340,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -393,7 +389,6 @@ SessionI.obj: \ "$(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" \ @@ -423,12 +418,12 @@ SessionI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -437,7 +432,6 @@ SessionI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -449,6 +443,7 @@ SessionI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -477,7 +472,6 @@ SessionI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -525,7 +519,6 @@ BackendI.obj: \ "$(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" \ @@ -555,12 +548,12 @@ BackendI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -569,7 +562,6 @@ BackendI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -581,6 +573,7 @@ BackendI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -609,7 +602,6 @@ BackendI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -656,7 +648,6 @@ TestControllerI.obj: \ "$(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" \ @@ -686,12 +677,12 @@ TestControllerI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -700,7 +691,6 @@ TestControllerI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -712,6 +702,7 @@ TestControllerI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -740,7 +731,6 @@ TestControllerI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Glacier2/override/.depend.mak b/cpp/test/Glacier2/override/.depend.mak index cc39fd19ff5..5ef7c6ef754 100755 --- a/cpp/test/Glacier2/override/.depend.mak +++ b/cpp/test/Glacier2/override/.depend.mak @@ -20,7 +20,6 @@ Callback.obj: \ "$(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" \ @@ -57,12 +56,12 @@ Callback.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -77,6 +76,7 @@ Callback.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -116,7 +116,6 @@ CallbackI.obj: \ "$(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" \ @@ -146,12 +145,12 @@ CallbackI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -160,7 +159,6 @@ CallbackI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -172,6 +170,7 @@ CallbackI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -200,7 +199,6 @@ CallbackI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -260,7 +258,6 @@ Client.obj: \ "$(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" \ @@ -287,11 +284,11 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -300,7 +297,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -311,6 +307,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -337,7 +334,6 @@ Client.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -388,7 +384,6 @@ Server.obj: \ "$(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" \ @@ -418,12 +413,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -432,7 +427,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -444,6 +438,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -471,7 +466,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Glacier2/router/.depend.mak b/cpp/test/Glacier2/router/.depend.mak index 91ef269d1ec..6956e8a49c8 100755 --- a/cpp/test/Glacier2/router/.depend.mak +++ b/cpp/test/Glacier2/router/.depend.mak @@ -20,7 +20,6 @@ Callback.obj: \ "$(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" \ @@ -57,12 +56,12 @@ Callback.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -77,6 +76,7 @@ Callback.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -116,7 +116,6 @@ CallbackI.obj: \ "$(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" \ @@ -146,12 +145,12 @@ CallbackI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -160,7 +159,6 @@ CallbackI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -172,6 +170,7 @@ CallbackI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -200,7 +199,6 @@ CallbackI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -261,7 +259,6 @@ Client.obj: \ "$(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" \ @@ -288,11 +285,11 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -301,7 +298,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -312,6 +308,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -338,7 +335,6 @@ Client.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -389,7 +385,6 @@ Server.obj: \ "$(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" \ @@ -419,12 +414,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -433,7 +428,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -445,6 +439,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -472,7 +467,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Glacier2/sessionControl/.depend.mak b/cpp/test/Glacier2/sessionControl/.depend.mak index 9445ac64b83..2f6a46c718b 100755 --- a/cpp/test/Glacier2/sessionControl/.depend.mak +++ b/cpp/test/Glacier2/sessionControl/.depend.mak @@ -23,7 +23,6 @@ Session.obj: \ "$(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" \ @@ -60,12 +59,12 @@ Session.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -80,6 +79,7 @@ Session.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -124,7 +124,6 @@ Client.obj: \ "$(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" \ @@ -154,12 +153,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -168,7 +167,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -180,6 +178,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -207,7 +206,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -261,7 +259,6 @@ Server.obj: \ "$(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" \ @@ -291,12 +288,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -305,7 +302,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -317,6 +313,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -344,7 +341,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -392,7 +388,6 @@ SessionI.obj: \ "$(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" \ @@ -422,12 +417,12 @@ SessionI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -436,7 +431,6 @@ SessionI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -448,6 +442,7 @@ SessionI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -476,7 +471,6 @@ SessionI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Glacier2/sessionHelper/.depend.mak b/cpp/test/Glacier2/sessionHelper/.depend.mak index ddedb461b3d..ecb386bbb8f 100755 --- a/cpp/test/Glacier2/sessionHelper/.depend.mak +++ b/cpp/test/Glacier2/sessionHelper/.depend.mak @@ -19,7 +19,6 @@ Callback.obj: \ "$(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" \ @@ -56,12 +55,12 @@ Callback.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Callback.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -124,7 +124,6 @@ Client.obj: \ "$(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" \ @@ -151,11 +150,11 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -164,7 +163,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -175,6 +173,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -202,7 +201,6 @@ Client.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -265,7 +263,6 @@ Server.obj: \ "$(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" \ @@ -292,11 +289,11 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -305,7 +302,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -316,6 +312,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -343,7 +340,6 @@ Server.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Glacier2/ssl/.depend.mak b/cpp/test/Glacier2/ssl/.depend.mak index 02f88a645b0..d83991a0cf6 100755 --- a/cpp/test/Glacier2/ssl/.depend.mak +++ b/cpp/test/Glacier2/ssl/.depend.mak @@ -29,7 +29,6 @@ Client.obj: \ "$(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" \ @@ -59,12 +58,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -73,7 +72,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -85,6 +83,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -112,7 +111,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -165,7 +163,6 @@ Server.obj: \ "$(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" \ @@ -195,12 +192,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -209,7 +206,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -221,6 +217,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -248,7 +245,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Glacier2/staticFiltering/.depend.mak b/cpp/test/Glacier2/staticFiltering/.depend.mak index 2873ab0fc56..b6c5315d58e 100755 --- a/cpp/test/Glacier2/staticFiltering/.depend.mak +++ b/cpp/test/Glacier2/staticFiltering/.depend.mak @@ -19,7 +19,6 @@ Backend.obj: \ "$(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" \ @@ -56,12 +55,12 @@ Backend.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Backend.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ BackendI.obj: \ "$(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" \ @@ -144,12 +143,12 @@ BackendI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ BackendI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ BackendI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ BackendI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -243,7 +241,6 @@ Client.obj: \ "$(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" \ @@ -273,12 +270,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -287,7 +284,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -299,6 +295,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -326,7 +323,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -380,7 +376,6 @@ Server.obj: \ "$(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" \ @@ -410,12 +405,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -424,7 +419,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -436,6 +430,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -463,7 +458,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/Makefile b/cpp/test/Ice/Makefile index b80f75ace0a..cec8e0380eb 100644 --- a/cpp/test/Ice/Makefile +++ b/cpp/test/Ice/Makefile @@ -54,7 +54,6 @@ ifneq ($(CPP11_MAPPING),yes) SUBDIRS := $(SUBDIRS) \ optional \ gc \ - stream \ custom \ echo endif diff --git a/cpp/test/Ice/Makefile.mak b/cpp/test/Ice/Makefile.mak index 42cb190dc10..06c947a2805 100644 --- a/cpp/test/Ice/Makefile.mak +++ b/cpp/test/Ice/Makefile.mak @@ -72,7 +72,6 @@ SUBDIRS = proxy \ udp \ admin \ plugin \ - stream \ metrics \ optional \ enums \ diff --git a/cpp/test/Ice/acm/.depend.mak b/cpp/test/Ice/acm/.depend.mak index df7995c22fb..e58a8614428 100755 --- a/cpp/test/Ice/acm/.depend.mak +++ b/cpp/test/Ice/acm/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(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" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(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" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ AllTests.obj: \ "$(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" \ @@ -276,12 +273,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -388,7 +384,6 @@ TestI.obj: \ "$(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" \ @@ -415,11 +410,11 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -428,7 +423,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -439,6 +433,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -466,7 +461,6 @@ TestI.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -510,7 +504,6 @@ Server.obj: \ "$(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" \ @@ -540,12 +533,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -554,7 +547,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -566,6 +558,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -594,7 +587,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/adapterDeactivation/.depend.mak b/cpp/test/Ice/adapterDeactivation/.depend.mak index 17dd82578d1..1f37d42858e 100755 --- a/cpp/test/Ice/adapterDeactivation/.depend.mak +++ b/cpp/test/Ice/adapterDeactivation/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(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" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -115,7 +115,6 @@ Client.obj: \ "$(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" \ @@ -145,12 +144,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -159,7 +158,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -171,6 +169,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ AllTests.obj: \ "$(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" \ @@ -276,12 +273,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -388,7 +384,6 @@ TestI.obj: \ "$(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" \ @@ -415,11 +410,11 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -428,7 +423,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -439,6 +433,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -466,7 +461,6 @@ TestI.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -511,7 +505,6 @@ ServantLocatorI.obj: \ "$(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" \ @@ -541,12 +534,12 @@ ServantLocatorI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -555,7 +548,6 @@ ServantLocatorI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -567,6 +559,7 @@ ServantLocatorI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -595,7 +588,6 @@ ServantLocatorI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -645,7 +637,6 @@ Server.obj: \ "$(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" \ @@ -675,12 +666,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -689,7 +680,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -701,6 +691,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -728,7 +719,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -777,7 +767,6 @@ Collocated.obj: \ "$(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" \ @@ -807,12 +796,12 @@ Collocated.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -821,7 +810,6 @@ Collocated.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -833,6 +821,7 @@ Collocated.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -860,7 +849,6 @@ Collocated.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/admin/.depend.mak b/cpp/test/Ice/admin/.depend.mak index 6056e53e85f..0aeb962c4f3 100755 --- a/cpp/test/Ice/admin/.depend.mak +++ b/cpp/test/Ice/admin/.depend.mak @@ -22,7 +22,6 @@ Test.obj: \ "$(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" \ @@ -59,12 +58,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -79,6 +78,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -120,7 +120,6 @@ Client.obj: \ "$(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" \ @@ -150,12 +149,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -164,7 +163,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -176,6 +174,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -204,7 +203,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -252,7 +250,6 @@ AllTests.obj: \ "$(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" \ @@ -282,12 +279,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -296,7 +293,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -308,6 +304,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -336,7 +333,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -374,7 +370,6 @@ TestI.obj: \ "$(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" \ @@ -411,12 +406,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -431,6 +426,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -450,7 +446,6 @@ TestI.obj: \ "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -477,7 +472,6 @@ TestI.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -518,7 +512,6 @@ Server.obj: \ "$(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" \ @@ -548,12 +541,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -562,7 +555,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -574,6 +566,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -602,7 +595,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/ami/.depend.mak b/cpp/test/Ice/ami/.depend.mak index d848f6acf2b..146f63442ef 100755 --- a/cpp/test/Ice/ami/.depend.mak +++ b/cpp/test/Ice/ami/.depend.mak @@ -23,7 +23,6 @@ Test.obj: \ "$(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" \ @@ -60,12 +59,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -80,6 +79,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -119,7 +119,6 @@ Client.obj: \ "$(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" \ @@ -149,12 +148,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -163,7 +162,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -175,6 +173,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -203,7 +202,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -251,7 +249,6 @@ AllTests.obj: \ "$(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" \ @@ -281,12 +278,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -295,7 +292,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -307,6 +303,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -335,7 +332,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -373,7 +369,6 @@ TestI.obj: \ "$(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" \ @@ -410,12 +405,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -430,6 +425,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -446,7 +442,6 @@ TestI.obj: \ "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -475,7 +470,6 @@ TestI.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -517,7 +511,6 @@ Server.obj: \ "$(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" \ @@ -547,12 +540,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -561,7 +554,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -573,6 +565,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -601,7 +594,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -650,7 +642,6 @@ Collocated.obj: \ "$(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" \ @@ -680,12 +671,12 @@ Collocated.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -694,7 +685,6 @@ Collocated.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -706,6 +696,7 @@ Collocated.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -734,7 +725,6 @@ Collocated.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/background/.depend.mak b/cpp/test/Ice/background/.depend.mak index cb04600024c..40cd47b1196 100755 --- a/cpp/test/Ice/background/.depend.mak +++ b/cpp/test/Ice/background/.depend.mak @@ -23,7 +23,6 @@ Test.obj: \ "$(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" \ @@ -60,12 +59,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -80,6 +79,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -127,7 +127,6 @@ Configuration.obj: \ "$(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" \ @@ -161,18 +160,17 @@ Configuration.obj: \ "$(includedir)\Ice\ObserverHelper.h" \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\VirtualShared.h" \ - "$(includedir)\Ice\LoggerF.h" \ "..\..\..\src\Ice\ProtocolInstanceF.h" \ "..\..\..\src\Ice\EventHandlerF.h" \ @@ -217,7 +215,6 @@ Connector.obj: \ "$(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" \ @@ -251,18 +248,17 @@ Connector.obj: \ "$(includedir)\Ice\ObserverHelper.h" \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\VirtualShared.h" \ - "$(includedir)\Ice\LoggerF.h" \ "..\..\..\src\Ice\ProtocolInstanceF.h" \ "..\..\..\src\Ice\EventHandlerF.h" \ "Transceiver.h" \ @@ -278,6 +274,7 @@ Connector.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -307,7 +304,6 @@ Acceptor.obj: \ "$(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" \ @@ -344,12 +340,12 @@ Acceptor.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -358,7 +354,6 @@ Acceptor.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "..\..\..\src\Ice\ProtocolInstanceF.h" \ "EndpointI.h" \ "..\..\..\src\Ice\EndpointI.h" \ @@ -371,6 +366,7 @@ Acceptor.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -408,7 +404,6 @@ EndpointI.obj: \ "$(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" \ @@ -451,12 +446,12 @@ EndpointI.obj: \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -469,6 +464,7 @@ EndpointI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -486,7 +482,6 @@ EndpointI.obj: \ "..\..\..\src\Ice\NetworkF.h" \ "..\..\..\src\Ice\NetworkProxyF.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "..\..\..\src\Ice\ProtocolInstanceF.h" \ "..\..\..\src\Ice\EventHandlerF.h" \ "Transceiver.h" \ @@ -516,7 +511,6 @@ Transceiver.obj: \ "$(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" \ @@ -557,12 +551,12 @@ Transceiver.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -571,7 +565,6 @@ Transceiver.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "..\..\..\src\Ice\ProtocolInstanceF.h" \ "Configuration.h" \ "$(includedir)\IceUtil\IceUtil.h" \ @@ -616,7 +609,6 @@ EndpointFactory.obj: \ "$(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" \ @@ -657,12 +649,11 @@ EndpointFactory.obj: \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -675,6 +666,7 @@ EndpointFactory.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -721,7 +713,6 @@ PluginI.obj: \ "$(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" \ @@ -751,12 +742,12 @@ PluginI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -765,7 +756,6 @@ PluginI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -823,7 +813,6 @@ Client.obj: \ "$(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" \ @@ -853,12 +842,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -867,7 +856,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -879,6 +867,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -907,7 +896,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -974,7 +962,6 @@ AllTests.obj: \ "$(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" \ @@ -1001,11 +988,11 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1014,7 +1001,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1025,6 +1011,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1052,7 +1039,6 @@ AllTests.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1094,7 +1080,6 @@ TestI.obj: \ "$(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" \ @@ -1131,12 +1116,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1151,6 +1136,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -1170,7 +1156,6 @@ TestI.obj: \ "..\..\..\src\Ice\NetworkF.h" \ "..\..\..\src\Ice\NetworkProxyF.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "..\..\..\src\Ice\ProtocolInstanceF.h" \ "..\..\..\src\Ice\EventHandlerF.h" \ "$(includedir)\Ice\Ice.h" \ @@ -1204,7 +1189,6 @@ TestI.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1246,7 +1230,6 @@ Server.obj: \ "$(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" \ @@ -1276,12 +1259,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1290,7 +1273,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1302,6 +1284,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1330,7 +1313,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/background/EndpointFactory.cpp b/cpp/test/Ice/background/EndpointFactory.cpp index 1fbe25930de..a13efc6743b 100644 --- a/cpp/test/Ice/background/EndpointFactory.cpp +++ b/cpp/test/Ice/background/EndpointFactory.cpp @@ -38,15 +38,15 @@ EndpointFactory::create(vector<string>& args, bool oaEndpoint) const } IceInternal::EndpointIPtr -EndpointFactory::read(IceInternal::BasicStream* s) const +EndpointFactory::read(Ice::InputStream* s) const { short type; s->read(type); assert(type == _factory->type()); - s->startReadEncaps(); + s->startEncapsulation(); IceInternal::EndpointIPtr endpoint = ICE_MAKE_SHARED(EndpointI, _factory->read(s)); - s->endReadEncaps(); + s->endEncapsulation(); return endpoint; } diff --git a/cpp/test/Ice/background/EndpointFactory.h b/cpp/test/Ice/background/EndpointFactory.h index 90c9b6f2d80..873755ffefa 100644 --- a/cpp/test/Ice/background/EndpointFactory.h +++ b/cpp/test/Ice/background/EndpointFactory.h @@ -21,7 +21,7 @@ public: virtual ::Ice::Short type() const; virtual ::std::string protocol() const; virtual IceInternal::EndpointIPtr create(std::vector<std::string>&, bool) const; - virtual IceInternal::EndpointIPtr read(IceInternal::BasicStream*) const; + virtual IceInternal::EndpointIPtr read(Ice::InputStream*) const; virtual void destroy(); virtual IceInternal::EndpointFactoryPtr clone(const IceInternal::ProtocolInstancePtr&) const; diff --git a/cpp/test/Ice/background/EndpointI.cpp b/cpp/test/Ice/background/EndpointI.cpp index d8051177e1a..cc71d5bb97b 100644 --- a/cpp/test/Ice/background/EndpointI.cpp +++ b/cpp/test/Ice/background/EndpointI.cpp @@ -11,7 +11,6 @@ #include <Transceiver.h> #include <Connector.h> #include <Acceptor.h> -#include <Ice/BasicStream.h> #ifdef _MSC_VER // For 'Ice::Object::ice_getHash': was declared deprecated @@ -33,12 +32,12 @@ EndpointI::EndpointI(const IceInternal::EndpointIPtr& endpoint) : } void -EndpointI::streamWrite(IceInternal::BasicStream* s) const +EndpointI::streamWrite(Ice::OutputStream* s) const { - s->startWriteEncaps(); + s->startEncapsulation(); s->write(_endpoint->type()); _endpoint->streamWrite(s); - s->endWriteEncaps(); + s->endEncapsulation(); } Ice::Short diff --git a/cpp/test/Ice/background/EndpointI.h b/cpp/test/Ice/background/EndpointI.h index 9e2d1d2a7a8..b948d06368b 100644 --- a/cpp/test/Ice/background/EndpointI.h +++ b/cpp/test/Ice/background/EndpointI.h @@ -27,7 +27,7 @@ public: EndpointI(const IceInternal::EndpointIPtr&); // From EndpointI - virtual void streamWrite(IceInternal::BasicStream*) const; + virtual void streamWrite(Ice::OutputStream*) const; virtual Ice::Short type() const; virtual const std::string& protocol() const; virtual IceInternal::EndpointIPtr timeout(Ice::Int) const; diff --git a/cpp/test/Ice/binding/.depend.mak b/cpp/test/Ice/binding/.depend.mak index 8295c5d6785..b0dc04a6e18 100755 --- a/cpp/test/Ice/binding/.depend.mak +++ b/cpp/test/Ice/binding/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(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" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(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" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -247,7 +245,6 @@ AllTests.obj: \ "$(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" \ @@ -277,12 +274,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -291,7 +288,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -303,6 +299,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -331,7 +328,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -379,7 +375,6 @@ TestI.obj: \ "$(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" \ @@ -409,12 +404,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -423,7 +418,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -435,6 +429,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -463,7 +458,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -507,7 +501,6 @@ Server.obj: \ "$(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" \ @@ -537,12 +530,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -551,7 +544,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -563,6 +555,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -591,7 +584,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/checksum/.depend.mak b/cpp/test/Ice/checksum/.depend.mak index 763a21b1156..8185ccdca69 100755 --- a/cpp/test/Ice/checksum/.depend.mak +++ b/cpp/test/Ice/checksum/.depend.mak @@ -23,7 +23,6 @@ Test.obj: \ "$(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" \ @@ -60,12 +59,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -80,6 +79,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -108,7 +108,6 @@ Types.obj: \ "$(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" \ @@ -145,12 +144,12 @@ Types.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -165,6 +164,7 @@ Types.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -205,7 +205,6 @@ Client.obj: \ "$(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" \ @@ -235,12 +234,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -249,7 +248,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -261,6 +259,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -289,7 +288,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -337,7 +335,6 @@ AllTests.obj: \ "$(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" \ @@ -367,12 +364,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -381,7 +378,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -393,6 +389,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -421,7 +418,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/checksum/server/.depend.mak b/cpp/test/Ice/checksum/server/.depend.mak index 4ee3971c442..50507d768a3 100755 --- a/cpp/test/Ice/checksum/server/.depend.mak +++ b/cpp/test/Ice/checksum/server/.depend.mak @@ -23,7 +23,6 @@ Test.obj: \ "$(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" \ @@ -60,12 +59,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -80,6 +79,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -108,7 +108,6 @@ Types.obj: \ "$(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" \ @@ -145,12 +144,12 @@ Types.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -165,6 +164,7 @@ Types.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -205,7 +205,6 @@ TestI.obj: \ "$(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" \ @@ -235,12 +234,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -249,7 +248,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -261,6 +259,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -289,7 +288,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -333,7 +331,6 @@ Server.obj: \ "$(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" \ @@ -363,12 +360,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -377,7 +374,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -389,6 +385,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -417,7 +414,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/custom/.depend.mak b/cpp/test/Ice/custom/.depend.mak index f3b7ecf6e16..2b1c5b351d0 100755 --- a/cpp/test/Ice/custom/.depend.mak +++ b/cpp/test/Ice/custom/.depend.mak @@ -28,7 +28,6 @@ Test.obj: \ "$(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" \ @@ -65,12 +64,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -85,6 +84,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -98,7 +98,6 @@ Test.obj: \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -129,7 +128,6 @@ Test.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -160,7 +158,6 @@ Wstring.obj: \ "$(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" \ @@ -197,12 +194,12 @@ Wstring.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -217,6 +214,7 @@ Wstring.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -255,7 +253,6 @@ Client.obj: \ "$(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" \ @@ -285,12 +282,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -299,7 +296,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -311,6 +307,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -339,7 +336,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -392,7 +388,6 @@ AllTests.obj: \ "$(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" \ @@ -422,12 +417,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -436,7 +431,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -448,6 +442,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -476,7 +471,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -533,7 +527,6 @@ TestI.obj: \ "$(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" \ @@ -570,12 +563,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -590,11 +583,11 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.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" \ @@ -635,7 +628,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -666,7 +658,6 @@ WstringI.obj: \ "$(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" \ @@ -703,12 +694,12 @@ WstringI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -723,6 +714,7 @@ WstringI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -756,7 +748,6 @@ Server.obj: \ "$(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" \ @@ -786,12 +777,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -800,7 +791,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -812,6 +802,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -840,7 +831,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -884,7 +874,6 @@ TestAMD.obj: \ "$(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" \ @@ -921,12 +910,12 @@ TestAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -941,6 +930,7 @@ TestAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -955,7 +945,6 @@ TestAMD.obj: \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -985,7 +974,6 @@ TestAMD.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1016,7 +1004,6 @@ TestAMDI.obj: \ "$(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" \ @@ -1053,12 +1040,12 @@ TestAMDI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1073,11 +1060,11 @@ TestAMDI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.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" \ @@ -1118,7 +1105,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1148,7 +1134,6 @@ WstringAMD.obj: \ "$(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" \ @@ -1185,12 +1170,12 @@ WstringAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1205,6 +1190,7 @@ WstringAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1233,7 +1219,6 @@ WstringAMDI.obj: \ "$(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" \ @@ -1270,12 +1255,12 @@ WstringAMDI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1290,6 +1275,7 @@ WstringAMDI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1324,7 +1310,6 @@ ServerAMD.obj: \ "$(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" \ @@ -1354,12 +1339,12 @@ ServerAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1368,7 +1353,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1380,6 +1364,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1408,7 +1393,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1464,7 +1448,6 @@ Collocated.obj: \ "$(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" \ @@ -1494,12 +1477,12 @@ Collocated.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1508,7 +1491,6 @@ Collocated.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1520,6 +1502,7 @@ Collocated.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1548,7 +1531,6 @@ Collocated.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/custom/AllTests.cpp b/cpp/test/Ice/custom/AllTests.cpp index 42937e63c50..ec0d7c67d4b 100644 --- a/cpp/test/Ice/custom/AllTests.cpp +++ b/cpp/test/Ice/custom/AllTests.cpp @@ -1186,14 +1186,14 @@ allTests(const Ice::CommunicatorPtr& communicator) Test::BufferStruct rs = t->opBufferStruct(bs); test(rs == bs); - Ice::OutputStreamPtr os = Ice::createOutputStream(communicator); - os->write(rs); + Ice::OutputStream os(communicator); + os.write(rs); Ice::ByteSeq bytes; - os->finished(bytes); + os.finished(bytes); - Ice::InputStreamPtr is = Ice::wrapInputStream(communicator, bytes); + Ice::InputStream is(communicator, os.getEncoding(), bytes); Test::BufferStruct rs2; - is->read(rs2); + is.read(rs2); test(rs == rs2); } cout << "ok" << endl; diff --git a/cpp/test/Ice/defaultServant/.depend.mak b/cpp/test/Ice/defaultServant/.depend.mak index 97e58f34056..c14c628beea 100755 --- a/cpp/test/Ice/defaultServant/.depend.mak +++ b/cpp/test/Ice/defaultServant/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(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" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ TestI.obj: \ "$(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" \ @@ -144,12 +143,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -242,7 +240,6 @@ Client.obj: \ "$(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" \ @@ -272,12 +269,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -286,7 +283,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -298,6 +294,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -326,7 +323,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -374,7 +370,6 @@ AllTests.obj: \ "$(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" \ @@ -404,12 +399,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -418,7 +413,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -430,6 +424,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -458,7 +453,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/defaultValue/.depend.mak b/cpp/test/Ice/defaultValue/.depend.mak index 7f1c0eb2758..3c0367e6747 100755 --- a/cpp/test/Ice/defaultValue/.depend.mak +++ b/cpp/test/Ice/defaultValue/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(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" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(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" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ AllTests.obj: \ "$(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" \ @@ -276,12 +273,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/dispatcher/.depend.mak b/cpp/test/Ice/dispatcher/.depend.mak index 3a33b46d8ea..a1b9251d447 100755 --- a/cpp/test/Ice/dispatcher/.depend.mak +++ b/cpp/test/Ice/dispatcher/.depend.mak @@ -23,7 +23,6 @@ Test.obj: \ "$(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" \ @@ -60,12 +59,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -80,6 +79,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -119,7 +119,6 @@ Client.obj: \ "$(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" \ @@ -149,12 +148,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -163,7 +162,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -175,6 +173,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -203,7 +202,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -252,7 +250,6 @@ AllTests.obj: \ "$(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" \ @@ -282,12 +279,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -296,7 +293,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -308,6 +304,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -336,7 +333,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -384,7 +380,6 @@ Dispatcher.obj: \ "$(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" \ @@ -424,7 +419,6 @@ TestI.obj: \ "$(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" \ @@ -461,12 +455,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -481,6 +475,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -491,7 +486,6 @@ TestI.obj: \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -521,7 +515,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -569,7 +562,6 @@ Server.obj: \ "$(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" \ @@ -599,12 +591,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -613,7 +605,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -625,6 +616,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -653,7 +645,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -703,7 +694,6 @@ Collocated.obj: \ "$(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" \ @@ -733,12 +723,12 @@ Collocated.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -747,7 +737,6 @@ Collocated.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -759,6 +748,7 @@ Collocated.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -787,7 +777,6 @@ Collocated.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/echo/.depend.mak b/cpp/test/Ice/echo/.depend.mak index cca22a41b30..c84234dba0d 100755 --- a/cpp/test/Ice/echo/.depend.mak +++ b/cpp/test/Ice/echo/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(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" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ BlobjectI.obj: \ "$(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" \ @@ -144,12 +143,12 @@ BlobjectI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ BlobjectI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ BlobjectI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ BlobjectI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -241,7 +239,6 @@ Server.obj: \ "$(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" \ @@ -271,12 +268,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -285,7 +282,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -297,6 +293,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -325,7 +322,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/enums/.depend.mak b/cpp/test/Ice/enums/.depend.mak index 6fc307b3376..5b60af13ab8 100755 --- a/cpp/test/Ice/enums/.depend.mak +++ b/cpp/test/Ice/enums/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(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" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(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" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ AllTests.obj: \ "$(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" \ @@ -276,12 +273,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -378,7 +374,6 @@ TestI.obj: \ "$(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" \ @@ -408,12 +403,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -422,7 +417,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -434,6 +428,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -462,7 +457,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -511,7 +505,6 @@ Server.obj: \ "$(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" \ @@ -541,12 +534,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -555,7 +548,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -567,6 +559,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -595,7 +588,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/enums/AllTests.cpp b/cpp/test/Ice/enums/AllTests.cpp index 9178e812945..825bd1e78d1 100644 --- a/cpp/test/Ice/enums/AllTests.cpp +++ b/cpp/test/Ice/enums/AllTests.cpp @@ -8,7 +8,6 @@ // ********************************************************************** #include <Ice/Ice.h> -#include <Ice/Stream.h> #include <TestCommon.h> #include <Test.h> @@ -72,30 +71,37 @@ allTests(const Ice::CommunicatorPtr& communicator) #ifndef ICE_CPP11_MAPPING cout << "testing enum streaming... " << flush; - Ice::OutputStreamPtr out; Ice::ByteSeq bytes; const bool encoding_1_0 = communicator->getProperties()->getProperty("Ice.Default.EncodingVersion") == "1.0"; - out = Ice::createOutputStream(communicator); - out->write(ICE_ENUM(ByteEnum, benum11)); - out->finished(bytes); - test(bytes.size() == 1); // ByteEnum should require one byte - - out = Ice::createOutputStream(communicator); - out->write(ICE_ENUM(ShortEnum, senum11)); - out->finished(bytes); - test(bytes.size() == (encoding_1_0 ? 2 : 5)); - - out = Ice::createOutputStream(communicator); - out->write(ICE_ENUM(IntEnum, ienum11)); - out->finished(bytes); - test(bytes.size() == (encoding_1_0 ? 4 : 5)); - - out = Ice::createOutputStream(communicator); - out->write(ICE_ENUM(SimpleEnum, blue)); - out->finished(bytes); - test(bytes.size() == 1); // SimpleEnum should require one byte + { + Ice::OutputStream out(communicator); + out.write(ICE_ENUM(ByteEnum, benum11)); + out.finished(bytes); + test(bytes.size() == 1); // ByteEnum should require one byte + } + + { + Ice::OutputStream out(communicator); + out.write(ICE_ENUM(ShortEnum, senum11)); + out.finished(bytes); + test(bytes.size() == (encoding_1_0 ? 2 : 5)); + } + + { + Ice::OutputStream out(communicator); + out.write(ICE_ENUM(IntEnum, ienum11)); + out.finished(bytes); + test(bytes.size() == (encoding_1_0 ? 4 : 5)); + } + + { + Ice::OutputStream out(communicator); + out.write(ICE_ENUM(SimpleEnum, blue)); + out.finished(bytes); + test(bytes.size() == 1); // SimpleEnum should require one byte + } cout << "ok" << endl; #endif diff --git a/cpp/test/Ice/exceptions/.depend.mak b/cpp/test/Ice/exceptions/.depend.mak index 83f4ae4d55b..457776017ab 100755 --- a/cpp/test/Ice/exceptions/.depend.mak +++ b/cpp/test/Ice/exceptions/.depend.mak @@ -24,7 +24,6 @@ ExceptionsI.obj: \ "$(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" \ @@ -61,12 +60,12 @@ ExceptionsI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -81,6 +80,7 @@ ExceptionsI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -102,7 +102,6 @@ Test.obj: \ "$(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" \ @@ -139,12 +138,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -159,6 +158,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -197,7 +197,6 @@ Client.obj: \ "$(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" \ @@ -227,12 +226,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -241,7 +240,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -253,6 +251,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -281,7 +280,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -339,7 +337,6 @@ AllTests.obj: \ "$(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" \ @@ -366,11 +363,11 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -379,7 +376,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -390,6 +386,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -417,7 +414,6 @@ AllTests.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -461,7 +457,6 @@ TestI.obj: \ "$(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" \ @@ -491,12 +486,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -505,7 +500,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -517,6 +511,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -545,7 +540,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -594,7 +588,6 @@ Server.obj: \ "$(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" \ @@ -624,12 +617,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -638,7 +631,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -650,6 +642,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -678,7 +671,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -715,7 +707,6 @@ TestAMD.obj: \ "$(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" \ @@ -752,12 +743,12 @@ TestAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -772,6 +763,7 @@ TestAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -811,7 +803,6 @@ TestAMDI.obj: \ "$(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" \ @@ -841,12 +832,12 @@ TestAMDI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -855,7 +846,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -867,6 +857,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -895,7 +886,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -944,7 +934,6 @@ ServerAMD.obj: \ "$(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" \ @@ -974,12 +963,12 @@ ServerAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -988,7 +977,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1000,6 +988,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1028,7 +1017,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1077,7 +1065,6 @@ Collocated.obj: \ "$(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" \ @@ -1107,12 +1094,12 @@ Collocated.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1121,7 +1108,6 @@ Collocated.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1133,6 +1119,7 @@ Collocated.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1161,7 +1148,6 @@ Collocated.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp index e5e2fa8c37b..fe2b782338b 100644 --- a/cpp/test/Ice/exceptions/AllTests.cpp +++ b/cpp/test/Ice/exceptions/AllTests.cpp @@ -646,7 +646,7 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "testing value factory registration exception... " << flush; { #ifdef ICE_CPP11_MAPPING - communicator->addValueFactory( + communicator->getValueFactoryManager()->add( [](const std::string&) { return nullptr; @@ -654,7 +654,7 @@ allTests(const Ice::CommunicatorPtr& communicator) "x"); try { - communicator->addValueFactory( + communicator->getValueFactoryManager()->add( [](const std::string&) { return nullptr; @@ -667,10 +667,10 @@ allTests(const Ice::CommunicatorPtr& communicator) } #else Ice::ValueFactoryPtr vf = new ValueFactoryI; - communicator->addValueFactory(vf, "x"); + communicator->getValueFactoryManager()->add(vf, "x"); try { - communicator->addValueFactory(vf, "x"); + communicator->getValueFactoryManager()->add(vf, "x"); test(false); } catch(const Ice::AlreadyRegisteredException&) diff --git a/cpp/test/Ice/facets/.depend.mak b/cpp/test/Ice/facets/.depend.mak index d9f7502de2f..85b6bd616aa 100755 --- a/cpp/test/Ice/facets/.depend.mak +++ b/cpp/test/Ice/facets/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(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" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(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" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ AllTests.obj: \ "$(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" \ @@ -276,12 +273,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -378,7 +374,6 @@ TestI.obj: \ "$(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" \ @@ -408,12 +403,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -422,7 +417,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -434,6 +428,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -462,7 +457,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -506,7 +500,6 @@ Server.obj: \ "$(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" \ @@ -536,12 +529,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -550,7 +543,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -562,6 +554,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -590,7 +583,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -639,7 +631,6 @@ Collocated.obj: \ "$(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" \ @@ -669,12 +660,12 @@ Collocated.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -683,7 +674,6 @@ Collocated.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -695,6 +685,7 @@ Collocated.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -723,7 +714,6 @@ Collocated.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/faultTolerance/.depend.mak b/cpp/test/Ice/faultTolerance/.depend.mak index c1beda1f79f..05607575bd7 100755 --- a/cpp/test/Ice/faultTolerance/.depend.mak +++ b/cpp/test/Ice/faultTolerance/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(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" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(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" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ AllTests.obj: \ "$(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" \ @@ -276,12 +273,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -378,7 +374,6 @@ TestI.obj: \ "$(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" \ @@ -408,12 +403,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -422,7 +417,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -434,6 +428,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -462,7 +457,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -506,7 +500,6 @@ Server.obj: \ "$(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" \ @@ -536,12 +529,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -550,7 +543,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -562,6 +554,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -590,7 +583,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/gc/.depend.mak b/cpp/test/Ice/gc/.depend.mak index 330709c843b..3fd8f29095c 100755 --- a/cpp/test/Ice/gc/.depend.mak +++ b/cpp/test/Ice/gc/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(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" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -116,7 +116,6 @@ Client.obj: \ "$(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" \ @@ -146,12 +145,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -160,7 +159,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -171,6 +169,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -199,7 +198,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/hash/.depend.mak b/cpp/test/Ice/hash/.depend.mak index 3af028174af..e80313ae9f8 100755 --- a/cpp/test/Ice/hash/.depend.mak +++ b/cpp/test/Ice/hash/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(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" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(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" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/hold/.depend.mak b/cpp/test/Ice/hold/.depend.mak index 2626409dbdb..f36afe8e002 100755 --- a/cpp/test/Ice/hold/.depend.mak +++ b/cpp/test/Ice/hold/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(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" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(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" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ AllTests.obj: \ "$(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" \ @@ -276,12 +273,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -379,7 +375,6 @@ TestI.obj: \ "$(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" \ @@ -409,12 +404,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -423,7 +418,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -435,6 +429,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -463,7 +458,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -512,7 +506,6 @@ Server.obj: \ "$(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" \ @@ -542,12 +535,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -556,7 +549,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -568,6 +560,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -596,7 +589,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/impl/.depend.mak b/cpp/test/Ice/impl/.depend.mak index d8d5845743f..9a1883cf786 100644..100755 --- a/cpp/test/Ice/impl/.depend.mak +++ b/cpp/test/Ice/impl/.depend.mak @@ -32,7 +32,6 @@ Test.obj: \ "$(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" \ @@ -69,12 +68,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -89,6 +88,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -116,7 +116,6 @@ TestI.obj: \ "$(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" \ @@ -153,12 +152,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -173,6 +172,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -206,7 +206,6 @@ Server.obj: \ "$(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" \ @@ -236,12 +235,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -250,7 +249,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -262,6 +260,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -290,7 +289,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -327,7 +325,6 @@ TestAMD.obj: \ "$(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" \ @@ -364,12 +361,12 @@ TestAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -384,6 +381,7 @@ TestAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -412,7 +410,6 @@ TestAMDI.obj: \ "$(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" \ @@ -449,12 +446,12 @@ TestAMDI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -469,6 +466,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -503,7 +501,6 @@ ServerAMD.obj: \ "$(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" \ @@ -533,12 +530,12 @@ ServerAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -547,7 +544,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -559,6 +555,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -587,7 +584,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/info/.depend.mak b/cpp/test/Ice/info/.depend.mak index 6334ec0e151..04545c80f45 100755 --- a/cpp/test/Ice/info/.depend.mak +++ b/cpp/test/Ice/info/.depend.mak @@ -24,7 +24,6 @@ Test.obj: \ "$(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" \ @@ -61,12 +60,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -81,6 +80,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -119,7 +119,6 @@ TestI.obj: \ "$(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" \ @@ -149,12 +148,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -163,7 +162,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -175,6 +173,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -203,7 +202,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -257,7 +255,6 @@ Client.obj: \ "$(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" \ @@ -287,12 +284,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -301,7 +298,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -313,6 +309,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -341,7 +338,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -389,7 +385,6 @@ AllTests.obj: \ "$(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" \ @@ -419,12 +414,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -433,7 +428,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -445,6 +439,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -473,7 +468,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -527,7 +521,6 @@ Server.obj: \ "$(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" \ @@ -557,12 +550,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -571,7 +564,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -583,6 +575,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -611,7 +604,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/inheritance/.depend.mak b/cpp/test/Ice/inheritance/.depend.mak index f19cbac48cb..6d763dda836 100755 --- a/cpp/test/Ice/inheritance/.depend.mak +++ b/cpp/test/Ice/inheritance/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(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" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(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" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ AllTests.obj: \ "$(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" \ @@ -276,12 +273,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -378,7 +374,6 @@ TestI.obj: \ "$(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" \ @@ -408,12 +403,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -422,7 +417,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -434,6 +428,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -462,7 +457,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -511,7 +505,6 @@ Server.obj: \ "$(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" \ @@ -541,12 +534,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -555,7 +548,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -567,6 +559,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -595,7 +588,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -644,7 +636,6 @@ Collocated.obj: \ "$(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" \ @@ -674,12 +665,12 @@ Collocated.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -688,7 +679,6 @@ Collocated.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -700,6 +690,7 @@ Collocated.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -728,7 +719,6 @@ Collocated.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/interceptor/.depend.mak b/cpp/test/Ice/interceptor/.depend.mak index c6ecc7971bf..8adb086f98c 100755 --- a/cpp/test/Ice/interceptor/.depend.mak +++ b/cpp/test/Ice/interceptor/.depend.mak @@ -31,7 +31,6 @@ Client.obj: \ "$(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" \ @@ -61,12 +60,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -75,7 +74,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -87,6 +85,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -115,7 +114,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -167,7 +165,6 @@ InterceptorI.obj: \ "$(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" \ @@ -197,12 +194,12 @@ InterceptorI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -211,7 +208,6 @@ InterceptorI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -223,6 +219,7 @@ InterceptorI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -251,7 +248,6 @@ InterceptorI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -302,7 +298,6 @@ AMDInterceptorI.obj: \ "$(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" \ @@ -332,12 +327,12 @@ AMDInterceptorI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -346,7 +341,6 @@ AMDInterceptorI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -358,6 +352,7 @@ AMDInterceptorI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -386,7 +381,6 @@ AMDInterceptorI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -434,7 +428,6 @@ MyObjectI.obj: \ "$(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" \ @@ -464,12 +457,12 @@ MyObjectI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -478,7 +471,6 @@ MyObjectI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -490,6 +482,7 @@ MyObjectI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -518,7 +511,6 @@ MyObjectI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -555,7 +547,6 @@ Test.obj: \ "$(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" \ @@ -592,12 +583,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -612,6 +603,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -651,7 +643,6 @@ TestI.obj: \ "$(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" \ @@ -681,12 +672,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -695,7 +686,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -707,6 +697,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -735,7 +726,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/invoke/.depend.mak b/cpp/test/Ice/invoke/.depend.mak index bd6dabe4dcb..a80c9c52947 100755 --- a/cpp/test/Ice/invoke/.depend.mak +++ b/cpp/test/Ice/invoke/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(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" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(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" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ AllTests.obj: \ "$(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" \ @@ -276,12 +273,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -378,7 +374,6 @@ BlobjectI.obj: \ "$(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" \ @@ -408,12 +403,12 @@ BlobjectI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -422,7 +417,6 @@ BlobjectI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -434,6 +428,7 @@ BlobjectI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -462,7 +457,6 @@ BlobjectI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -511,7 +505,6 @@ Server.obj: \ "$(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" \ @@ -541,12 +534,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -555,7 +548,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -567,6 +559,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -595,7 +588,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/invoke/AllTests.cpp b/cpp/test/Ice/invoke/AllTests.cpp index b0b12c060c6..54a57c377d7 100644 --- a/cpp/test/Ice/invoke/AllTests.cpp +++ b/cpp/test/Ice/invoke/AllTests.cpp @@ -8,7 +8,6 @@ // ********************************************************************** #include <Ice/Ice.h> -#include <Ice/Stream.h> #include <TestCommon.h> #include <Test.h> @@ -89,20 +88,20 @@ public: Ice::ByteSeq outParams; if(result->getProxy()->end_ice_invoke(outParams, result)) { - Ice::InputStreamPtr in = Ice::createInputStream(_communicator, outParams); - in->startEncapsulation(); + Ice::InputStream in(_communicator, result->getProxy()->ice_getEncodingVersion(), outParams); + in.startEncapsulation(); string s; - in->read(s); + in.read(s); test(s == cmp); - in->read(s); + in.read(s); test(s == cmp); - in->endEncapsulation(); + in.endEncapsulation(); called(); } else { test(false); - }; + } } void opException(const Ice::AsyncResultPtr& result) @@ -120,15 +119,15 @@ public: } else { - Ice::InputStreamPtr in = Ice::createInputStream(_communicator, outParams); - in->startEncapsulation(); + Ice::InputStream in(_communicator, result->getProxy()->ice_getEncodingVersion(), outParams); + in.startEncapsulation(); try { - in->throwException(); + in.throwException(); } catch(const Test::MyException&) { - in->endEncapsulation(); + in.endEncapsulation(); called(); } catch(...) @@ -142,14 +141,14 @@ public: { if(ok) { - Ice::InputStreamPtr in = Ice::createInputStream(_communicator, outParams); - in->startEncapsulation(); + Ice::InputStream in(_communicator, outParams); + in.startEncapsulation(); string s; - in->read(s); + in.read(s); test(s == testString); - in->read(s); + in.read(s); test(s == testString); - in->endEncapsulation(); + in.endEncapsulation(); called(); } else @@ -162,14 +161,14 @@ public: { if(ok) { - Ice::InputStreamPtr in = Ice::createInputStream(_communicator, outParams); - in->startEncapsulation(); + Ice::InputStream in(_communicator, outParams); + in.startEncapsulation(); string s; - in->read(s); + in.read(s); test(s == testString); - in->read(s); + in.read(s); test(s == testString); - in->endEncapsulation(); + in.endEncapsulation(); called(); } else @@ -182,14 +181,14 @@ public: { if(ok) { - Ice::InputStreamPtr in = Ice::createInputStream(_communicator, outParams); - in->startEncapsulation(); + Ice::InputStream in(_communicator, outParams); + in.startEncapsulation(); string s; - in->read(s); + in.read(s); test(s == cookie->getString()); - in->read(s); + in.read(s); test(s == cookie->getString()); - in->endEncapsulation(); + in.endEncapsulation(); called(); } else @@ -206,15 +205,15 @@ public: } else { - Ice::InputStreamPtr in = Ice::createInputStream(_communicator, outParams); - in->startEncapsulation(); + Ice::InputStream in(_communicator, outParams); + in.startEncapsulation(); try { - in->throwException(); + in.throwException(); } catch(const Test::MyException&) { - in->endEncapsulation(); + in.endEncapsulation(); called(); } catch(...) @@ -232,15 +231,15 @@ public: } else { - Ice::InputStreamPtr in = Ice::createInputStream(_communicator, outParams); - in->startEncapsulation(); + Ice::InputStream in(_communicator, outParams); + in.startEncapsulation(); try { - in->throwException(); + in.throwException(); } catch(const Test::MyException&) { - in->endEncapsulation(); + in.endEncapsulation(); called(); } catch(...) @@ -259,15 +258,15 @@ public: } else { - Ice::InputStreamPtr in = Ice::createInputStream(_communicator, outParams); - in->startEncapsulation(); + Ice::InputStream in(_communicator, outParams); + in.startEncapsulation(); try { - in->throwException(); + in.throwException(); } catch(const Test::MyException&) { - in->endEncapsulation(); + in.endEncapsulation(); called(); } catch(...) @@ -313,23 +312,23 @@ allTests(const Ice::CommunicatorPtr& communicator) test(batchOneway->ice_invoke("opOneway", ICE_ENUM(OperationMode, Normal), inEncaps, outEncaps)); batchOneway->ice_flushBatchRequests(); - Ice::OutputStreamPtr out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(testString); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(testString); + out.endEncapsulation(); + out.finished(inEncaps); // ice_invoke if(cl->ice_invoke("opString", ICE_ENUM(OperationMode, Normal), inEncaps, outEncaps)) { - Ice::InputStreamPtr in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); string s; - in->read(s); + in.read(s); test(s == testString); - in->read(s); + in.read(s); test(s == testString); - in->endEncapsulation(); + in.endEncapsulation(); } else { @@ -340,14 +339,14 @@ allTests(const Ice::CommunicatorPtr& communicator) pair<const ::Ice::Byte*, const ::Ice::Byte*> inPair(&inEncaps[0], &inEncaps[0] + inEncaps.size()); if(cl->ice_invoke("opString", ICE_ENUM(OperationMode, Normal), inPair, outEncaps)) { - Ice::InputStreamPtr in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); string s; - in->read(s); + in.read(s); test(s == testString); - in->read(s); + in.read(s); test(s == testString); - in->endEncapsulation(); + in.endEncapsulation(); } else { @@ -363,11 +362,11 @@ allTests(const Ice::CommunicatorPtr& communicator) } else { - Ice::InputStreamPtr in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); + Ice::InputStream in(communicator, cl->ice_getEncodingVersion(), outEncaps); + in.startEncapsulation(); try { - in->throwException(); + in.throwException(); } catch(const Test::MyException&) { @@ -376,7 +375,7 @@ allTests(const Ice::CommunicatorPtr& communicator) { test(false); } - in->endEncapsulation(); + in.endEncapsulation(); } } @@ -451,11 +450,11 @@ allTests(const Ice::CommunicatorPtr& communicator) { promise<bool> completed; Ice::ByteSeq inEncaps, outEncaps; - Ice::OutputStreamPtr out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(testString); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(testString); + out.endEncapsulation(); + out.finished(inEncaps); cl->ice_invoke_async("opString", OperationMode::Normal, inEncaps, [&](bool ok, vector<Ice::Byte> outParams) @@ -469,37 +468,37 @@ allTests(const Ice::CommunicatorPtr& communicator) }); test(completed.get_future().get()); - Ice::InputStreamPtr in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); + Ice::InputStream in(communicator, outEncaps); + in.startEncapsulation(); string s; - in->read(s); + in.read(s); test(s == testString); - in->read(s); + in.read(s); test(s == testString); - in->endEncapsulation(); + in.endEncapsulation(); } // // repeat with the future API. // { Ice::ByteSeq inEncaps, outEncaps; - Ice::OutputStreamPtr out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(testString); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(testString); + out.endEncapsulation(); + out.finished(inEncaps); auto result = cl->ice_invoke_async("opString", OperationMode::Normal, inEncaps).get(); test(result.ok); - Ice::InputStreamPtr in = Ice::createInputStream(communicator, result.outParams); - in->startEncapsulation(); + Ice::InputStream in(communicator, result.outParams); + in.startEncapsulation(); string s; - in->read(s); + in.read(s); test(s == testString); - in->read(s); + in.read(s); test(s == testString); - in->endEncapsulation(); + in.endEncapsulation(); } @@ -507,11 +506,11 @@ allTests(const Ice::CommunicatorPtr& communicator) promise<bool> completed; promise<void> sent; Ice::ByteSeq inEncaps, outEncaps; - Ice::OutputStreamPtr out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(testString); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(testString); + out.endEncapsulation(); + out.finished(inEncaps); pair<const ::Ice::Byte*, const ::Ice::Byte*> inPair(&inEncaps[0], &inEncaps[0] + inEncaps.size()); @@ -532,39 +531,39 @@ allTests(const Ice::CommunicatorPtr& communicator) sent.get_future().get(); // Ensure sent callback was called test(completed.get_future().get()); - Ice::InputStreamPtr in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); + Ice::InputStream in(communicator, outEncaps); + in.startEncapsulation(); string s; - in->read(s); + in.read(s); test(s == testString); - in->read(s); + in.read(s); test(s == testString); - in->endEncapsulation(); + in.endEncapsulation(); } // // repeat with the future API. // { Ice::ByteSeq inEncaps, outEncaps; - Ice::OutputStreamPtr out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(testString); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(testString); + out.endEncapsulation(); + out.finished(inEncaps); pair<const ::Ice::Byte*, const ::Ice::Byte*> inPair(&inEncaps[0], &inEncaps[0] + inEncaps.size()); auto result = cl->ice_invoke_async("opString", OperationMode::Normal, inPair).get(); test(result.ok); vector<Ice::Byte>(result.outParams.first, result.outParams.second).swap(outEncaps); - Ice::InputStreamPtr in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); + Ice::InputStream in(communicator, outEncaps); + in.startEncapsulation(); string s; - in->read(s); + in.read(s); test(s == testString); - in->read(s); + in.read(s); test(s == testString); - in->endEncapsulation(); + in.endEncapsulation(); } { @@ -589,11 +588,11 @@ allTests(const Ice::CommunicatorPtr& communicator) sent.get_future().get(); // Ensure sent callback was called test(!completed.get_future().get()); - Ice::InputStreamPtr in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); + Ice::InputStream in(communicator, outEncaps); + in.startEncapsulation(); try { - in->throwException(); + in.throwException(); test(false); } catch(const Test::MyException&) @@ -612,11 +611,11 @@ allTests(const Ice::CommunicatorPtr& communicator) auto result = cl->ice_invoke_async("opException", OperationMode::Normal, inEncaps).get(); test(!result.ok); - Ice::InputStreamPtr in = Ice::createInputStream(communicator, result.outParams); - in->startEncapsulation(); + Ice::InputStream in(communicator, result.outParams); + in.startEncapsulation(); try { - in->throwException(); + in.throwException(); test(false); } catch(const Test::MyException&) @@ -650,49 +649,49 @@ allTests(const Ice::CommunicatorPtr& communicator) { test(false); } - - Ice::OutputStreamPtr out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(testString); - out->endEncapsulation(); - out->finished(inEncaps); + + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(testString); + out.endEncapsulation(); + out.finished(inEncaps); // begin_ice_invoke with no callback result = cl->begin_ice_invoke("opString", Ice::Normal, inEncaps); if(cl->end_ice_invoke(outEncaps, result)) { - Ice::InputStreamPtr in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); string s; - in->read(s); + in.read(s); test(s == testString); - in->read(s); + in.read(s); test(s == testString); - in->endEncapsulation(); + in.endEncapsulation(); } else { test(false); - }; + } // begin_ice_invoke with no callback and array mapping pair<const ::Ice::Byte*, const ::Ice::Byte*> inPair(&inEncaps[0], &inEncaps[0] + inEncaps.size()); result = cl->begin_ice_invoke("opString", Ice::Normal, inPair); if(cl->end_ice_invoke(outEncaps, result)) { - Ice::InputStreamPtr in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); string s; - in->read(s); + in.read(s); test(s == testString); - in->read(s); + in.read(s); test(s == testString); - in->endEncapsulation(); + in.endEncapsulation(); } else { test(false); - }; + } // begin_ice_invoke with Callback ::CallbackPtr cb = new ::Callback(communicator, false); @@ -741,11 +740,11 @@ allTests(const Ice::CommunicatorPtr& communicator) } else { - Ice::InputStreamPtr in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); + Ice::InputStream in(communicator, cl->ice_getEncodingVersion(), outEncaps); + in.startEncapsulation(); try { - in->throwException(); + in.throwException(); } catch(const Test::MyException&) { @@ -754,7 +753,7 @@ allTests(const Ice::CommunicatorPtr& communicator) { test(false); } - in->endEncapsulation(); + in.endEncapsulation(); } // begin_ice_invoke with Callback diff --git a/cpp/test/Ice/invoke/BlobjectI.cpp b/cpp/test/Ice/invoke/BlobjectI.cpp index 6ec24555023..45afab5d21e 100644 --- a/cpp/test/Ice/invoke/BlobjectI.cpp +++ b/cpp/test/Ice/invoke/BlobjectI.cpp @@ -15,11 +15,11 @@ using namespace std; bool -invokeInternal(const Ice::InputStreamPtr& in, vector<Ice::Byte>& outEncaps, const Ice::Current& current) +invokeInternal(Ice::InputStream& in, vector<Ice::Byte>& outEncaps, const Ice::Current& current) { Ice::CommunicatorPtr communicator = current.adapter->getCommunicator(); - Ice::OutputStreamPtr out = Ice::createOutputStream(communicator); - out->startEncapsulation(); + Ice::OutputStream out(communicator); + out.startEncapsulation(); if(current.operation == "opOneway") { return true; @@ -27,46 +27,46 @@ invokeInternal(const Ice::InputStreamPtr& in, vector<Ice::Byte>& outEncaps, cons else if(current.operation == "opString") { string s; - in->startEncapsulation(); - in->read(s); - in->endEncapsulation(); - out->write(s); - out->write(s); - out->endEncapsulation(); - out->finished(outEncaps); + in.startEncapsulation(); + in.read(s); + in.endEncapsulation(); + out.write(s); + out.write(s); + out.endEncapsulation(); + out.finished(outEncaps); return true; } else if(current.operation == "opException") { Test::MyException ex; - out->writeException(ex); - out->endEncapsulation(); - out->finished(outEncaps); + out.writeException(ex); + out.endEncapsulation(); + out.finished(outEncaps); return false; } else if(current.operation == "shutdown") { - out->endEncapsulation(); - out->finished(outEncaps); + out.endEncapsulation(); + out.finished(outEncaps); communicator->shutdown(); return true; } else if(current.operation == "ice_isA") { string s; - in->startEncapsulation(); - in->read(s); - in->endEncapsulation(); + in.startEncapsulation(); + in.read(s); + in.endEncapsulation(); if(s == "::Test::MyClass") { - out->write(true); + out.write(true); } else { - out->write(false); + out.write(false); } - out->endEncapsulation(); - out->finished(outEncaps); + out.endEncapsulation(); + out.finished(outEncaps); return true; } else @@ -82,7 +82,7 @@ invokeInternal(const Ice::InputStreamPtr& in, vector<Ice::Byte>& outEncaps, cons bool BlobjectI::ice_invoke(const vector<Ice::Byte>& inEncaps, vector<Ice::Byte>& outEncaps, const Ice::Current& current) { - Ice::InputStreamPtr in = Ice::createInputStream(current.adapter->getCommunicator(), inEncaps); + Ice::InputStream in(current.adapter->getCommunicator(), current.encoding, inEncaps); return invokeInternal(in, outEncaps, current); } @@ -90,7 +90,7 @@ bool BlobjectArrayI::ice_invoke(const pair<const Ice::Byte*, const Ice::Byte*>& inEncaps, vector<Ice::Byte>& outEncaps, const Ice::Current& current) { - Ice::InputStreamPtr in = Ice::createInputStream(current.adapter->getCommunicator(), inEncaps); + Ice::InputStream in(current.adapter->getCommunicator(), current.encoding, inEncaps); return invokeInternal(in, outEncaps, current); } @@ -101,7 +101,7 @@ BlobjectAsyncI::ice_invoke_async(vector<Ice::Byte> inEncaps, function<void (exception_ptr)>, const Ice::Current& current) { - Ice::InputStreamPtr in = Ice::createInputStream(current.adapter->getCommunicator(), inEncaps); + Ice::InputStream in(current.adapter->getCommunicator(), inEncaps); vector<Ice::Byte> outEncaps; bool ok = invokeInternal(in, outEncaps, current); response(ok, move(outEncaps)); @@ -113,7 +113,7 @@ BlobjectArrayAsyncI::ice_invoke_async(pair<const Ice::Byte*, const Ice::Byte*> i function<void (exception_ptr)>, const Ice::Current& current) { - Ice::InputStreamPtr in = Ice::createInputStream(current.adapter->getCommunicator(), inEncaps); + Ice::InputStream in(current.adapter->getCommunicator(), inEncaps); vector<Ice::Byte> outEncaps; bool ok = invokeInternal(in, outEncaps, current); #if (defined(_MSC_VER) && (_MSC_VER >= 1600)) @@ -133,7 +133,7 @@ void BlobjectAsyncI::ice_invoke_async(const Ice::AMD_Object_ice_invokePtr& cb, const vector<Ice::Byte>& inEncaps, const Ice::Current& current) { - Ice::InputStreamPtr in = Ice::createInputStream(current.adapter->getCommunicator(), inEncaps); + Ice::InputStream in(current.adapter->getCommunicator(), current.encoding, inEncaps); vector<Ice::Byte> outEncaps; bool ok = invokeInternal(in, outEncaps, current); cb->ice_response(ok, outEncaps); @@ -144,7 +144,7 @@ BlobjectArrayAsyncI::ice_invoke_async(const Ice::AMD_Object_ice_invokePtr& cb, const pair<const Ice::Byte*, const Ice::Byte*>& inEncaps, const Ice::Current& current) { - Ice::InputStreamPtr in = Ice::createInputStream(current.adapter->getCommunicator(), inEncaps); + Ice::InputStream in(current.adapter->getCommunicator(), current.encoding, inEncaps); vector<Ice::Byte> outEncaps; bool ok = invokeInternal(in, outEncaps, current); #if (defined(_MSC_VER) && (_MSC_VER >= 1600)) diff --git a/cpp/test/Ice/location/.depend.mak b/cpp/test/Ice/location/.depend.mak index ccda0512473..93655d918f8 100755 --- a/cpp/test/Ice/location/.depend.mak +++ b/cpp/test/Ice/location/.depend.mak @@ -22,7 +22,6 @@ Test.obj: \ "$(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" \ @@ -59,12 +58,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -79,6 +78,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -120,7 +120,6 @@ Client.obj: \ "$(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" \ @@ -150,12 +149,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -164,7 +163,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -176,6 +174,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -204,7 +203,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -252,7 +250,6 @@ AllTests.obj: \ "$(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" \ @@ -282,12 +279,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -296,7 +293,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -308,6 +304,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -336,7 +333,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -384,7 +380,6 @@ TestI.obj: \ "$(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" \ @@ -414,12 +409,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -428,7 +423,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -440,6 +434,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -468,7 +463,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -513,7 +507,6 @@ ServerLocator.obj: \ "$(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" \ @@ -543,12 +536,12 @@ ServerLocator.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -557,7 +550,6 @@ ServerLocator.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -569,6 +561,7 @@ ServerLocator.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -597,7 +590,6 @@ ServerLocator.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -646,7 +638,6 @@ Server.obj: \ "$(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" \ @@ -676,12 +667,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -690,7 +681,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -702,6 +692,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -730,7 +721,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/logger/.depend.mak b/cpp/test/Ice/logger/.depend.mak index a8828bc2868..1b0683fd241 100755 --- a/cpp/test/Ice/logger/.depend.mak +++ b/cpp/test/Ice/logger/.depend.mak @@ -28,7 +28,6 @@ Client1.obj: \ "$(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" \ @@ -58,12 +57,12 @@ Client1.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -72,7 +71,6 @@ Client1.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -84,6 +82,7 @@ Client1.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -112,7 +111,6 @@ Client1.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -159,7 +157,6 @@ Client2.obj: \ "$(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" \ @@ -189,12 +186,12 @@ Client2.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -203,7 +200,6 @@ Client2.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -215,6 +211,7 @@ Client2.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -243,7 +240,6 @@ Client2.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -290,7 +286,6 @@ Client3.obj: \ "$(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" \ @@ -320,12 +315,12 @@ Client3.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -334,7 +329,6 @@ Client3.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -346,6 +340,7 @@ Client3.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -374,7 +369,6 @@ Client3.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -421,7 +415,6 @@ Client4.obj: \ "$(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" \ @@ -451,12 +444,12 @@ Client4.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -465,7 +458,6 @@ Client4.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -477,6 +469,7 @@ Client4.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -505,7 +498,6 @@ Client4.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/metrics/.depend.mak b/cpp/test/Ice/metrics/.depend.mak index 85919023ce3..b13a8a0404e 100755 --- a/cpp/test/Ice/metrics/.depend.mak +++ b/cpp/test/Ice/metrics/.depend.mak @@ -22,7 +22,6 @@ Test.obj: \ "$(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" \ @@ -59,12 +58,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -79,6 +78,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -117,7 +117,6 @@ Client.obj: \ "$(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" \ @@ -147,12 +146,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -161,7 +160,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -173,6 +171,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -201,7 +200,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -250,7 +248,6 @@ AllTests.obj: \ "$(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" \ @@ -280,12 +277,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -294,7 +291,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -306,6 +302,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -334,7 +331,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -383,7 +379,6 @@ TestI.obj: \ "$(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" \ @@ -413,12 +408,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -427,7 +422,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -439,6 +433,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -467,7 +462,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -516,7 +510,6 @@ Server.obj: \ "$(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" \ @@ -546,12 +539,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -560,7 +553,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -572,6 +564,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -600,7 +593,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -637,7 +629,6 @@ TestAMD.obj: \ "$(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" \ @@ -674,12 +665,12 @@ TestAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -694,6 +685,7 @@ TestAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -733,7 +725,6 @@ TestAMDI.obj: \ "$(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" \ @@ -763,12 +754,12 @@ TestAMDI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -777,7 +768,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -789,6 +779,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -817,7 +808,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -861,7 +851,6 @@ ServerAMD.obj: \ "$(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" \ @@ -891,12 +880,12 @@ ServerAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -905,7 +894,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -917,6 +905,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -945,7 +934,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -994,7 +982,6 @@ Collocated.obj: \ "$(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" \ @@ -1024,12 +1011,12 @@ Collocated.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1038,7 +1025,6 @@ Collocated.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1050,6 +1036,7 @@ Collocated.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1078,7 +1065,6 @@ Collocated.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/networkProxy/.depend.mak b/cpp/test/Ice/networkProxy/.depend.mak index 57ca1e61e37..7da8ba7426d 100755 --- a/cpp/test/Ice/networkProxy/.depend.mak +++ b/cpp/test/Ice/networkProxy/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(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" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(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" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ AllTests.obj: \ "$(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" \ @@ -276,12 +273,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -378,7 +374,6 @@ Server.obj: \ "$(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" \ @@ -408,12 +403,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -422,7 +417,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -434,6 +428,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -462,7 +457,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/objects/.depend.mak b/cpp/test/Ice/objects/.depend.mak index bd8e0cbfd23..ab840eb73e0 100755 --- a/cpp/test/Ice/objects/.depend.mak +++ b/cpp/test/Ice/objects/.depend.mak @@ -39,7 +39,6 @@ TestI.obj: \ "$(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" \ @@ -69,12 +68,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -83,7 +82,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -95,6 +93,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -123,7 +122,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -172,7 +170,6 @@ Client.obj: \ "$(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" \ @@ -202,12 +199,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -216,7 +213,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -228,6 +224,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -256,7 +253,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -307,7 +303,6 @@ AllTests.obj: \ "$(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" \ @@ -337,12 +332,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -351,7 +346,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -363,6 +357,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -391,7 +386,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -427,7 +421,6 @@ Test.obj: \ "$(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" \ @@ -464,12 +457,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -484,6 +477,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -510,7 +504,6 @@ Derived.obj: \ "$(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" \ @@ -547,12 +540,12 @@ Derived.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -567,6 +560,7 @@ Derived.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -594,7 +588,6 @@ DerivedEx.obj: \ "$(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" \ @@ -631,12 +624,12 @@ DerivedEx.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -651,6 +644,7 @@ DerivedEx.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -690,7 +684,6 @@ TestIntfI.obj: \ "$(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" \ @@ -720,12 +713,12 @@ TestIntfI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -734,7 +727,6 @@ TestIntfI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -746,6 +738,7 @@ TestIntfI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -774,7 +767,6 @@ TestIntfI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -825,7 +817,6 @@ Server.obj: \ "$(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" \ @@ -855,12 +846,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -869,7 +860,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -881,6 +871,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -909,7 +900,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -958,7 +948,6 @@ Collocated.obj: \ "$(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" \ @@ -988,12 +977,12 @@ Collocated.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1002,7 +991,6 @@ Collocated.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1014,6 +1002,7 @@ Collocated.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1042,7 +1031,6 @@ Collocated.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/objects/AllTests.cpp b/cpp/test/Ice/objects/AllTests.cpp index f912dd667a7..20ec8d28eaa 100644 --- a/cpp/test/Ice/objects/AllTests.cpp +++ b/cpp/test/Ice/objects/AllTests.cpp @@ -336,7 +336,7 @@ allTests(const Ice::CommunicatorPtr& communicator) test(communicator->findObjectFactory("TestOF")); cout << "ok" << endl; cout << "testing getting ObjectFactory as ValueFactory... " << flush; - test(communicator->findValueFactory("TestOF")); + test(communicator->getValueFactoryManager()->find("TestOF")); cout << "ok" << endl; try diff --git a/cpp/test/Ice/objects/Client.cpp b/cpp/test/Ice/objects/Client.cpp index 6a748d724a1..21356269801 100644 --- a/cpp/test/Ice/objects/Client.cpp +++ b/cpp/test/Ice/objects/Client.cpp @@ -121,25 +121,25 @@ int run(int, char**, const Ice::CommunicatorPtr& communicator) { #ifdef ICE_CPP11_MAPPING - communicator->addValueFactory(makeFactory<BI>(), "::Test::B"); - communicator->addValueFactory(makeFactory<CI>(), "::Test::C"); - communicator->addValueFactory(makeFactory<DI>(), "::Test::D"); - communicator->addValueFactory(makeFactory<EI>(), "::Test::E"); - communicator->addValueFactory(makeFactory<FI>(), "::Test::F"); - communicator->addValueFactory(makeFactory<II>(), "::Test::I"); - communicator->addValueFactory(makeFactory<JI>(), "::Test::J"); - communicator->addValueFactory(makeFactory<HI>(), "::Test::H"); + communicator->getValueFactoryManager()->add(makeFactory<BI>(), "::Test::B"); + communicator->getValueFactoryManager()->add(makeFactory<CI>(), "::Test::C"); + communicator->getValueFactoryManager()->add(makeFactory<DI>(), "::Test::D"); + communicator->getValueFactoryManager()->add(makeFactory<EI>(), "::Test::E"); + communicator->getValueFactoryManager()->add(makeFactory<FI>(), "::Test::F"); + communicator->getValueFactoryManager()->add(makeFactory<II>(), "::Test::I"); + communicator->getValueFactoryManager()->add(makeFactory<JI>(), "::Test::J"); + communicator->getValueFactoryManager()->add(makeFactory<HI>(), "::Test::H"); communicator->addObjectFactory(make_shared<MyObjectFactory>(), "TestOF"); #else Ice::ValueFactoryPtr factory = new MyValueFactory; - communicator->addValueFactory(factory, "::Test::B"); - communicator->addValueFactory(factory, "::Test::C"); - communicator->addValueFactory(factory, "::Test::D"); - communicator->addValueFactory(factory, "::Test::E"); - communicator->addValueFactory(factory, "::Test::F"); - communicator->addValueFactory(factory, "::Test::I"); - communicator->addValueFactory(factory, "::Test::J"); - communicator->addValueFactory(factory, "::Test::H"); + communicator->getValueFactoryManager()->add(factory, "::Test::B"); + communicator->getValueFactoryManager()->add(factory, "::Test::C"); + communicator->getValueFactoryManager()->add(factory, "::Test::D"); + communicator->getValueFactoryManager()->add(factory, "::Test::E"); + communicator->getValueFactoryManager()->add(factory, "::Test::F"); + communicator->getValueFactoryManager()->add(factory, "::Test::I"); + communicator->getValueFactoryManager()->add(factory, "::Test::J"); + communicator->getValueFactoryManager()->add(factory, "::Test::H"); communicator->addObjectFactory(new MyObjectFactory(), "TestOF"); #endif diff --git a/cpp/test/Ice/objects/Collocated.cpp b/cpp/test/Ice/objects/Collocated.cpp index 868ff08305c..1c07718968d 100644 --- a/cpp/test/Ice/objects/Collocated.cpp +++ b/cpp/test/Ice/objects/Collocated.cpp @@ -110,25 +110,25 @@ int run(int, char**, const Ice::CommunicatorPtr& communicator) { #ifdef ICE_CPP11_MAPPING - communicator->addValueFactory(makeFactory<BI>(), "::Test::B"); - communicator->addValueFactory(makeFactory<CI>(), "::Test::C"); - communicator->addValueFactory(makeFactory<DI>(), "::Test::D"); - communicator->addValueFactory(makeFactory<EI>(), "::Test::E"); - communicator->addValueFactory(makeFactory<FI>(), "::Test::F"); - communicator->addValueFactory(makeFactory<II>(), "::Test::I"); - communicator->addValueFactory(makeFactory<JI>(), "::Test::J"); - communicator->addValueFactory(makeFactory<HI>(), "::Test::H"); + communicator->getValueFactoryManager()->add(makeFactory<BI>(), "::Test::B"); + communicator->getValueFactoryManager()->add(makeFactory<CI>(), "::Test::C"); + communicator->getValueFactoryManager()->add(makeFactory<DI>(), "::Test::D"); + communicator->getValueFactoryManager()->add(makeFactory<EI>(), "::Test::E"); + communicator->getValueFactoryManager()->add(makeFactory<FI>(), "::Test::F"); + communicator->getValueFactoryManager()->add(makeFactory<II>(), "::Test::I"); + communicator->getValueFactoryManager()->add(makeFactory<JI>(), "::Test::J"); + communicator->getValueFactoryManager()->add(makeFactory<HI>(), "::Test::H"); communicator->addObjectFactory(make_shared<MyObjectFactory>(), "TestOF"); #else Ice::ValueFactoryPtr factory = new MyValueFactory; - communicator->addValueFactory(factory, "::Test::B"); - communicator->addValueFactory(factory, "::Test::C"); - communicator->addValueFactory(factory, "::Test::D"); - communicator->addValueFactory(factory, "::Test::E"); - communicator->addValueFactory(factory, "::Test::F"); - communicator->addValueFactory(factory, "::Test::I"); - communicator->addValueFactory(factory, "::Test::J"); - communicator->addValueFactory(factory, "::Test::H"); + communicator->getValueFactoryManager()->add(factory, "::Test::B"); + communicator->getValueFactoryManager()->add(factory, "::Test::C"); + communicator->getValueFactoryManager()->add(factory, "::Test::D"); + communicator->getValueFactoryManager()->add(factory, "::Test::E"); + communicator->getValueFactoryManager()->add(factory, "::Test::F"); + communicator->getValueFactoryManager()->add(factory, "::Test::I"); + communicator->getValueFactoryManager()->add(factory, "::Test::J"); + communicator->getValueFactoryManager()->add(factory, "::Test::H"); communicator->addObjectFactory(new MyObjectFactory(), "TestOF"); #endif diff --git a/cpp/test/Ice/objects/Server.cpp b/cpp/test/Ice/objects/Server.cpp index e0307e2c1ad..c5c4e61849d 100644 --- a/cpp/test/Ice/objects/Server.cpp +++ b/cpp/test/Ice/objects/Server.cpp @@ -56,14 +56,14 @@ int run(int, char**, const Ice::CommunicatorPtr& communicator) { #ifdef ICE_CPP11_MAPPING - communicator->addValueFactory(makeFactory<II>(), "::Test::I"); - communicator->addValueFactory(makeFactory<JI>(), "::Test::J"); - communicator->addValueFactory(makeFactory<HI>(), "::Test::H"); + communicator->getValueFactoryManager()->add(makeFactory<II>(), "::Test::I"); + communicator->getValueFactoryManager()->add(makeFactory<JI>(), "::Test::J"); + communicator->getValueFactoryManager()->add(makeFactory<HI>(), "::Test::H"); #else Ice::ValueFactoryPtr factory = new MyValueFactory; - communicator->addValueFactory(factory, "::Test::I"); - communicator->addValueFactory(factory, "::Test::J"); - communicator->addValueFactory(factory, "::Test::H"); + communicator->getValueFactoryManager()->add(factory, "::Test::I"); + communicator->getValueFactoryManager()->add(factory, "::Test::J"); + communicator->getValueFactoryManager()->add(factory, "::Test::H"); #endif communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0)); diff --git a/cpp/test/Ice/objects/TestI.cpp b/cpp/test/Ice/objects/TestI.cpp index f96cd565ef9..355c27fcf99 100644 --- a/cpp/test/Ice/objects/TestI.cpp +++ b/cpp/test/Ice/objects/TestI.cpp @@ -319,12 +319,12 @@ UnexpectedObjectExceptionTestI::ice_invoke(const std::vector<Ice::Byte>&, const Ice::Current& current) { Ice::CommunicatorPtr communicator = current.adapter->getCommunicator(); - Ice::OutputStreamPtr out = Ice::createOutputStream(communicator); - out->startEncapsulation(current.encoding, Ice::DefaultFormat); + Ice::OutputStream out(communicator); + out.startEncapsulation(current.encoding, Ice::DefaultFormat); AlsoEmptyPtr obj = ICE_MAKE_SHARED(AlsoEmpty); - out->write(obj); - out->writePendingObjects(); - out->endEncapsulation(); - out->finished(outParams); + out.write(obj); + out.writePendingObjects(); + out.endEncapsulation(); + out.finished(outParams); return true; } diff --git a/cpp/test/Ice/operations/.depend.mak b/cpp/test/Ice/operations/.depend.mak index e88839ba41c..d3bad3bade7 100755 --- a/cpp/test/Ice/operations/.depend.mak +++ b/cpp/test/Ice/operations/.depend.mak @@ -32,7 +32,6 @@ Test.obj: \ "$(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" \ @@ -69,12 +68,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -89,6 +88,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -127,7 +127,6 @@ Client.obj: \ "$(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" \ @@ -157,12 +156,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -171,7 +170,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -183,6 +181,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -211,7 +210,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -259,7 +257,6 @@ AllTests.obj: \ "$(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" \ @@ -289,12 +286,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -303,7 +300,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -315,6 +311,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -343,7 +340,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -391,7 +387,6 @@ Twoways.obj: \ "$(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" \ @@ -421,12 +416,12 @@ Twoways.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -435,7 +430,6 @@ Twoways.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -447,6 +441,7 @@ Twoways.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -475,7 +470,6 @@ Twoways.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -523,7 +517,6 @@ Oneways.obj: \ "$(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" \ @@ -553,12 +546,12 @@ Oneways.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -567,7 +560,6 @@ Oneways.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -579,6 +571,7 @@ Oneways.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -607,7 +600,6 @@ Oneways.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -655,7 +647,6 @@ TwowaysAMI.obj: \ "$(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" \ @@ -685,12 +676,12 @@ TwowaysAMI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -699,7 +690,6 @@ TwowaysAMI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -711,6 +701,7 @@ TwowaysAMI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -739,7 +730,6 @@ TwowaysAMI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -787,7 +777,6 @@ OnewaysAMI.obj: \ "$(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" \ @@ -817,12 +806,12 @@ OnewaysAMI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -831,7 +820,6 @@ OnewaysAMI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -843,6 +831,7 @@ OnewaysAMI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -871,7 +860,6 @@ OnewaysAMI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -919,7 +907,6 @@ BatchOneways.obj: \ "$(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" \ @@ -949,12 +936,12 @@ BatchOneways.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -963,7 +950,6 @@ BatchOneways.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -975,6 +961,7 @@ BatchOneways.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1003,7 +990,6 @@ BatchOneways.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1051,7 +1037,6 @@ BatchOnewaysAMI.obj: \ "$(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" \ @@ -1081,12 +1066,12 @@ BatchOnewaysAMI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1095,7 +1080,6 @@ BatchOnewaysAMI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1107,6 +1091,7 @@ BatchOnewaysAMI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1135,7 +1120,6 @@ BatchOnewaysAMI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1183,7 +1167,6 @@ TestI.obj: \ "$(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" \ @@ -1213,12 +1196,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1227,7 +1210,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1239,6 +1221,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1267,7 +1250,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1316,7 +1298,6 @@ Server.obj: \ "$(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" \ @@ -1346,12 +1327,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1360,7 +1341,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1372,6 +1352,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1400,7 +1381,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1437,7 +1417,6 @@ TestAMD.obj: \ "$(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" \ @@ -1474,12 +1453,12 @@ TestAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1494,6 +1473,7 @@ TestAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1533,7 +1513,6 @@ TestAMDI.obj: \ "$(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" \ @@ -1563,12 +1542,12 @@ TestAMDI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1577,7 +1556,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1589,6 +1567,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1617,7 +1596,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1666,7 +1644,6 @@ ServerAMD.obj: \ "$(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" \ @@ -1696,12 +1673,12 @@ ServerAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1710,7 +1687,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1722,6 +1698,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1750,7 +1727,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1799,7 +1775,6 @@ Collocated.obj: \ "$(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" \ @@ -1829,12 +1804,12 @@ Collocated.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1843,7 +1818,6 @@ Collocated.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1855,6 +1829,7 @@ Collocated.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1883,7 +1858,6 @@ Collocated.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/optional/.depend.mak b/cpp/test/Ice/optional/.depend.mak index 60a9475cccd..8f2a218fa75 100755 --- a/cpp/test/Ice/optional/.depend.mak +++ b/cpp/test/Ice/optional/.depend.mak @@ -22,7 +22,6 @@ Test.obj: \ "$(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" \ @@ -59,12 +58,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -79,6 +78,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -90,7 +90,6 @@ Test.obj: \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -121,7 +120,6 @@ Test.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -164,7 +162,6 @@ TestI.obj: \ "$(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" \ @@ -194,12 +191,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -208,7 +205,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -220,6 +216,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -248,7 +245,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -294,7 +290,6 @@ Client.obj: \ "$(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" \ @@ -324,12 +319,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -338,7 +333,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -350,6 +344,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -378,7 +373,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -429,7 +423,6 @@ AllTests.obj: \ "$(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" \ @@ -459,12 +452,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -473,7 +466,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -485,6 +477,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -513,7 +506,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -563,7 +555,6 @@ Server.obj: \ "$(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" \ @@ -593,12 +584,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -607,7 +598,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -619,6 +609,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -647,7 +638,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -686,7 +676,6 @@ TestAMD.obj: \ "$(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" \ @@ -723,12 +712,12 @@ TestAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -743,6 +732,7 @@ TestAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -755,7 +745,6 @@ TestAMD.obj: \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -785,7 +774,6 @@ TestAMD.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -828,7 +816,6 @@ TestAMDI.obj: \ "$(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" \ @@ -858,12 +845,12 @@ TestAMDI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -872,7 +859,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -884,6 +870,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -912,7 +899,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -958,7 +944,6 @@ ServerAMD.obj: \ "$(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" \ @@ -988,12 +973,12 @@ ServerAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1002,7 +987,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1014,6 +998,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1042,7 +1027,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/optional/AllTests.cpp b/cpp/test/Ice/optional/AllTests.cpp index 4523f3e62ac..c99c9302685 100644 --- a/cpp/test/Ice/optional/AllTests.cpp +++ b/cpp/test/Ice/optional/AllTests.cpp @@ -14,11 +14,16 @@ using namespace std; using namespace Test; -class TestObjectReader : public Ice::ObjectReader +#ifdef ICE_CPP11_MAPPING +class TestObjectReader : public Ice::Value +#else +class TestObjectReader : public Ice::Object +#endif { public: - virtual void - read(const Ice::InputStreamPtr& in) + virtual void __write(Ice::OutputStream*) const { } + + virtual void __read(Ice::InputStream* in) { in->startObject(); in->startSlice(); @@ -27,11 +32,16 @@ public: } }; -class BObjectReader : public Ice::ObjectReader +#ifdef ICE_CPP11_MAPPING +class BObjectReader : public Ice::Value +#else +class BObjectReader : public Ice::Object +#endif { public: - virtual void - read(const Ice::InputStreamPtr& in) + virtual void __write(Ice::OutputStream*) const { } + + virtual void __read(Ice::InputStream* in) { in->startObject(); // ::Test::B @@ -47,11 +57,16 @@ public: } }; -class CObjectReader : public Ice::ObjectReader +#ifdef ICE_CPP11_MAPPING +class CObjectReader : public Ice::Value +#else +class CObjectReader : public Ice::Object +#endif { public: - virtual void - read(const Ice::InputStreamPtr& in) + virtual void __write(Ice::OutputStream*) const { } + + virtual void __read(Ice::InputStream* in) { in->startObject(); // ::Test::C @@ -70,12 +85,15 @@ public: } }; -class DObjectWriter : public Ice::ObjectWriter +#ifdef ICE_CPP11_MAPPING +class DObjectWriter : public Ice::Value +#else +class DObjectWriter : public Ice::Object +#endif { public: - virtual void - write(const Ice::OutputStreamPtr& out) const + virtual void __write(Ice::OutputStream* out) const { out->startObject(0); // ::Test::D @@ -104,14 +122,20 @@ public: out->endSlice(); out->endObject(); } + + virtual void __read(Ice::InputStream*) { } }; -class DObjectReader : public Ice::ObjectReader +#ifdef ICE_CPP11_MAPPING +class DObjectReader : public Ice::Value +#else +class DObjectReader : public Ice::Object +#endif { public: + virtual void __write(Ice::OutputStream*) const { } - virtual void - read(const Ice::InputStreamPtr& in) + virtual void __read(Ice::InputStream* in) { in->startObject(); // ::Test::D @@ -147,18 +171,22 @@ private: IceUtil::Optional<APtr> a; }; -class FObjectReader : public Ice::ObjectReader +#ifdef ICE_CPP11_MAPPING +class FObjectReader : public Ice::Value +#else +class FObjectReader : public Ice::Object +#endif { public: + virtual void __write(Ice::OutputStream*) const { } - virtual void - read(const Ice::InputStreamPtr& in) + virtual void __read(Ice::InputStream* in) { _f = new F(); in->startObject(); in->startSlice(); // Don't read af on purpose - //in->read(1, _f->af); + //in.read(1, _f->af); in->endSlice(); in->startSlice(); in->read(_f->ae); @@ -235,7 +263,7 @@ InitialPrx allTests(const Ice::CommunicatorPtr& communicator, bool) { FactoryIPtr factory = new FactoryI(); - communicator->addValueFactory(factory, ""); + communicator->getValueFactoryManager()->add(factory, ""); cout << "testing stringToProxy... " << flush; string ref = "initial:" + getTestEndpoint(communicator, 0); @@ -563,39 +591,45 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) test(mo8->ivsd == mo1->ivsd); test(!mo8->iood); + Ice::ByteSeq inEncaps; + Ice::ByteSeq outEncaps; + // // Send a request using blobjects. Upon receival, we don't read // any of the optional members. This ensures the optional members // are skipped even if the receiver knows nothing about them. // - factory->setEnabled(true); - Ice::OutputStreamPtr out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(oo1); - out->endEncapsulation(); - Ice::ByteSeq inEncaps; - out->finished(inEncaps); - Ice::ByteSeq outEncaps; - test(initial->ice_invoke("pingPong", Ice::Normal, inEncaps, outEncaps)); - Ice::InputStreamPtr in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - Ice::ObjectPtr obj; - in->read(obj); - in->endEncapsulation(); - test(obj && dynamic_cast<TestObjectReader*>(obj.get())); - - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(mo1); - out->endEncapsulation(); - out->finished(inEncaps); - test(initial->ice_invoke("pingPong", Ice::Normal, inEncaps, outEncaps)); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(obj); - in->endEncapsulation(); - test(obj && dynamic_cast<TestObjectReader*>(obj.get())); - factory->setEnabled(false); + { + factory->setEnabled(true); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(oo1); + out.endEncapsulation(); + out.finished(inEncaps); + test(initial->ice_invoke("pingPong", Ice::Normal, inEncaps, outEncaps)); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + Ice::ObjectPtr obj; + in.read(obj); + in.endEncapsulation(); + test(obj && dynamic_cast<TestObjectReader*>(obj.get())); + } + + { + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(mo1); + out.endEncapsulation(); + out.finished(inEncaps); + test(initial->ice_invoke("pingPong", Ice::Normal, inEncaps, outEncaps)); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + Ice::ObjectPtr obj; + in.read(obj); + in.endEncapsulation(); + test(obj && dynamic_cast<TestObjectReader*>(obj.get())); + factory->setEnabled(false); + } // // Use the 1.0 encoding with operations whose only class parameters are optional. @@ -659,19 +693,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) test(mc->fss->size() == 300); test(mc->ifsd->size() == 300); - factory->setEnabled(true); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(mc); - out->endEncapsulation(); - out->finished(inEncaps); - test(initial->ice_invoke("pingPong", Ice::Normal, inEncaps, outEncaps)); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(obj); - in->endEncapsulation(); - test(obj && dynamic_cast<TestObjectReader*>(obj.get())); - factory->setEnabled(false); + { + factory->setEnabled(true); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(mc); + out.endEncapsulation(); + out.finished(inEncaps); + test(initial->ice_invoke("pingPong", Ice::Normal, inEncaps, outEncaps)); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + Ice::ObjectPtr obj; + in.read(obj); + in.endEncapsulation(); + test(obj && dynamic_cast<TestObjectReader*>(obj.get())); + factory->setEnabled(false); + } cout << "ok" << endl; @@ -693,19 +730,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) test(b2->mc == 12); test(b2->md == 13); - factory->setEnabled(true); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(b); - out->endEncapsulation(); - out->finished(inEncaps); - test(initial->ice_invoke("pingPong", Ice::Normal, inEncaps, outEncaps)); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(obj); - in->endEncapsulation(); - test(obj); - factory->setEnabled(false); + { + factory->setEnabled(true); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(b); + out.endEncapsulation(); + out.finished(inEncaps); + test(initial->ice_invoke("pingPong", Ice::Normal, inEncaps, outEncaps)); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + Ice::ObjectPtr obj; + in.read(obj); + in.endEncapsulation(); + test(obj); + factory->setEnabled(false); + } cout << "ok" << endl; @@ -720,15 +760,16 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) test(rf->ae == *rf->af); factory->setEnabled(true); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(f); - out->endEncapsulation(); - out->finished(inEncaps); - in = Ice::createInputStream(communicator, inEncaps); - in->startEncapsulation(); - in->read(obj); - in->endEncapsulation(); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(f); + out.endEncapsulation(); + out.finished(inEncaps); + Ice::InputStream in(communicator, out.getEncoding(), inEncaps); + in.startEncapsulation(); + Ice::ObjectPtr obj; + in.read(obj); + in.endEncapsulation(); factory->setEnabled(false); rf = dynamic_cast<FObjectReader*>(obj.get())->getF(); @@ -754,35 +795,42 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) CPtr c = new C(); c->ss = "test"; c->ms = "testms"; - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(c); - out->endEncapsulation(); - out->finished(inEncaps); - factory->setEnabled(true); - test(initial->ice_invoke("pingPong", Ice::Normal, inEncaps, outEncaps)); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(obj); - in->endEncapsulation(); - test(dynamic_cast<CObjectReader*>(obj.get())); - factory->setEnabled(false); - - factory->setEnabled(true); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - Ice::ObjectPtr d = new DObjectWriter(); - out->write(d); - out->endEncapsulation(); - out->finished(inEncaps); - test(initial->ice_invoke("pingPong", Ice::Normal, inEncaps, outEncaps)); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(obj); - in->endEncapsulation(); - test(obj && dynamic_cast<DObjectReader*>(obj.get())); - dynamic_cast<DObjectReader*>(obj.get())->check(); - factory->setEnabled(false); + + { + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(c); + out.endEncapsulation(); + out.finished(inEncaps); + factory->setEnabled(true); + test(initial->ice_invoke("pingPong", Ice::Normal, inEncaps, outEncaps)); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + Ice::ObjectPtr obj; + in.read(obj); + in.endEncapsulation(); + test(dynamic_cast<CObjectReader*>(obj.get())); + factory->setEnabled(false); + } + + { + factory->setEnabled(true); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + Ice::ObjectPtr d = new DObjectWriter(); + out.write(d); + out.endEncapsulation(); + out.finished(inEncaps); + test(initial->ice_invoke("pingPong", Ice::Normal, inEncaps, outEncaps)); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + Ice::ObjectPtr obj; + in.read(obj); + in.endEncapsulation(); + test(obj && dynamic_cast<DObjectReader*>(obj.get())); + dynamic_cast<DObjectReader*>(obj.get())->check(); + factory->setEnabled(false); + } } cout << "ok" << endl; @@ -790,17 +838,17 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) { APtr a = new A(); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(a); - out->write(1, IceUtil::makeOptional(Ice::ObjectPtr(new DObjectWriter))); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(a); + out.write(1, IceUtil::makeOptional(Ice::ObjectPtr(new DObjectWriter))); + out.endEncapsulation(); + out.finished(inEncaps); test(initial->ice_invoke("opClassAndUnknownOptional", Ice::Normal, inEncaps, outEncaps)); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.endEncapsulation(); } cout << "ok" << endl; } @@ -816,26 +864,26 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) p2 = initial->opByte(p1, p3); test(p2 == 56 && p3 == 56); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opByte", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); IceUtil::Optional<Ice::Byte> p4 = 0x08; - in->read(89, p4); + in.read(89, p4); - in->endEncapsulation(); + in.endEncapsulation(); test(p2 == 56 && p3 == 56 && !p4); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -848,22 +896,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) p2 = initial->opBool(p1, p3); test(*p2 == true && *p3 == true); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opBool", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(*p2 == true && *p3 == true); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -876,22 +924,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) p2 = initial->opShort(p1, p3); test(p2 == 56 && p3 == 56); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opShort", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2 == 56 && p3 == 56); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -904,22 +952,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) p2 = initial->opInt(p1, p3); test(p2 == 56 && p3 == 56); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opInt", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2 == 56 && p3 == 56); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -932,22 +980,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) p2 = initial->opLong(p1, p3); test(p2 == 56 && p3 == 56); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(1, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(1, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opLong", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(2, p3); - in->read(3, p2); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(2, p3); + in.read(3, p2); + in.endEncapsulation(); test(p2 == 56 && p3 == 56); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -960,22 +1008,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) p2 = initial->opFloat(p1, p3); test(p2 == 1.0f && p3 == 1.0f); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opFloat", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2 == 1.0f && p3 == 1.0f); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -988,22 +1036,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) p2 = initial->opDouble(p1, p3); test(p2 == 1.0 && p3 == 1.0); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opDouble", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2 == 1.0 && p3 == 1.0); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -1016,22 +1064,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) p2 = initial->opString("test", p3); test(p2 == "test" && p3 == "test"); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opString", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2 == "test" && p3 == "test"); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -1046,22 +1094,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) p2 = initial->opString("test", p3); test(p2 == "test" && p3 == "test"); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opCustomString", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2 == "test" && p3 == "test"); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } } @@ -1075,22 +1123,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) p2 = initial->opMyEnum(p1, p3); test(p2 == Test::MyEnumMember && p3 == Test::MyEnumMember); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opMyEnum", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2 == Test::MyEnumMember && p3 == Test::MyEnumMember); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -1104,22 +1152,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) p2 = initial->opSmallStruct(p1, p3); test(p2->m == 56 && p3->m == 56); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opSmallStruct", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2->m == 56 && p3->m == 56); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -1133,22 +1181,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) p2 = initial->opFixedStruct(p1, p3); test(p2->m == 56 && p3->m == 56); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opFixedStruct", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2->m == 56 && p3->m == 56); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -1162,22 +1210,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) p2 = initial->opVarStruct(p1, p3); test(p2->m == "test" && p3->m == "test"); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opVarStruct", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2->m == "test" && p3->m == "test"); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -1190,22 +1238,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) p2 = initial->opOneOptional(p1, p3); test((*p2)->a == 58 && (*p3)->a == 58); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opOneOptional", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test((*p2)->a == 58 && (*p3)->a == 58); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -1218,22 +1266,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) p2 = initial->opOneOptionalProxy(p1, p3); test(p2 == p1 && p3 == p1); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opOneOptionalProxy", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2 == p1 && p3 == p1); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -1242,18 +1290,18 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) (*f->af)->requiredA = 56; f->ae = *f->af; - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(1, makeOptional(f)); - out->write(2, makeOptional(f->ae)); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(1, makeOptional(f)); + out.write(2, makeOptional(f->ae)); + out.endEncapsulation(); + out.finished(inEncaps); - in = Ice::createInputStream(communicator, inEncaps); - in->startEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), inEncaps); + in.startEncapsulation(); IceUtil::Optional<APtr> a; - in->read(2, a); - in->endEncapsulation(); + in.read(2, a); + in.endEncapsulation(); test(a && *a && (*a)->requiredA == 56); } cout << "ok" << endl; @@ -1277,22 +1325,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) test(p2 && p3); test(p2 == bs && p3 == bs); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opByteSeq", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2 == bs && p3 == bs); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -1314,22 +1362,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) test(p2 && p3); test(p2 == bsv && p3 == bsv); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opBoolSeq", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2 == bsv && p3 == bsv); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -1350,22 +1398,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) test(p2 && p3); test(p2 == bs && p3 == bs); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opShortSeq", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2 == bs && p3 == bs); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -1386,22 +1434,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) test(p2 && p3); test(p2 == bs && p3 == bs); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opIntSeq", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2 == bs && p3 == bs); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -1422,22 +1470,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) test(p2 && p3); test(p2 == bs && p3 == bs); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opLongSeq", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2 == bs && p3 == bs); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -1458,22 +1506,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) test(p2 && p3); test(p2 == bs && p3 == bs); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opFloatSeq", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2 == bs && p3 == bs); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -1494,22 +1542,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) test(p2 && p3); test(p2 == bs && p3 == bs); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opDoubleSeq", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2 == bs && p3 == bs); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -1530,22 +1578,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) test(p2 && p3); test(p2 == ss && p3 == ss); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opStringSeq", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2 == ss && p3 == ss); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -1581,22 +1629,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) test(p2 && p3); test(p2 == fssv && p3 == fssv); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opFixedStructSeq", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2 == fssv && p3 == fssv); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -1616,22 +1664,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) test(p2 && p3); test(p2 == ss && p3 == ss); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opVarStructSeq", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2 == ss && p3 == ss); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -1647,22 +1695,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) test(p2 && p3); test(p2 == ss && p3 == ss); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opIntIntDict", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2 == ss && p3 == ss); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -1678,22 +1726,22 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) test(p2 && p3); test(p2 == ss && p3 == ss); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opStringIntDict", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2 == ss && p3 == ss); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } { @@ -1713,25 +1761,25 @@ allTests(const Ice::CommunicatorPtr& communicator, bool) test(p2->size() == p1->size()); test((*p2)[5] == ss[5].to_string()); - out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->write(2, p1); - out->endEncapsulation(); - out->finished(inEncaps); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.write(2, p1); + out.endEncapsulation(); + out.finished(inEncaps); initial->ice_invoke("opCustomIntStringDict", Ice::Normal, inEncaps, outEncaps); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->read(1, p2); - in->read(3, p3); - in->endEncapsulation(); + Ice::InputStream in(communicator, out.getEncoding(), outEncaps); + in.startEncapsulation(); + in.read(1, p2); + in.read(3, p3); + in.endEncapsulation(); test(p2 && p3); test(p2 == p3); test(p2->size() == p1->size()); test((*p2)[5] == ss[5].to_string()); - in = Ice::createInputStream(communicator, outEncaps); - in->startEncapsulation(); - in->endEncapsulation(); + Ice::InputStream in2(communicator, out.getEncoding(), outEncaps); + in2.startEncapsulation(); + in2.endEncapsulation(); } } diff --git a/cpp/test/Ice/plugin/.depend.mak b/cpp/test/Ice/plugin/.depend.mak index 97eef732093..d1b1ce381a5 100755 --- a/cpp/test/Ice/plugin/.depend.mak +++ b/cpp/test/Ice/plugin/.depend.mak @@ -28,7 +28,6 @@ Client.obj: \ "$(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" \ @@ -58,12 +57,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -72,7 +71,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -84,6 +82,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -112,7 +111,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -159,7 +157,6 @@ Plugin.obj: \ "$(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" \ @@ -189,12 +186,12 @@ Plugin.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -203,7 +200,6 @@ Plugin.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -215,6 +211,7 @@ Plugin.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -243,7 +240,6 @@ Plugin.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/properties/.depend.mak b/cpp/test/Ice/properties/.depend.mak index 3a730e043a4..0d2a94f75c6 100755 --- a/cpp/test/Ice/properties/.depend.mak +++ b/cpp/test/Ice/properties/.depend.mak @@ -28,7 +28,6 @@ Client.obj: \ "$(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" \ @@ -58,12 +57,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -72,7 +71,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -84,6 +82,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -112,7 +111,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/proxy/.depend.mak b/cpp/test/Ice/proxy/.depend.mak index 7125723adc8..268378de4cd 100755 --- a/cpp/test/Ice/proxy/.depend.mak +++ b/cpp/test/Ice/proxy/.depend.mak @@ -32,7 +32,6 @@ Test.obj: \ "$(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" \ @@ -69,12 +68,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -89,6 +88,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -127,7 +127,6 @@ Client.obj: \ "$(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" \ @@ -157,12 +156,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -171,7 +170,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -183,6 +181,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -211,7 +210,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -259,7 +257,6 @@ AllTests.obj: \ "$(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" \ @@ -289,12 +286,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -303,7 +300,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -315,6 +311,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -343,7 +340,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -391,7 +387,6 @@ TestI.obj: \ "$(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" \ @@ -421,12 +416,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -435,7 +430,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -447,6 +441,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -475,7 +470,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -524,7 +518,6 @@ Server.obj: \ "$(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" \ @@ -554,12 +547,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -568,7 +561,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -580,6 +572,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -608,7 +601,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -645,7 +637,6 @@ TestAMD.obj: \ "$(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" \ @@ -682,12 +673,12 @@ TestAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -702,6 +693,7 @@ TestAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -741,7 +733,6 @@ TestAMDI.obj: \ "$(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" \ @@ -771,12 +762,12 @@ TestAMDI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -785,7 +776,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -797,6 +787,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -825,7 +816,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -874,7 +864,6 @@ ServerAMD.obj: \ "$(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" \ @@ -904,12 +893,12 @@ ServerAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -918,7 +907,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -930,6 +918,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -958,7 +947,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1007,7 +995,6 @@ Collocated.obj: \ "$(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" \ @@ -1037,12 +1024,12 @@ Collocated.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1051,7 +1038,6 @@ Collocated.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1063,6 +1049,7 @@ Collocated.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1091,7 +1078,6 @@ Collocated.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/proxy/AllTests.cpp b/cpp/test/Ice/proxy/AllTests.cpp index 7b0fb058f2c..7803c3957f0 100644 --- a/cpp/test/Ice/proxy/AllTests.cpp +++ b/cpp/test/Ice/proxy/AllTests.cpp @@ -974,11 +974,11 @@ allTests(const Ice::CommunicatorPtr& communicator) { // Send request with bogus 1.2 encoding. Ice::EncodingVersion version = { 1, 2 }; - Ice::OutputStreamPtr out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->endEncapsulation(); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.endEncapsulation(); vector<Ice::Byte> inEncaps; - out->finished(inEncaps); + out.finished(inEncaps); inEncaps[4] = version.major; inEncaps[5] = version.minor; vector<Ice::Byte> outEncaps; @@ -995,11 +995,11 @@ allTests(const Ice::CommunicatorPtr& communicator) { // Send request with bogus 2.0 encoding. Ice::EncodingVersion version = { 2, 0 }; - Ice::OutputStreamPtr out = Ice::createOutputStream(communicator); - out->startEncapsulation(); - out->endEncapsulation(); + Ice::OutputStream out(communicator); + out.startEncapsulation(); + out.endEncapsulation(); vector<Ice::Byte> inEncaps; - out->finished(inEncaps); + out.finished(inEncaps); inEncaps[4] = version.major; inEncaps[5] = version.minor; vector<Ice::Byte> outEncaps; diff --git a/cpp/test/Ice/retry/.depend.mak b/cpp/test/Ice/retry/.depend.mak index b8e1033fd8e..19980382c04 100755 --- a/cpp/test/Ice/retry/.depend.mak +++ b/cpp/test/Ice/retry/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(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" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(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" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -247,7 +245,6 @@ InstrumentationI.obj: \ "$(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" \ @@ -277,12 +274,12 @@ InstrumentationI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -291,7 +288,6 @@ InstrumentationI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -303,6 +299,7 @@ InstrumentationI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -331,7 +328,6 @@ InstrumentationI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -378,7 +374,6 @@ AllTests.obj: \ "$(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" \ @@ -408,12 +403,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -422,7 +417,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -434,6 +428,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -462,7 +457,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -512,7 +506,6 @@ TestI.obj: \ "$(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" \ @@ -542,12 +535,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -556,7 +549,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -568,6 +560,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -596,7 +589,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -641,7 +633,6 @@ Server.obj: \ "$(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" \ @@ -671,12 +662,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -685,7 +676,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -697,6 +687,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -725,7 +716,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -774,7 +764,6 @@ Collocated.obj: \ "$(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" \ @@ -804,12 +793,12 @@ Collocated.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -818,7 +807,6 @@ Collocated.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -830,6 +818,7 @@ Collocated.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -858,7 +847,6 @@ Collocated.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/servantLocator/.depend.mak b/cpp/test/Ice/servantLocator/.depend.mak index 5b4f3a20a47..24fc06f8f77 100755 --- a/cpp/test/Ice/servantLocator/.depend.mak +++ b/cpp/test/Ice/servantLocator/.depend.mak @@ -22,7 +22,6 @@ Test.obj: \ "$(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" \ @@ -59,12 +58,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -79,6 +78,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -118,7 +118,6 @@ Client.obj: \ "$(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" \ @@ -148,12 +147,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -162,7 +161,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -174,6 +172,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -201,7 +200,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -249,7 +247,6 @@ AllTests.obj: \ "$(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" \ @@ -279,12 +276,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -293,7 +290,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -305,6 +301,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -333,7 +330,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -391,7 +387,6 @@ TestI.obj: \ "$(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" \ @@ -418,11 +413,11 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -431,7 +426,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -442,6 +436,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -469,7 +464,6 @@ TestI.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -514,7 +508,6 @@ ServantLocatorI.obj: \ "$(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" \ @@ -544,12 +537,12 @@ ServantLocatorI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -558,7 +551,6 @@ ServantLocatorI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -570,6 +562,7 @@ ServantLocatorI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -598,7 +591,6 @@ ServantLocatorI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -647,7 +639,6 @@ Server.obj: \ "$(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" \ @@ -677,12 +668,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -691,7 +682,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -703,6 +693,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -730,7 +721,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -768,7 +758,6 @@ TestAMD.obj: \ "$(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" \ @@ -805,12 +794,12 @@ TestAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -825,6 +814,7 @@ TestAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -874,7 +864,6 @@ TestAMDI.obj: \ "$(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" \ @@ -901,11 +890,11 @@ TestAMDI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -914,7 +903,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -925,6 +913,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -952,7 +941,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -997,7 +985,6 @@ ServerAMD.obj: \ "$(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" \ @@ -1027,12 +1014,12 @@ ServerAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1041,7 +1028,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1053,6 +1039,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1080,7 +1067,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1131,7 +1117,6 @@ Collocated.obj: \ "$(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" \ @@ -1161,12 +1146,12 @@ Collocated.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1175,7 +1160,6 @@ Collocated.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1187,6 +1171,7 @@ Collocated.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1214,7 +1199,6 @@ Collocated.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/services/.depend.mak b/cpp/test/Ice/services/.depend.mak index ddc45e41f20..da3fe92ac12 100755 --- a/cpp/test/Ice/services/.depend.mak +++ b/cpp/test/Ice/services/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(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" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(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" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ AllTests.obj: \ "$(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" \ @@ -276,12 +273,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/slicing/exceptions/.depend.mak b/cpp/test/Ice/slicing/exceptions/.depend.mak index f12e8883ec8..f594fa373c1 100755 --- a/cpp/test/Ice/slicing/exceptions/.depend.mak +++ b/cpp/test/Ice/slicing/exceptions/.depend.mak @@ -34,7 +34,6 @@ Test.obj: \ "$(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" \ @@ -71,12 +70,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -91,6 +90,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -130,7 +130,6 @@ Client.obj: \ "$(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" \ @@ -160,12 +159,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -174,7 +173,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -186,6 +184,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -214,7 +213,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -250,7 +248,6 @@ ClientPrivate.obj: \ "$(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" \ @@ -287,12 +284,12 @@ ClientPrivate.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -307,6 +304,7 @@ ClientPrivate.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -347,7 +345,6 @@ AllTests.obj: \ "$(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" \ @@ -377,12 +374,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -391,7 +388,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -403,6 +399,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -431,7 +428,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -468,7 +464,6 @@ ServerPrivate.obj: \ "$(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" \ @@ -505,12 +500,12 @@ ServerPrivate.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -525,6 +520,7 @@ ServerPrivate.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -554,7 +550,6 @@ TestI.obj: \ "$(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" \ @@ -591,12 +586,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -611,6 +606,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -627,7 +623,6 @@ TestI.obj: \ "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -657,7 +652,6 @@ TestI.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -699,7 +693,6 @@ Server.obj: \ "$(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" \ @@ -729,12 +722,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -743,7 +736,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -755,6 +747,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -783,7 +776,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -821,7 +813,6 @@ TestAMD.obj: \ "$(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" \ @@ -858,12 +849,12 @@ TestAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -878,6 +869,7 @@ TestAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -906,7 +898,6 @@ ServerPrivateAMD.obj: \ "$(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" \ @@ -943,12 +934,12 @@ ServerPrivateAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -963,6 +954,7 @@ ServerPrivateAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -993,7 +985,6 @@ TestAMDI.obj: \ "$(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" \ @@ -1030,12 +1021,12 @@ TestAMDI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1050,6 +1041,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1061,7 +1053,6 @@ TestAMDI.obj: \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1091,7 +1082,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1138,7 +1128,6 @@ ServerAMD.obj: \ "$(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" \ @@ -1168,12 +1157,12 @@ ServerAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1182,7 +1171,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1194,6 +1182,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1222,7 +1211,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/slicing/objects/.depend.mak b/cpp/test/Ice/slicing/objects/.depend.mak index 8570865ce91..297023f782c 100755 --- a/cpp/test/Ice/slicing/objects/.depend.mak +++ b/cpp/test/Ice/slicing/objects/.depend.mak @@ -34,7 +34,6 @@ Test.obj: \ "$(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" \ @@ -71,12 +70,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -91,6 +90,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -119,7 +119,6 @@ ClientPrivate.obj: \ "$(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" \ @@ -156,12 +155,12 @@ ClientPrivate.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -176,6 +175,7 @@ ClientPrivate.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -217,7 +217,6 @@ Client.obj: \ "$(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" \ @@ -247,12 +246,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -261,7 +260,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -273,6 +271,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -301,7 +300,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -350,7 +348,6 @@ AllTests.obj: \ "$(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" \ @@ -380,12 +377,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -394,7 +391,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -406,6 +402,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -434,7 +431,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -471,7 +467,6 @@ ServerPrivate.obj: \ "$(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" \ @@ -508,12 +503,12 @@ ServerPrivate.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -528,6 +523,7 @@ ServerPrivate.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -558,7 +554,6 @@ TestI.obj: \ "$(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" \ @@ -595,12 +590,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -615,6 +610,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -632,7 +628,6 @@ TestI.obj: \ "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -661,7 +656,6 @@ TestI.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -703,7 +697,6 @@ Server.obj: \ "$(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" \ @@ -733,12 +726,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -747,7 +740,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -759,6 +751,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -787,7 +780,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -825,7 +817,6 @@ TestAMD.obj: \ "$(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" \ @@ -862,12 +853,12 @@ TestAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -882,6 +873,7 @@ TestAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -910,7 +902,6 @@ ServerPrivateAMD.obj: \ "$(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" \ @@ -947,12 +938,12 @@ ServerPrivateAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -967,6 +958,7 @@ ServerPrivateAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -997,7 +989,6 @@ TestAMDI.obj: \ "$(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" \ @@ -1034,12 +1025,12 @@ TestAMDI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1054,6 +1045,7 @@ TestAMDI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1065,7 +1057,6 @@ TestAMDI.obj: \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1095,7 +1086,6 @@ TestAMDI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -1142,7 +1132,6 @@ ServerAMD.obj: \ "$(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" \ @@ -1172,12 +1161,12 @@ ServerAMD.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1186,7 +1175,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1198,6 +1186,7 @@ ServerAMD.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1226,7 +1215,6 @@ ServerAMD.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/slicing/objects/AllTests.cpp b/cpp/test/Ice/slicing/objects/AllTests.cpp index 8c145c3606d..2399a8416ef 100644 --- a/cpp/test/Ice/slicing/objects/AllTests.cpp +++ b/cpp/test/Ice/slicing/objects/AllTests.cpp @@ -2875,7 +2875,7 @@ allTests(const Ice::CommunicatorPtr& communicator) // Register a factory in order to substitute our own subclass of PNode. This provides // an easy way to determine how many unmarshaled instances currently exist. // - communicator->addValueFactory(new NodeFactoryI, PNode::ice_staticId()); + communicator->getValueFactoryManager()->add(new NodeFactoryI, PNode::ice_staticId()); // // Relay a graph through the server. This test uses a preserved class @@ -2921,7 +2921,7 @@ allTests(const Ice::CommunicatorPtr& communicator) // Register a factory in order to substitute our own subclass of Preserved. This provides // an easy way to determine how many unmarshaled instances currently exist. // - communicator->addValueFactory(new PreservedFactoryI, Preserved::ice_staticId()); + communicator->getValueFactoryManager()->add(new PreservedFactoryI, Preserved::ice_staticId()); // // Obtain a preserved object from the server where the most-derived diff --git a/cpp/test/Ice/stream/.depend.mak b/cpp/test/Ice/stream/.depend.mak deleted file mode 100755 index ea866bbbcec..00000000000 --- a/cpp/test/Ice/stream/.depend.mak +++ /dev/null @@ -1,220 +0,0 @@ - -Test.h: \ - Test.ice \ - "$(slicedir)/Ice/BuiltinSequences.ice" - -Test.obj: \ - Test.cpp \ - "Test.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\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\Ice\VirtualShared.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(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\DefaultValueFactory.h" \ - "$(includedir)\Ice\Outgoing.h" \ - "$(includedir)\Ice\OutgoingAsync.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\Ice\OutgoingAsyncF.h" \ - "$(includedir)\Ice\Stream.h" \ - -Client.obj: \ - Client.cpp \ - "$(includedir)\Ice\Ice.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\Ice\Config.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\Ice\Comparable.h" \ - "$(includedir)\Ice\Initialize.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\Ice\ProxyF.h" \ - "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\Ice\ValueF.h" \ - "$(includedir)\Ice\Exception.h" \ - "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ - "$(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)\IceUtil\Optional.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\Proxy.h" \ - "$(includedir)\Ice\ProxyFactoryF.h" \ - "$(includedir)\Ice\ConnectionIF.h" \ - "$(includedir)\Ice\RequestHandlerF.h" \ - "$(includedir)\Ice\EndpointF.h" \ - "$(includedir)\Ice\EndpointTypes.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\Ice\ReferenceF.h" \ - "$(includedir)\Ice\BatchRequestQueueF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\IceUtil\UniquePtr.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\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\Ice\VirtualShared.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\InstrumentationF.h" \ - "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\Plugin.h" \ - "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "$(includedir)\Ice\PropertiesAdmin.h" \ - "$(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\IncomingAsync.h" \ - "$(includedir)\Ice\FactoryTableInit.h" \ - "$(includedir)\Ice\DefaultValueFactory.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" \ - "$(includedir)\Ice\ImplicitContextF.h" \ - "$(includedir)\Ice\FacetMap.h" \ - "$(includedir)\Ice\CommunicatorAsync.h" \ - "$(includedir)\Ice\ObjectAdapter.h" \ - "$(includedir)\Ice\Endpoint.h" \ - "$(includedir)\Ice\ServantLocator.h" \ - "$(includedir)\Ice\SlicedData.h" \ - "$(includedir)\Ice\OutgoingAsync.h" \ - "$(includedir)\Ice\OutgoingAsyncF.h" \ - "$(includedir)\Ice\Process.h" \ - "$(includedir)\Ice\Application.h" \ - "$(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" \ - "$(includedir)\Ice\Router.h" \ - "$(includedir)\Ice\DispatchInterceptor.h" \ - "$(includedir)\Ice\NativePropertiesAdmin.h" \ - "$(includedir)\Ice\Metrics.h" \ - "$(includedir)\Ice\SliceChecksums.h" \ - "$(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" \ - "$(includedir)\IceUtil\RecMutex.h" \ - "$(includedir)\IceUtil\UUID.h" \ - "Test.h" \ diff --git a/cpp/test/Ice/stringConverter/.depend.mak b/cpp/test/Ice/stringConverter/.depend.mak index 33079aaa76b..7d3b652ede5 100755 --- a/cpp/test/Ice/stringConverter/.depend.mak +++ b/cpp/test/Ice/stringConverter/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(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" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(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" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ Server.obj: \ "$(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" \ @@ -276,12 +273,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/threadPoolPriority/.depend.mak b/cpp/test/Ice/threadPoolPriority/.depend.mak index e174637df40..c099dedd570 100755 --- a/cpp/test/Ice/threadPoolPriority/.depend.mak +++ b/cpp/test/Ice/threadPoolPriority/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(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" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(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" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ AllTests.obj: \ "$(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" \ @@ -276,12 +273,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -378,7 +374,6 @@ TestI.obj: \ "$(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" \ @@ -408,12 +403,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -422,7 +417,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -434,6 +428,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -462,7 +457,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -506,7 +500,6 @@ Server.obj: \ "$(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" \ @@ -536,12 +529,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -550,7 +543,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -562,6 +554,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -590,7 +583,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -639,7 +631,6 @@ ServerCustomThreadPool.obj: \ "$(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" \ @@ -669,12 +660,12 @@ ServerCustomThreadPool.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -683,7 +674,6 @@ ServerCustomThreadPool.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -695,6 +685,7 @@ ServerCustomThreadPool.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -723,7 +714,6 @@ ServerCustomThreadPool.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/timeout/.depend.mak b/cpp/test/Ice/timeout/.depend.mak index 4ae8969d23e..63f62dc0942 100755 --- a/cpp/test/Ice/timeout/.depend.mak +++ b/cpp/test/Ice/timeout/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(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" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -103,7 +103,6 @@ TestI.obj: \ "$(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" \ @@ -140,12 +139,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -160,6 +159,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -175,7 +175,6 @@ TestI.obj: \ "$(includedir)\Ice\Comparable.h" \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -205,7 +204,6 @@ TestI.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -247,7 +245,6 @@ Client.obj: \ "$(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" \ @@ -277,12 +274,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -291,7 +288,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -303,6 +299,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -331,7 +328,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -379,7 +375,6 @@ AllTests.obj: \ "$(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" \ @@ -409,12 +404,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -423,7 +418,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -435,6 +429,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -463,7 +458,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -512,7 +506,6 @@ Server.obj: \ "$(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" \ @@ -542,12 +535,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -556,7 +549,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -568,6 +560,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -596,7 +589,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Ice/udp/.depend.mak b/cpp/test/Ice/udp/.depend.mak index 52141f4e9f5..0358738b757 100755 --- a/cpp/test/Ice/udp/.depend.mak +++ b/cpp/test/Ice/udp/.depend.mak @@ -20,7 +20,6 @@ Test.obj: \ "$(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" \ @@ -57,12 +56,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -77,6 +76,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -115,7 +115,6 @@ Client.obj: \ "$(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" \ @@ -145,12 +144,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -159,7 +158,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -171,6 +169,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -199,7 +198,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -247,7 +245,6 @@ AllTests.obj: \ "$(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" \ @@ -277,12 +274,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -291,7 +288,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -303,6 +299,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -331,7 +328,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -389,7 +385,6 @@ TestI.obj: \ "$(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" \ @@ -416,11 +411,11 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -429,7 +424,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -440,6 +434,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -467,7 +462,6 @@ TestI.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -512,7 +506,6 @@ Server.obj: \ "$(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" \ @@ -542,12 +535,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -556,7 +549,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -568,6 +560,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -596,7 +589,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceBox/admin/.depend.mak b/cpp/test/IceBox/admin/.depend.mak index fd50df2176d..0a820b59a89 100755 --- a/cpp/test/IceBox/admin/.depend.mak +++ b/cpp/test/IceBox/admin/.depend.mak @@ -22,7 +22,6 @@ Test.obj: \ "$(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" \ @@ -59,12 +58,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -79,6 +78,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -120,7 +120,6 @@ Client.obj: \ "$(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" \ @@ -150,12 +149,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -164,7 +163,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -176,6 +174,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -204,7 +203,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -252,7 +250,6 @@ AllTests.obj: \ "$(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" \ @@ -282,12 +279,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -296,7 +293,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -308,6 +304,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -336,7 +333,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -384,7 +380,6 @@ TestI.obj: \ "$(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" \ @@ -414,12 +409,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -428,7 +423,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -440,6 +434,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -468,7 +463,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -512,7 +506,6 @@ Service.obj: \ "$(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" \ @@ -542,12 +535,12 @@ Service.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -556,7 +549,6 @@ Service.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -568,6 +560,7 @@ Service.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -596,7 +589,6 @@ Service.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceBox/configuration/.depend.mak b/cpp/test/IceBox/configuration/.depend.mak index 4c256383bcf..1e723fedaf3 100755 --- a/cpp/test/IceBox/configuration/.depend.mak +++ b/cpp/test/IceBox/configuration/.depend.mak @@ -20,7 +20,6 @@ Test.obj: \ "$(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" \ @@ -57,12 +56,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -77,6 +76,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -115,7 +115,6 @@ Client.obj: \ "$(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" \ @@ -145,12 +144,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -159,7 +158,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -171,6 +169,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -199,7 +198,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -247,7 +245,6 @@ AllTests.obj: \ "$(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" \ @@ -277,12 +274,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -291,7 +288,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -303,6 +299,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -331,7 +328,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -379,7 +375,6 @@ TestI.obj: \ "$(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" \ @@ -409,12 +404,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -423,7 +418,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -435,6 +429,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -463,7 +458,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -507,7 +501,6 @@ Service.obj: \ "$(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" \ @@ -537,12 +530,12 @@ Service.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -551,7 +544,6 @@ Service.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -563,6 +555,7 @@ Service.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -591,7 +584,6 @@ Service.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceDiscovery/simple/.depend.mak b/cpp/test/IceDiscovery/simple/.depend.mak index 50715132703..d20f3f25a78 100755 --- a/cpp/test/IceDiscovery/simple/.depend.mak +++ b/cpp/test/IceDiscovery/simple/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(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" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(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" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ AllTests.obj: \ "$(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" \ @@ -276,12 +273,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -388,7 +384,6 @@ TestI.obj: \ "$(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" \ @@ -415,11 +410,11 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -428,7 +423,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -439,6 +433,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -466,7 +461,6 @@ TestI.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -511,7 +505,6 @@ Server.obj: \ "$(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" \ @@ -541,12 +534,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -555,7 +548,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -567,6 +559,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -595,7 +588,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceGrid/activation/.depend.mak b/cpp/test/IceGrid/activation/.depend.mak index f38a88f3577..5f321905ed6 100755 --- a/cpp/test/IceGrid/activation/.depend.mak +++ b/cpp/test/IceGrid/activation/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(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" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(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" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ AllTests.obj: \ "$(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" \ @@ -276,12 +273,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -391,7 +387,6 @@ TestI.obj: \ "$(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" \ @@ -421,12 +416,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -435,7 +430,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -447,6 +441,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -475,7 +470,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -519,7 +513,6 @@ Server.obj: \ "$(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" \ @@ -549,12 +542,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -563,7 +556,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -575,6 +567,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -603,7 +596,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceGrid/admin/.depend.mak b/cpp/test/IceGrid/admin/.depend.mak index 7ae7d93a717..82d0ceac80e 100755 --- a/cpp/test/IceGrid/admin/.depend.mak +++ b/cpp/test/IceGrid/admin/.depend.mak @@ -28,7 +28,6 @@ Server.obj: \ "$(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" \ @@ -58,12 +57,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -72,7 +71,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -84,6 +82,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -112,7 +111,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceGrid/allocation/.depend.mak b/cpp/test/IceGrid/allocation/.depend.mak index 752104f8bdb..35fff18b199 100755 --- a/cpp/test/IceGrid/allocation/.depend.mak +++ b/cpp/test/IceGrid/allocation/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(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" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(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" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -247,7 +245,6 @@ AllTests.obj: \ "$(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" \ @@ -277,12 +274,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -291,7 +288,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -303,6 +299,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -331,7 +328,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -394,7 +390,6 @@ TestI.obj: \ "$(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" \ @@ -424,12 +419,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -438,7 +433,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -450,6 +444,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -478,7 +473,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -522,7 +516,6 @@ Server.obj: \ "$(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" \ @@ -552,12 +545,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -566,7 +559,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -578,6 +570,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -606,7 +599,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -655,7 +647,6 @@ PermissionsVerifier.obj: \ "$(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" \ @@ -685,12 +676,12 @@ PermissionsVerifier.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -699,7 +690,6 @@ PermissionsVerifier.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -711,6 +701,7 @@ PermissionsVerifier.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -739,7 +730,6 @@ PermissionsVerifier.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceGrid/deployer/.depend.mak b/cpp/test/IceGrid/deployer/.depend.mak index 3e7dd80159d..51b1d4dc78d 100755 --- a/cpp/test/IceGrid/deployer/.depend.mak +++ b/cpp/test/IceGrid/deployer/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(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" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(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" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ AllTests.obj: \ "$(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" \ @@ -276,12 +273,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -391,7 +387,6 @@ TestI.obj: \ "$(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" \ @@ -421,12 +416,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -435,7 +430,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -447,6 +441,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -475,7 +470,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -520,7 +514,6 @@ Server.obj: \ "$(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" \ @@ -550,12 +543,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -564,7 +557,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -576,6 +568,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -604,7 +597,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -653,7 +645,6 @@ Service.obj: \ "$(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" \ @@ -683,12 +674,12 @@ Service.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -697,7 +688,6 @@ Service.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -709,6 +699,7 @@ Service.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -737,7 +728,6 @@ Service.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceGrid/distribution/.depend.mak b/cpp/test/IceGrid/distribution/.depend.mak index f08d222094f..f0803234073 100755 --- a/cpp/test/IceGrid/distribution/.depend.mak +++ b/cpp/test/IceGrid/distribution/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(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" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(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" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ AllTests.obj: \ "$(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" \ @@ -276,12 +273,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -391,7 +387,6 @@ TestI.obj: \ "$(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" \ @@ -421,12 +416,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -435,7 +430,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -447,6 +441,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -475,7 +470,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -519,7 +513,6 @@ Server.obj: \ "$(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" \ @@ -549,12 +542,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -563,7 +556,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -575,6 +567,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -603,7 +596,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceGrid/noRestartUpdate/.depend.mak b/cpp/test/IceGrid/noRestartUpdate/.depend.mak index 4866485c930..91b768f1813 100755 --- a/cpp/test/IceGrid/noRestartUpdate/.depend.mak +++ b/cpp/test/IceGrid/noRestartUpdate/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(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" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(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" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ AllTests.obj: \ "$(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" \ @@ -276,12 +273,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -391,7 +387,6 @@ TestI.obj: \ "$(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" \ @@ -421,12 +416,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -435,7 +430,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -447,6 +441,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -475,7 +470,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -519,7 +513,6 @@ Server.obj: \ "$(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" \ @@ -549,12 +542,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -563,7 +556,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -575,6 +567,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -603,7 +596,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -652,7 +644,6 @@ Service.obj: \ "$(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" \ @@ -682,12 +673,12 @@ Service.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -696,7 +687,6 @@ Service.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -708,6 +698,7 @@ Service.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -736,7 +727,6 @@ Service.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceGrid/replicaGroup/.depend.mak b/cpp/test/IceGrid/replicaGroup/.depend.mak index c6ad6879b68..6ba0e7bb953 100755 --- a/cpp/test/IceGrid/replicaGroup/.depend.mak +++ b/cpp/test/IceGrid/replicaGroup/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(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" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(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" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ AllTests.obj: \ "$(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" \ @@ -276,12 +273,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -391,7 +387,6 @@ TestI.obj: \ "$(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" \ @@ -421,12 +416,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -435,7 +430,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -447,6 +441,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -475,7 +470,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -519,7 +513,6 @@ Server.obj: \ "$(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" \ @@ -549,12 +542,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -563,7 +556,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -575,6 +567,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -603,7 +596,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -652,7 +644,6 @@ Service.obj: \ "$(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" \ @@ -682,12 +673,12 @@ Service.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -696,7 +687,6 @@ Service.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -708,6 +698,7 @@ Service.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -736,7 +727,6 @@ Service.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceGrid/replication/.depend.mak b/cpp/test/IceGrid/replication/.depend.mak index ce9e93de399..a2706ee8274 100755 --- a/cpp/test/IceGrid/replication/.depend.mak +++ b/cpp/test/IceGrid/replication/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(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" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(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" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ AllTests.obj: \ "$(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" \ @@ -276,12 +273,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -391,7 +387,6 @@ TestI.obj: \ "$(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" \ @@ -421,12 +416,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -435,7 +430,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -447,6 +441,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -475,7 +470,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -519,7 +513,6 @@ Server.obj: \ "$(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" \ @@ -549,12 +542,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -563,7 +556,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -575,6 +567,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -603,7 +596,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceGrid/session/.depend.mak b/cpp/test/IceGrid/session/.depend.mak index fe9aefc6426..9f79f8a7efc 100755 --- a/cpp/test/IceGrid/session/.depend.mak +++ b/cpp/test/IceGrid/session/.depend.mak @@ -22,7 +22,6 @@ Test.obj: \ "$(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" \ @@ -59,12 +58,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -79,6 +78,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -121,7 +121,6 @@ Client.obj: \ "$(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" \ @@ -151,12 +150,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -165,7 +164,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -177,6 +175,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -205,7 +204,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -252,7 +250,6 @@ AllTests.obj: \ "$(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" \ @@ -282,12 +279,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -296,7 +293,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -308,6 +304,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -336,7 +333,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -399,7 +395,6 @@ Server.obj: \ "$(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" \ @@ -429,12 +424,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -443,7 +438,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -455,6 +449,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -483,7 +478,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -537,7 +531,6 @@ PermissionsVerifier.obj: \ "$(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" \ @@ -567,12 +560,12 @@ PermissionsVerifier.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -581,7 +574,6 @@ PermissionsVerifier.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -593,6 +585,7 @@ PermissionsVerifier.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -621,7 +614,6 @@ PermissionsVerifier.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceGrid/simple/.depend.mak b/cpp/test/IceGrid/simple/.depend.mak index dc5074b13b1..330ed2ecdb5 100755 --- a/cpp/test/IceGrid/simple/.depend.mak +++ b/cpp/test/IceGrid/simple/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(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" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(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" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -256,7 +254,6 @@ AllTests.obj: \ "$(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" \ @@ -283,11 +280,11 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -296,7 +293,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -307,6 +303,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -334,7 +331,6 @@ AllTests.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -391,7 +387,6 @@ TestI.obj: \ "$(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" \ @@ -421,12 +416,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -435,7 +430,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -447,6 +441,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -475,7 +470,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -519,7 +513,6 @@ Server.obj: \ "$(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" \ @@ -549,12 +542,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -563,7 +556,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -575,6 +567,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -603,7 +596,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceGrid/update/.depend.mak b/cpp/test/IceGrid/update/.depend.mak index f08d222094f..f0803234073 100755 --- a/cpp/test/IceGrid/update/.depend.mak +++ b/cpp/test/IceGrid/update/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(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" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(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" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ AllTests.obj: \ "$(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" \ @@ -276,12 +273,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -391,7 +387,6 @@ TestI.obj: \ "$(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" \ @@ -421,12 +416,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -435,7 +430,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -447,6 +441,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -475,7 +470,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -519,7 +513,6 @@ Server.obj: \ "$(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" \ @@ -549,12 +542,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -563,7 +556,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -575,6 +567,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -603,7 +596,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceSSL/configuration/.depend.mak b/cpp/test/IceSSL/configuration/.depend.mak index aabcb9e1181..0a0c7ce7164 100755 --- a/cpp/test/IceSSL/configuration/.depend.mak +++ b/cpp/test/IceSSL/configuration/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(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" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(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" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -245,7 +243,6 @@ AllTests.obj: \ "$(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" \ @@ -275,12 +272,12 @@ AllTests.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -289,7 +286,6 @@ AllTests.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -301,6 +297,7 @@ AllTests.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -329,7 +326,6 @@ AllTests.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -380,7 +376,6 @@ TestI.obj: \ "$(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" \ @@ -410,12 +405,12 @@ TestI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -424,7 +419,6 @@ TestI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -436,6 +430,7 @@ TestI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -464,7 +459,6 @@ TestI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -516,7 +510,6 @@ Server.obj: \ "$(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" \ @@ -546,12 +539,12 @@ Server.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -560,7 +553,6 @@ Server.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -572,6 +564,7 @@ Server.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -600,7 +593,6 @@ Server.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceStorm/federation/.depend.mak b/cpp/test/IceStorm/federation/.depend.mak index 3b2a6943c61..debbe8fc693 100755 --- a/cpp/test/IceStorm/federation/.depend.mak +++ b/cpp/test/IceStorm/federation/.depend.mak @@ -19,7 +19,6 @@ Event.obj: \ "$(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" \ @@ -56,12 +55,12 @@ Event.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Event.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Publisher.obj: \ "$(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" \ @@ -144,12 +143,12 @@ Publisher.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Publisher.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Publisher.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Publisher.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -244,7 +242,6 @@ Subscriber.obj: \ "$(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" \ @@ -274,12 +271,12 @@ Subscriber.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -288,7 +285,6 @@ Subscriber.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -300,6 +296,7 @@ Subscriber.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -328,7 +325,6 @@ Subscriber.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceStorm/federation2/.depend.mak b/cpp/test/IceStorm/federation2/.depend.mak index 0451f8f7a7e..02a04fbc4a9 100755 --- a/cpp/test/IceStorm/federation2/.depend.mak +++ b/cpp/test/IceStorm/federation2/.depend.mak @@ -19,7 +19,6 @@ Event.obj: \ "$(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" \ @@ -56,12 +55,12 @@ Event.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Event.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -125,7 +125,6 @@ Publisher.obj: \ "$(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" \ @@ -152,11 +151,11 @@ Publisher.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -165,7 +164,6 @@ Publisher.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -176,6 +174,7 @@ Publisher.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -203,7 +202,6 @@ Publisher.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -249,7 +247,6 @@ Subscriber.obj: \ "$(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" \ @@ -279,12 +276,12 @@ Subscriber.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -293,7 +290,6 @@ Subscriber.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -305,6 +301,7 @@ Subscriber.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -333,7 +330,6 @@ Subscriber.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceStorm/rep1/.depend.mak b/cpp/test/IceStorm/rep1/.depend.mak index 5070e8957be..255665cb3a3 100755 --- a/cpp/test/IceStorm/rep1/.depend.mak +++ b/cpp/test/IceStorm/rep1/.depend.mak @@ -19,7 +19,6 @@ Single.obj: \ "$(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" \ @@ -56,12 +55,12 @@ Single.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Single.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Publisher.obj: \ "$(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" \ @@ -144,12 +143,12 @@ Publisher.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Publisher.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Publisher.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Publisher.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -260,7 +258,6 @@ Subscriber.obj: \ "$(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" \ @@ -287,11 +284,11 @@ Subscriber.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -300,7 +297,6 @@ Subscriber.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -311,6 +307,7 @@ Subscriber.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -338,7 +335,6 @@ Subscriber.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -396,7 +392,6 @@ Sub.obj: \ "$(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" \ @@ -423,11 +418,11 @@ Sub.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -436,7 +431,6 @@ Sub.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -447,6 +441,7 @@ Sub.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -474,7 +469,6 @@ Sub.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceStorm/repgrid/.depend.mak b/cpp/test/IceStorm/repgrid/.depend.mak index 124fbdbe5d0..2ca04ea26a9 100755 --- a/cpp/test/IceStorm/repgrid/.depend.mak +++ b/cpp/test/IceStorm/repgrid/.depend.mak @@ -19,7 +19,6 @@ Single.obj: \ "$(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" \ @@ -56,12 +55,12 @@ Single.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Single.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(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" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceStorm/repstress/.depend.mak b/cpp/test/IceStorm/repstress/.depend.mak index 557ae26619e..e2c1c0b9287 100755 --- a/cpp/test/IceStorm/repstress/.depend.mak +++ b/cpp/test/IceStorm/repstress/.depend.mak @@ -22,7 +22,6 @@ Single.obj: \ "$(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" \ @@ -59,12 +58,12 @@ Single.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -79,6 +78,7 @@ Single.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -105,7 +105,6 @@ Controller.obj: \ "$(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" \ @@ -142,12 +141,12 @@ Controller.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -162,6 +161,7 @@ Controller.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -200,7 +200,6 @@ Publisher.obj: \ "$(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" \ @@ -230,12 +229,12 @@ Publisher.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -244,7 +243,6 @@ Publisher.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -256,6 +254,7 @@ Publisher.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -284,7 +283,6 @@ Publisher.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -345,7 +343,6 @@ Subscriber.obj: \ "$(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" \ @@ -372,11 +369,11 @@ Subscriber.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -385,7 +382,6 @@ Subscriber.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -396,6 +392,7 @@ Subscriber.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -423,7 +420,6 @@ Subscriber.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -471,7 +467,6 @@ Control.obj: \ "$(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" \ @@ -501,12 +496,12 @@ Control.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -515,7 +510,6 @@ Control.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -527,6 +521,7 @@ Control.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -555,7 +550,6 @@ Control.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceStorm/single/.depend.mak b/cpp/test/IceStorm/single/.depend.mak index e77a0e672d3..37154370675 100755 --- a/cpp/test/IceStorm/single/.depend.mak +++ b/cpp/test/IceStorm/single/.depend.mak @@ -19,7 +19,6 @@ Single.obj: \ "$(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" \ @@ -56,12 +55,12 @@ Single.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Single.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Publisher.obj: \ "$(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" \ @@ -144,12 +143,12 @@ Publisher.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Publisher.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Publisher.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Publisher.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -244,7 +242,6 @@ Subscriber.obj: \ "$(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" \ @@ -274,12 +271,12 @@ Subscriber.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -288,7 +285,6 @@ Subscriber.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -300,6 +296,7 @@ Subscriber.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -328,7 +325,6 @@ Subscriber.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceStorm/stress/.depend.mak b/cpp/test/IceStorm/stress/.depend.mak index 462f2c1348d..9a14d7c48c9 100755 --- a/cpp/test/IceStorm/stress/.depend.mak +++ b/cpp/test/IceStorm/stress/.depend.mak @@ -19,7 +19,6 @@ Event.obj: \ "$(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" \ @@ -56,12 +55,12 @@ Event.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Event.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Publisher.obj: \ "$(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" \ @@ -144,12 +143,12 @@ Publisher.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Publisher.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Publisher.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Publisher.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -246,7 +244,6 @@ Subscriber.obj: \ "$(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" \ @@ -276,12 +273,12 @@ Subscriber.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -290,7 +287,6 @@ Subscriber.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -302,6 +298,7 @@ Subscriber.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -330,7 +327,6 @@ Subscriber.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/IceUtil/ctrlCHandler/.depend.mak b/cpp/test/IceUtil/ctrlCHandler/.depend.mak index d256efae885..91a2b29b011 100755 --- a/cpp/test/IceUtil/ctrlCHandler/.depend.mak +++ b/cpp/test/IceUtil/ctrlCHandler/.depend.mak @@ -17,7 +17,6 @@ Client.obj: \ "$(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" \ diff --git a/cpp/test/IceUtil/inputUtil/.depend.mak b/cpp/test/IceUtil/inputUtil/.depend.mak index d33d4ecc0c2..3bc42fb1eeb 100755 --- a/cpp/test/IceUtil/inputUtil/.depend.mak +++ b/cpp/test/IceUtil/inputUtil/.depend.mak @@ -25,7 +25,6 @@ Client.obj: \ "$(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" \ diff --git a/cpp/test/IceUtil/priority/.depend.mak b/cpp/test/IceUtil/priority/.depend.mak index ffe99521e63..9a375649658 100755 --- a/cpp/test/IceUtil/priority/.depend.mak +++ b/cpp/test/IceUtil/priority/.depend.mak @@ -67,7 +67,6 @@ ThreadPriority.obj: \ "$(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" \ @@ -115,7 +114,6 @@ TimerPriority.obj: \ "$(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" \ @@ -153,7 +151,6 @@ PriorityInversion.obj: \ "$(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" \ @@ -223,7 +220,6 @@ Client.obj: \ "$(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" \ diff --git a/cpp/test/IceUtil/sha1/.depend.mak b/cpp/test/IceUtil/sha1/.depend.mak index 1112eadfac8..f5bd12d4ac5 100755 --- a/cpp/test/IceUtil/sha1/.depend.mak +++ b/cpp/test/IceUtil/sha1/.depend.mak @@ -19,7 +19,6 @@ Client.obj: \ "$(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" \ diff --git a/cpp/test/IceUtil/stacktrace/.depend.mak b/cpp/test/IceUtil/stacktrace/.depend.mak index ee1be2c67fc..5f569106b50 100755 --- a/cpp/test/IceUtil/stacktrace/.depend.mak +++ b/cpp/test/IceUtil/stacktrace/.depend.mak @@ -18,7 +18,6 @@ Client.obj: \ "$(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" \ diff --git a/cpp/test/IceUtil/thread/.depend.mak b/cpp/test/IceUtil/thread/.depend.mak index f81b387e0de..2f0c09714af 100755 --- a/cpp/test/IceUtil/thread/.depend.mak +++ b/cpp/test/IceUtil/thread/.depend.mak @@ -67,7 +67,6 @@ CreateTest.obj: \ "$(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" \ @@ -115,7 +114,6 @@ AliveTest.obj: \ "$(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" \ @@ -163,7 +161,6 @@ StartTest.obj: \ "$(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" \ @@ -211,7 +208,6 @@ SleepTest.obj: \ "$(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" \ @@ -259,7 +255,6 @@ RecMutexTest.obj: \ "$(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" \ @@ -307,7 +302,6 @@ MutexTest.obj: \ "$(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" \ @@ -355,7 +349,6 @@ MonitorMutexTest.obj: \ "$(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" \ @@ -403,7 +396,6 @@ MonitorRecMutexTest.obj: \ "$(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" \ @@ -452,7 +444,6 @@ CountDownLatchTest.obj: \ "$(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" \ @@ -517,7 +508,6 @@ Client.obj: \ "$(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" \ diff --git a/cpp/test/IceUtil/timer/.depend.mak b/cpp/test/IceUtil/timer/.depend.mak index 487dfe09bee..4250de0cf5e 100755 --- a/cpp/test/IceUtil/timer/.depend.mak +++ b/cpp/test/IceUtil/timer/.depend.mak @@ -26,7 +26,6 @@ Client.obj: \ "$(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" \ diff --git a/cpp/test/IceUtil/unicode/.depend.mak b/cpp/test/IceUtil/unicode/.depend.mak index a770708e39d..de10ef68b48 100755 --- a/cpp/test/IceUtil/unicode/.depend.mak +++ b/cpp/test/IceUtil/unicode/.depend.mak @@ -36,7 +36,6 @@ Client.obj: \ "$(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" \ diff --git a/cpp/test/IceUtil/uuid/.depend.mak b/cpp/test/IceUtil/uuid/.depend.mak index 3957bbbd21e..3eec41d3326 100755 --- a/cpp/test/IceUtil/uuid/.depend.mak +++ b/cpp/test/IceUtil/uuid/.depend.mak @@ -26,7 +26,6 @@ Client.obj: \ "$(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" \ diff --git a/cpp/test/Slice/keyword/.depend.mak b/cpp/test/Slice/keyword/.depend.mak index 83efe265d67..13e51f4d91a 100755 --- a/cpp/test/Slice/keyword/.depend.mak +++ b/cpp/test/Slice/keyword/.depend.mak @@ -19,7 +19,6 @@ Key.obj: \ "$(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" \ @@ -56,12 +55,12 @@ Key.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Key.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -85,7 +85,6 @@ Key.obj: \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\Ice\OutgoingAsyncF.h" \ - "$(includedir)\Ice\Stream.h" \ Client.obj: \ Client.cpp \ @@ -116,7 +115,6 @@ Client.obj: \ "$(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" \ @@ -146,12 +144,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -160,7 +158,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -172,6 +169,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -200,7 +198,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Slice/keyword/Makefile b/cpp/test/Slice/keyword/Makefile index 01ab8640da0..d984d0ecf01 100644 --- a/cpp/test/Slice/keyword/Makefile +++ b/cpp/test/Slice/keyword/Makefile @@ -21,7 +21,7 @@ OBJS = $(SLICE_OBJS) \ include $(top_srcdir)/config/Make.rules CPPFLAGS := -I. -I../../include $(CPPFLAGS) -SLICE2CPPFLAGS := --underscore --stream $(SLICE2CPPFLAGS) +SLICE2CPPFLAGS := --underscore $(SLICE2CPPFLAGS) $(CLIENT): $(OBJS) rm -f $@ diff --git a/cpp/test/Slice/keyword/Makefile.mak b/cpp/test/Slice/keyword/Makefile.mak index ee1a5929809..2b0fb384027 100644 --- a/cpp/test/Slice/keyword/Makefile.mak +++ b/cpp/test/Slice/keyword/Makefile.mak @@ -21,7 +21,7 @@ OBJS = $(SLICE_OBJS) \ !include $(top_srcdir)/config/Make.rules.mak CPPFLAGS = -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -SLICE2CPPFLAGS = --underscore --stream $(SLICE2CPPFLAGS) +SLICE2CPPFLAGS = --underscore $(SLICE2CPPFLAGS) !if "$(GENERATE_PDB)" == "yes" CPDBFLAGS = /pdb:$(CLIENT:.exe=.pdb) diff --git a/cpp/test/Slice/macros/.depend.mak b/cpp/test/Slice/macros/.depend.mak index 8b814e7072e..a34d81deb58 100755 --- a/cpp/test/Slice/macros/.depend.mak +++ b/cpp/test/Slice/macros/.depend.mak @@ -19,7 +19,6 @@ Test.obj: \ "$(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" \ @@ -56,12 +55,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -76,6 +75,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -114,7 +114,6 @@ Client.obj: \ "$(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" \ @@ -144,12 +143,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -158,7 +157,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -170,6 +168,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -198,7 +197,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ diff --git a/cpp/test/Slice/parser/.depend.mak b/cpp/test/Slice/parser/.depend.mak index e4555b7a7bd..d35f67a191f 100755 --- a/cpp/test/Slice/parser/.depend.mak +++ b/cpp/test/Slice/parser/.depend.mak @@ -24,7 +24,6 @@ CircularA.obj: \ "$(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" \ @@ -61,12 +60,12 @@ CircularA.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -81,6 +80,7 @@ CircularA.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -108,7 +108,6 @@ CircularB.obj: \ "$(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" \ @@ -145,12 +144,12 @@ CircularB.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -165,6 +164,7 @@ CircularB.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ diff --git a/cpp/test/Slice/structure/.depend.mak b/cpp/test/Slice/structure/.depend.mak index 17b798ab2e7..a5c7d3445c8 100755 --- a/cpp/test/Slice/structure/.depend.mak +++ b/cpp/test/Slice/structure/.depend.mak @@ -22,7 +22,6 @@ Test.obj: \ "$(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" \ @@ -59,12 +58,12 @@ Test.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -79,6 +78,7 @@ Test.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -105,7 +105,6 @@ Forward.obj: \ "$(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" \ @@ -142,12 +141,12 @@ Forward.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -156,6 +155,7 @@ Forward.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\OutputStream.h" \ Client.obj: \ Client.cpp \ @@ -186,7 +186,6 @@ Client.obj: \ "$(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" \ @@ -216,12 +215,12 @@ Client.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -230,7 +229,6 @@ Client.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -242,6 +240,7 @@ Client.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -270,7 +269,6 @@ Client.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ |