diff options
| author | Mark Spruiell <mes@zeroc.com> | 2016-01-19 16:46:11 -0800 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2016-01-19 16:46:11 -0800 |
| commit | d5dd7c866e9e1dc59dc7e127eb39f641530bf823 (patch) | |
| tree | 61771e4f322a7138b643d5325a6d10acea30fb84 /cpp/src/Ice | |
| parent | Deprecate ice_name and add ice_id (diff) | |
| download | ice-d5dd7c866e9e1dc59dc7e127eb39f641530bf823.tar.bz2 ice-d5dd7c866e9e1dc59dc7e127eb39f641530bf823.tar.xz ice-d5dd7c866e9e1dc59dc7e127eb39f641530bf823.zip | |
ICE-6861 - removing public stream API
Diffstat (limited to 'cpp/src/Ice')
66 files changed, 3160 insertions, 4119 deletions
diff --git a/cpp/src/Ice/.depend.mak b/cpp/src/Ice/.depend.mak index a556d26d1df..8283090951b 100755 --- a/cpp/src/Ice/.depend.mak +++ b/cpp/src/Ice/.depend.mak @@ -210,7 +210,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" \ @@ -247,12 +246,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" \ @@ -261,7 +260,6 @@ Acceptor.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "ProtocolInstanceF.h" \ ACM.obj: \ @@ -292,7 +290,6 @@ ACM.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -322,12 +319,12 @@ ACM.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(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 +335,6 @@ ACM.obj: \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Endpoint.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "ConnectionI.h" \ "..\..\src\IceUtil\StopWatch.h" \ "$(includedir)\Ice\ConnectionFactoryF.h" \ @@ -360,6 +356,7 @@ ACM.obj: \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -380,6 +377,7 @@ ACM.obj: \ "RouterInfoF.h" \ "LocatorInfoF.h" \ "ReferenceFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -423,7 +421,6 @@ Application.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -453,12 +450,12 @@ Application.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -467,7 +464,6 @@ Application.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -479,6 +475,7 @@ Application.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -506,7 +503,6 @@ Application.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\ImplicitContext.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ @@ -552,7 +548,6 @@ AsyncResult.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ @@ -571,12 +566,12 @@ AsyncResult.obj: \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -587,7 +582,6 @@ AsyncResult.obj: \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\ThreadPoolF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\PropertiesF.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\Ice\ProxyFactoryF.h" \ @@ -619,6 +613,7 @@ AsyncResult.obj: \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Endpoint.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -638,6 +633,7 @@ AsyncResult.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" \ @@ -656,133 +652,6 @@ Base64.obj: \ "$(includedir)\Ice\Config.h" \ "$(includedir)\IceUtil\Config.h" \ -BasicStream.obj: \ - BasicStream.cpp \ - "$(includedir)\IceUtil\DisableWarnings.h" \ - "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\Ice\Config.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\ProxyF.h" \ - "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.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)\Ice\ObjectAdapterF.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - "DefaultsAndOverrides.h" \ - "DefaultsAndOverridesF.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\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\AsyncResultF.h" \ - "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\VirtualShared.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\Endpoint.h" \ - "Network.h" \ - "NetworkF.h" \ - "NetworkProxyF.h" \ - "$(includedir)\Ice\LoggerF.h" \ - "ProtocolInstanceF.h" \ - "Instance.h" \ - "$(includedir)\IceUtil\RecMutex.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\Ice\InstrumentationF.h" \ - "TraceLevelsF.h" \ - "RouterInfoF.h" \ - "LocatorInfoF.h" \ - "ReferenceFactoryF.h" \ - "$(includedir)\Ice\ThreadPoolF.h" \ - "$(includedir)\Ice\ConnectionFactoryF.h" \ - "ACM.h" \ - "$(includedir)\Ice\ACMF.h" \ - "$(includedir)\Ice\Connection.h" \ - "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ - "EndpointFactoryManagerF.h" \ - "IPEndpointIF.h" \ - "RetryQueueF.h" \ - "$(includedir)\Ice\DynamicLibraryF.h" \ - "$(includedir)\Ice\PluginF.h" \ - "$(includedir)\Ice\Initialize.h" \ - "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\Plugin.h" \ - "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "ImplicitContextI.h" \ - "$(includedir)\Ice\ImplicitContext.h" \ - "$(includedir)\Ice\FacetMap.h" \ - "$(includedir)\Ice\Process.h" \ - "$(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" \ - "ProxyFactory.h" \ - "$(includedir)\Ice\OutgoingAsyncF.h" \ - "$(includedir)\Ice\Properties.h" \ - "$(includedir)\Ice\IncomingAsync.h" \ - "$(includedir)\Ice\PropertiesAdmin.h" \ - "ValueFactoryManager.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "TraceUtil.h" \ - "TraceLevels.h" \ - "$(includedir)\Ice\LoggerUtil.h" \ - "$(includedir)\Ice\Logger.h" \ - "$(includedir)\Ice\SlicedData.h" \ - BatchRequestQueue.obj: \ BatchRequestQueue.cpp \ "BatchRequestQueue.h" \ @@ -807,17 +676,14 @@ BatchRequestQueue.obj: \ "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\Handle.h" \ "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\Current.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ + "$(includedir)\Ice\ObjectF.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" \ @@ -825,24 +691,22 @@ BatchRequestQueue.obj: \ "$(includedir)\IceUtil\Iterator.h" \ "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ + "$(includedir)\Ice\Object.h" \ + "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\Current.h" \ + "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ "Instance.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "TraceLevelsF.h" \ "DefaultsAndOverridesF.h" \ @@ -865,11 +729,16 @@ BatchRequestQueue.obj: \ "$(includedir)\Ice\AsyncResultF.h" \ "$(includedir)\Ice\ObserverHelper.h" \ "$(includedir)\Ice\Instrumentation.h" \ + "$(includedir)\Ice\InputStream.h" \ + "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\UserExceptionFactory.h" \ + "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Endpoint.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -916,7 +785,6 @@ Buffer.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -965,7 +833,6 @@ CollocatedRequestHandler.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ @@ -978,21 +845,18 @@ CollocatedRequestHandler.obj: \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\VirtualShared.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\LoggerF.h" \ "TraceLevelsF.h" \ "ObjectAdapterI.h" \ @@ -1004,10 +868,13 @@ CollocatedRequestHandler.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\AsyncResultF.h" \ "$(includedir)\Ice\ObserverHelper.h" \ "$(includedir)\Ice\Instrumentation.h" \ + "$(includedir)\Ice\InputStream.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\UserExceptionFactory.h" \ + "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\FacetMap.h" \ @@ -1053,6 +920,7 @@ CollocatedRequestHandler.obj: \ "Instance.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "DefaultsAndOverridesF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ "RetryQueueF.h" \ @@ -1099,7 +967,6 @@ CommunicatorI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1129,12 +996,12 @@ CommunicatorI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1143,7 +1010,6 @@ CommunicatorI.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -1155,6 +1021,7 @@ CommunicatorI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1211,7 +1078,6 @@ CommunicatorI.obj: \ "BatchRequestQueue.h" \ "SharedContext.h" \ "ProxyFactory.h" \ - "ValueFactoryManager.h" \ "ObjectAdapterFactory.h" \ "ObjectAdapterI.h" \ "$(includedir)\Ice\ObjectAdapter.h" \ @@ -1248,7 +1114,6 @@ ConnectionFactory.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1283,12 +1148,12 @@ ConnectionFactory.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1302,7 +1167,6 @@ ConnectionFactory.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "EndpointIF.h" \ "ConnectorF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "TraceLevelsF.h" \ "$(includedir)\Ice\OutgoingAsyncF.h" \ "EventHandler.h" \ @@ -1320,6 +1184,7 @@ ConnectionFactory.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "ACM.h" \ "$(includedir)\Ice\ACMF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "AcceptorF.h" \ "RouterInfoF.h" \ "EndpointI.h" \ @@ -1330,6 +1195,7 @@ ConnectionFactory.obj: \ "DefaultsAndOverridesF.h" \ "LocatorInfoF.h" \ "ReferenceFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -1407,7 +1273,6 @@ ConnectionI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1436,12 +1301,12 @@ ConnectionI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1456,7 +1321,6 @@ ConnectionI.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "EndpointIF.h" \ "ConnectorF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "TraceLevelsF.h" \ "$(includedir)\Ice\OutgoingAsyncF.h" \ "EventHandler.h" \ @@ -1474,6 +1338,7 @@ ConnectionI.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "ACM.h" \ "$(includedir)\Ice\ACMF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "Instance.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\Ice\InstrumentationF.h" \ @@ -1481,6 +1346,7 @@ ConnectionI.obj: \ "RouterInfoF.h" \ "LocatorInfoF.h" \ "ReferenceFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -1561,7 +1427,6 @@ ConnectionRequestHandler.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ @@ -1584,12 +1449,12 @@ ConnectionRequestHandler.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1606,6 +1471,7 @@ ConnectionRequestHandler.obj: \ "LocatorInfoF.h" \ "BatchRequestQueue.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ + "$(includedir)\Ice\OutputStream.h" \ "SharedContext.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1628,7 +1494,6 @@ ConnectionRequestHandler.obj: \ "$(includedir)\Ice\ConnectionFactoryF.h" \ "TransceiverF.h" \ "ConnectorF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "TraceLevelsF.h" \ "EventHandler.h" \ "EventHandlerF.h" \ @@ -1700,7 +1565,6 @@ ConnectRequestHandler.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ @@ -1723,12 +1587,12 @@ ConnectRequestHandler.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1742,6 +1606,7 @@ ConnectRequestHandler.obj: \ "LocatorInfoF.h" \ "BatchRequestQueue.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ + "$(includedir)\Ice\OutputStream.h" \ "SharedContext.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1774,7 +1639,7 @@ ConnectRequestHandler.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Endpoint.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -1825,7 +1690,6 @@ DefaultsAndOverrides.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1862,12 +1726,12 @@ DefaultsAndOverrides.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -1880,7 +1744,6 @@ DefaultsAndOverrides.obj: \ "Network.h" \ "NetworkF.h" \ "NetworkProxyF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "ProtocolInstanceF.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -1889,6 +1752,7 @@ DefaultsAndOverrides.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -1923,7 +1787,6 @@ DispatchInterceptor.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -1943,13 +1806,15 @@ DispatchInterceptor.obj: \ "$(includedir)\Ice\ConnectionIF.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ + "$(includedir)\Ice\InputStream.h" \ + "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\ObserverHelper.h" \ @@ -1994,7 +1859,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" \ @@ -2049,11 +1913,10 @@ EndpointFactory.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\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -2063,6 +1926,7 @@ EndpointFactory.obj: \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\Endpoint.h" \ "$(includedir)\Ice\PropertiesF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -2084,6 +1948,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" \ @@ -2116,7 +1981,6 @@ EndpointFactoryManager.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -2141,7 +2005,7 @@ EndpointFactoryManager.obj: \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\Plugin.h" \ "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ @@ -2149,11 +2013,11 @@ EndpointFactoryManager.obj: \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ + "$(includedir)\Ice\InputStream.h" \ + "$(includedir)\Ice\ValueFactory.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -2186,6 +2050,7 @@ EndpointFactoryManager.obj: \ "$(includedir)\Ice\ObserverHelper.h" \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\PropertiesF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "IPEndpointIF.h" \ "RetryQueueF.h" \ @@ -2235,7 +2100,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" \ @@ -2267,54 +2131,38 @@ EventHandler.obj: \ "$(includedir)\Ice\Config.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\ThreadPoolF.h" \ - "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\Ice\ObjectF.h" \ + "Network.h" \ + "NetworkF.h" \ + "NetworkProxyF.h" \ + "$(includedir)\Ice\PropertiesF.h" \ + "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\ProxyF.h" \ "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ + "$(includedir)\Ice\ObjectF.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)\Ice\ObjectAdapterF.h" \ - "$(includedir)\IceUtil\UndefSysMacros.h" \ - "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - "Network.h" \ - "NetworkF.h" \ - "NetworkProxyF.h" \ - "$(includedir)\Ice\PropertiesF.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" \ @@ -2322,13 +2170,27 @@ EventHandler.obj: \ "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\CommunicatorF.h" \ + "$(includedir)\Ice\ConnectionF.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\InputStream.h" \ + "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\Object.h" \ + "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\ValueFactory.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" \ "ProtocolInstanceF.h" \ "Instance.h" \ "$(includedir)\IceUtil\RecMutex.h" \ @@ -2345,6 +2207,7 @@ EventHandler.obj: \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Endpoint.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -2365,6 +2228,7 @@ EventHandler.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" \ @@ -2382,7 +2246,6 @@ Exception.obj: \ "$(includedir)\IceUtil\Shared.h" \ "$(includedir)\IceUtil\Atomic.h" \ "$(includedir)\Ice\ValueF.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\ProxyF.h" \ @@ -2428,26 +2291,25 @@ Exception.obj: \ "$(includedir)\Ice\ObserverHelper.h" \ "$(includedir)\Ice\Instrumentation.h" \ "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(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" \ "ProtocolInstanceF.h" \ "$(includedir)\Ice\Plugin.h" \ "$(includedir)\Ice\SlicedData.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ - "$(includedir)\Ice\Stream.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\IceUtil\StringUtil.h" \ FactoryTable.obj: \ @@ -2474,7 +2336,6 @@ FactoryTable.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -2510,7 +2371,6 @@ FactoryTableInit.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -2548,7 +2408,6 @@ GCObject.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -2573,26 +2432,15 @@ HttpParser.obj: \ "$(includedir)\IceUtil\Handle.h" \ "$(includedir)\IceUtil\Exception.h" \ "$(includedir)\Ice\Config.h" \ - "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\Ice\ObjectF.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\ProxyF.h" \ "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ + "$(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" \ @@ -2600,20 +2448,10 @@ HttpParser.obj: \ "$(includedir)\IceUtil\Iterator.h" \ "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ + "$(includedir)\Ice\Identity.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\IceUtil\StringUtil.h" \ @@ -2635,7 +2473,6 @@ ImplicitContextI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -2652,8 +2489,9 @@ ImplicitContextI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\IceUtil\Mutex.h" \ @@ -2662,13 +2500,9 @@ ImplicitContextI.obj: \ "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\MutexProtocol.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)\IceUtil\MutexPtrLock.h" \ Incoming.obj: \ @@ -2693,7 +2527,6 @@ Incoming.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ @@ -2702,8 +2535,9 @@ Incoming.obj: \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ "$(includedir)\Ice\ServantManagerF.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -2716,11 +2550,12 @@ Incoming.obj: \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ + "$(includedir)\Ice\InputStream.h" \ + "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\ObserverHelper.h" \ @@ -2740,7 +2575,6 @@ Incoming.obj: \ "$(includedir)\IceUtil\Monitor.h" \ "$(includedir)\IceUtil\Cond.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\AsyncResultF.h" \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ @@ -2759,7 +2593,6 @@ Incoming.obj: \ "TransceiverF.h" \ "EndpointIF.h" \ "ConnectorF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "TraceLevelsF.h" \ "$(includedir)\Ice\OutgoingAsyncF.h" \ "EventHandler.h" \ @@ -2783,6 +2616,7 @@ Incoming.obj: \ "RouterInfoF.h" \ "LocatorInfoF.h" \ "ReferenceFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -2831,7 +2665,6 @@ IncomingAsync.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ @@ -2840,8 +2673,9 @@ IncomingAsync.obj: \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ "$(includedir)\Ice\ServantManagerF.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -2853,11 +2687,12 @@ IncomingAsync.obj: \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ + "$(includedir)\Ice\InputStream.h" \ + "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\ObserverHelper.h" \ @@ -2872,7 +2707,6 @@ IncomingAsync.obj: \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\Ice\ProxyFactoryF.h" \ @@ -2890,7 +2724,6 @@ IncomingAsync.obj: \ "TransceiverF.h" \ "EndpointIF.h" \ "ConnectorF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "TraceLevelsF.h" \ "$(includedir)\Ice\OutgoingAsyncF.h" \ "EventHandler.h" \ @@ -2914,6 +2747,7 @@ IncomingAsync.obj: \ "RouterInfoF.h" \ "LocatorInfoF.h" \ "ReferenceFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -2968,7 +2802,6 @@ Initialize.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -2998,12 +2831,12 @@ Initialize.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -3012,7 +2845,6 @@ Initialize.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -3024,6 +2856,7 @@ Initialize.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -3038,8 +2871,6 @@ Initialize.obj: \ "$(includedir)\Ice\FacetMap.h" \ "$(includedir)\Ice\CommunicatorAsync.h" \ "PropertiesI.h" \ - "StreamI.h" \ - "$(includedir)\Ice\Stream.h" \ "LoggerI.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\IceUtil\FileUtil.h" \ @@ -3066,6 +2897,131 @@ Initialize.obj: \ "$(includedir)\Ice\Process.h" \ "PluginManagerI.h" \ +InputStream.obj: \ + InputStream.cpp \ + "$(includedir)\IceUtil\DisableWarnings.h" \ + "$(includedir)\Ice\InputStream.h" \ + "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\IceUtil\Exception.h" \ + "$(includedir)\IceUtil\Shared.h" \ + "$(includedir)\IceUtil\Atomic.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ + "$(includedir)\IceUtil\PushDisableWarnings.h" \ + "$(includedir)\Ice\ProxyF.h" \ + "$(includedir)\Ice\Config.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\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\InstanceF.h" \ + "$(includedir)\Ice\Object.h" \ + "$(includedir)\IceUtil\Mutex.h" \ + "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\ThreadException.h" \ + "$(includedir)\IceUtil\Time.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\Current.h" \ + "$(includedir)\Ice\ObjectAdapterF.h" \ + "$(includedir)\Ice\ConnectionF.h" \ + "$(includedir)\Ice\Identity.h" \ + "$(includedir)\Ice\Version.h" \ + "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\Buffer.h" \ + "$(includedir)\Ice\Protocol.h" \ + "$(includedir)\Ice\SlicedDataF.h" \ + "$(includedir)\Ice\UserExceptionFactory.h" \ + "$(includedir)\Ice\FactoryTable.h" \ + "DefaultsAndOverrides.h" \ + "DefaultsAndOverridesF.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\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ + "$(includedir)\Ice\AsyncResult.h" \ + "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\UniquePtr.h" \ + "$(includedir)\Ice\AsyncResultF.h" \ + "$(includedir)\Ice\ObserverHelper.h" \ + "$(includedir)\Ice\Instrumentation.h" \ + "$(includedir)\Ice\VirtualShared.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\Endpoint.h" \ + "Network.h" \ + "NetworkF.h" \ + "NetworkProxyF.h" \ + "ProtocolInstanceF.h" \ + "Instance.h" \ + "$(includedir)\IceUtil\RecMutex.h" \ + "$(includedir)\IceUtil\Timer.h" \ + "$(includedir)\IceUtil\Thread.h" \ + "$(includedir)\Ice\InstrumentationF.h" \ + "TraceLevelsF.h" \ + "RouterInfoF.h" \ + "LocatorInfoF.h" \ + "ReferenceFactoryF.h" \ + "$(includedir)\Ice\ThreadPoolF.h" \ + "$(includedir)\Ice\ConnectionFactoryF.h" \ + "ACM.h" \ + "$(includedir)\Ice\ACMF.h" \ + "$(includedir)\Ice\Connection.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ + "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ + "EndpointFactoryManagerF.h" \ + "IPEndpointIF.h" \ + "RetryQueueF.h" \ + "$(includedir)\Ice\DynamicLibraryF.h" \ + "$(includedir)\Ice\PluginF.h" \ + "$(includedir)\Ice\Initialize.h" \ + "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ + "ImplicitContextI.h" \ + "$(includedir)\Ice\ImplicitContext.h" \ + "$(includedir)\Ice\FacetMap.h" \ + "$(includedir)\Ice\Process.h" \ + "$(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\OutputStream.h" \ + "$(includedir)\Ice\ResponseHandlerF.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultValueFactory.h" \ + "ProxyFactory.h" \ + "$(includedir)\Ice\OutgoingAsyncF.h" \ + "$(includedir)\Ice\Properties.h" \ + "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\PropertiesAdmin.h" \ + "TraceUtil.h" \ + "TraceLevels.h" \ + "$(includedir)\Ice\LoggerUtil.h" \ + "$(includedir)\Ice\Logger.h" \ + "$(includedir)\Ice\SlicedData.h" \ + Instance.obj: \ Instance.cpp \ "Instance.h" \ @@ -3096,7 +3052,6 @@ Instance.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -3135,11 +3090,11 @@ Instance.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" \ @@ -3150,7 +3105,7 @@ Instance.obj: \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Endpoint.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -3173,6 +3128,7 @@ Instance.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" \ @@ -3212,8 +3168,7 @@ Instance.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "AcceptorF.h" \ "EndpointI.h" \ - "ValueFactoryManager.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ + "ValueFactoryManagerI.h" \ "ObjectAdapterFactory.h" \ "ObjectAdapterI.h" \ "$(includedir)\Ice\ObjectAdapter.h" \ @@ -3245,6 +3200,9 @@ Instance.obj: \ "$(includedir)\Ice\MetricsFunctional.h" \ "LoggerAdminI.h" \ "RegisterPluginsInit.h" \ + "$(includedir)\Ice\Functional.h" \ + "$(includedir)\IceUtil\Functional.h" \ + "$(includedir)\IceUtil\DisableWarnings.h" \ "$(includedir)\IceUtil\UUID.h" \ InstrumentationI.obj: \ @@ -3268,7 +3226,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" \ @@ -3306,12 +3263,12 @@ InstrumentationI.obj: \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\AsyncResultF.h" \ "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -3326,6 +3283,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\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -3338,7 +3296,6 @@ InstrumentationI.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" \ @@ -3384,7 +3341,6 @@ IPEndpointI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -3423,19 +3379,18 @@ IPEndpointI.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" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\LoggerF.h" \ "ProtocolInstanceF.h" \ "ProtocolInstance.h" \ "Instance.h" \ @@ -3452,6 +3407,7 @@ IPEndpointI.obj: \ "ACM.h" \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "RetryQueueF.h" \ @@ -3471,6 +3427,7 @@ IPEndpointI.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" \ @@ -3522,7 +3479,6 @@ LocatorInfo.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -3552,12 +3508,12 @@ LocatorInfo.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -3575,6 +3531,7 @@ LocatorInfo.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -3595,7 +3552,7 @@ LocatorInfo.obj: \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Endpoint.h" \ - "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -3646,7 +3603,6 @@ LoggerAdminI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -3684,12 +3640,12 @@ LoggerAdminI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -3701,7 +3657,6 @@ LoggerAdminI.obj: \ "$(includedir)\Ice\Initialize.h" \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -3713,6 +3668,7 @@ LoggerAdminI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -3750,7 +3706,6 @@ LoggerI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -3791,7 +3746,6 @@ LoggerUtil.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -3848,11 +3802,10 @@ LoggerUtil.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\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -3861,6 +3814,7 @@ LoggerUtil.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\Endpoint.h" \ "$(includedir)\Ice\PropertiesF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -3882,6 +3836,7 @@ LoggerUtil.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" \ @@ -3904,7 +3859,6 @@ MetricsAdminI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -3941,12 +3895,12 @@ MetricsAdminI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -3961,6 +3915,7 @@ MetricsAdminI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -3971,7 +3926,6 @@ MetricsAdminI.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" \ @@ -4035,7 +3989,6 @@ MetricsObserverI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -4073,12 +4026,12 @@ MetricsObserverI.obj: \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\AsyncResultF.h" \ "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -4093,6 +4046,7 @@ MetricsObserverI.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" \ @@ -4105,7 +4059,6 @@ MetricsObserverI.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" \ @@ -4133,7 +4086,6 @@ Network.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -4170,12 +4122,12 @@ Network.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -4184,7 +4136,6 @@ Network.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "ProtocolInstanceF.h" \ "NetworkProxy.h" \ "$(includedir)\IceUtil\StringUtil.h" \ @@ -4208,6 +4159,7 @@ Network.obj: \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Endpoint.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "RetryQueueF.h" \ @@ -4227,6 +4179,7 @@ Network.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" \ @@ -4258,7 +4211,6 @@ NetworkProxy.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -4295,12 +4247,12 @@ NetworkProxy.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -4309,7 +4261,6 @@ NetworkProxy.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "ProtocolInstanceF.h" \ "HttpParser.h" \ "$(includedir)\Ice\Properties.h" \ @@ -4319,6 +4270,7 @@ NetworkProxy.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -4349,7 +4301,6 @@ Object.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -4368,13 +4319,15 @@ Object.obj: \ "$(includedir)\Ice\ConnectionIF.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ + "$(includedir)\Ice\InputStream.h" \ + "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\ObserverHelper.h" \ @@ -4385,20 +4338,6 @@ Object.obj: \ "IncomingRequest.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\Stream.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\Ice\Proxy.h" \ - "$(includedir)\Ice\ProxyFactoryF.h" \ - "$(includedir)\Ice\RequestHandlerF.h" \ - "$(includedir)\Ice\EndpointTypes.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\AsyncResultF.h" \ - "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\SlicedData.h" \ "$(includedir)\Ice\GCObject.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ @@ -4430,7 +4369,6 @@ ObjectAdapterFactory.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -4461,12 +4399,12 @@ ObjectAdapterFactory.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -4493,7 +4431,6 @@ ObjectAdapterFactory.obj: \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ "$(includedir)\IceUtil\UUID.h" \ @@ -4524,7 +4461,6 @@ ObjectAdapterI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -4555,12 +4491,12 @@ ObjectAdapterI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -4587,13 +4523,13 @@ ObjectAdapterI.obj: \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "ObjectAdapterFactory.h" \ "Instance.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "TraceLevelsF.h" \ "DefaultsAndOverridesF.h" \ "ReferenceFactoryF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ "RetryQueueF.h" \ @@ -4612,6 +4548,7 @@ ObjectAdapterI.obj: \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -4654,7 +4591,6 @@ ObjectAdapterI.obj: \ "Selector.h" \ "$(includedir)\IceUtil\StringUtil.h" \ "$(includedir)\Ice\Communicator.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ImplicitContextF.h" \ "DefaultsAndOverrides.h" \ "TraceLevels.h" \ @@ -4678,7 +4614,6 @@ ObserverHelper.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -4717,12 +4652,12 @@ ObserverHelper.obj: \ "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -4736,6 +4671,7 @@ ObserverHelper.obj: \ "LocatorInfoF.h" \ "BatchRequestQueue.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ + "$(includedir)\Ice\OutputStream.h" \ "SharedContext.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -4763,7 +4699,7 @@ ObserverHelper.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Endpoint.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -4800,7 +4736,6 @@ OpaqueEndpointI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -4824,7 +4759,7 @@ OpaqueEndpointI.obj: \ "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\Plugin.h" \ "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\Object.h" \ @@ -4838,11 +4773,11 @@ OpaqueEndpointI.obj: \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ + "$(includedir)\Ice\InputStream.h" \ + "$(includedir)\Ice\ValueFactory.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ "DefaultsAndOverrides.h" \ @@ -4892,35 +4827,36 @@ Outgoing.obj: \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\ReferenceF.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\Ice\ObjectF.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ + "$(includedir)\IceUtil\PushDisableWarnings.h" \ "$(includedir)\Ice\ProxyF.h" \ "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ + "$(includedir)\Ice\ObjectF.h" \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ + "$(includedir)\Ice\Object.h" \ + "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\Current.h" \ + "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ + "$(includedir)\Ice\InputStream.h" \ + "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\ObserverHelper.h" \ @@ -4930,7 +4866,6 @@ Outgoing.obj: \ "..\..\src\IceUtil\StopWatch.h" \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Proxy.h" \ "$(includedir)\Ice\ProxyFactoryF.h" \ @@ -4947,7 +4882,6 @@ Outgoing.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "EndpointIF.h" \ "ConnectorF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "TraceLevelsF.h" \ "$(includedir)\Ice\OutgoingAsyncF.h" \ "EventHandler.h" \ @@ -4989,6 +4923,7 @@ Outgoing.obj: \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "DefaultsAndOverridesF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -5035,7 +4970,6 @@ OutgoingAsync.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ @@ -5054,12 +4988,12 @@ OutgoingAsync.obj: \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -5067,6 +5001,7 @@ OutgoingAsync.obj: \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\ConnectionIF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "ConnectionI.h" \ "..\..\src\IceUtil\StopWatch.h" \ "$(includedir)\Ice\Connection.h" \ @@ -5083,7 +5018,6 @@ OutgoingAsync.obj: \ "$(includedir)\Ice\ServantManagerF.h" \ "EndpointIF.h" \ "ConnectorF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "TraceLevelsF.h" \ "EventHandler.h" \ "EventHandlerF.h" \ @@ -5124,6 +5058,7 @@ OutgoingAsync.obj: \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "DefaultsAndOverridesF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -5142,6 +5077,130 @@ OutgoingAsync.obj: \ "$(includedir)\IceUtil\StringUtil.h" \ "RetryQueue.h" \ +OutputStream.obj: \ + OutputStream.cpp \ + "$(includedir)\IceUtil\DisableWarnings.h" \ + "$(includedir)\Ice\OutputStream.h" \ + "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\IceUtil\Exception.h" \ + "$(includedir)\IceUtil\Shared.h" \ + "$(includedir)\IceUtil\Atomic.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ + "$(includedir)\IceUtil\PushDisableWarnings.h" \ + "$(includedir)\Ice\ProxyF.h" \ + "$(includedir)\Ice\Config.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\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\InstanceF.h" \ + "$(includedir)\Ice\Object.h" \ + "$(includedir)\IceUtil\Mutex.h" \ + "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\ThreadException.h" \ + "$(includedir)\IceUtil\Time.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\Current.h" \ + "$(includedir)\Ice\ObjectAdapterF.h" \ + "$(includedir)\Ice\ConnectionF.h" \ + "$(includedir)\Ice\Identity.h" \ + "$(includedir)\Ice\Version.h" \ + "$(includedir)\Ice\Buffer.h" \ + "$(includedir)\Ice\Protocol.h" \ + "$(includedir)\Ice\SlicedDataF.h" \ + "DefaultsAndOverrides.h" \ + "DefaultsAndOverridesF.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\ReferenceF.h" \ + "$(includedir)\Ice\BatchRequestQueueF.h" \ + "$(includedir)\Ice\AsyncResult.h" \ + "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\UniquePtr.h" \ + "$(includedir)\Ice\AsyncResultF.h" \ + "$(includedir)\Ice\ObserverHelper.h" \ + "$(includedir)\Ice\Instrumentation.h" \ + "$(includedir)\Ice\InputStream.h" \ + "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\UserExceptionFactory.h" \ + "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\VirtualShared.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\Endpoint.h" \ + "Network.h" \ + "NetworkF.h" \ + "NetworkProxyF.h" \ + "ProtocolInstanceF.h" \ + "Instance.h" \ + "$(includedir)\IceUtil\RecMutex.h" \ + "$(includedir)\IceUtil\Timer.h" \ + "$(includedir)\IceUtil\Thread.h" \ + "$(includedir)\Ice\InstrumentationF.h" \ + "TraceLevelsF.h" \ + "RouterInfoF.h" \ + "LocatorInfoF.h" \ + "ReferenceFactoryF.h" \ + "$(includedir)\Ice\ThreadPoolF.h" \ + "$(includedir)\Ice\ConnectionFactoryF.h" \ + "ACM.h" \ + "$(includedir)\Ice\ACMF.h" \ + "$(includedir)\Ice\Connection.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ + "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ + "EndpointFactoryManagerF.h" \ + "IPEndpointIF.h" \ + "RetryQueueF.h" \ + "$(includedir)\Ice\DynamicLibraryF.h" \ + "$(includedir)\Ice\PluginF.h" \ + "$(includedir)\Ice\Initialize.h" \ + "$(includedir)\Ice\Dispatcher.h" \ + "$(includedir)\Ice\Plugin.h" \ + "$(includedir)\Ice\BatchRequestInterceptor.h" \ + "ImplicitContextI.h" \ + "$(includedir)\Ice\ImplicitContext.h" \ + "$(includedir)\Ice\FacetMap.h" \ + "$(includedir)\Ice\Process.h" \ + "$(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" \ + "ProxyFactory.h" \ + "$(includedir)\Ice\OutgoingAsyncF.h" \ + "$(includedir)\Ice\Properties.h" \ + "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\PropertiesAdmin.h" \ + "TraceUtil.h" \ + "$(includedir)\Ice\LoggerUtil.h" \ + "$(includedir)\Ice\Logger.h" \ + "$(includedir)\Ice\SlicedData.h" \ + PluginManagerI.obj: \ PluginManagerI.cpp \ "$(includedir)\IceUtil\Options.h" \ @@ -5166,7 +5225,6 @@ PluginManagerI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -5204,12 +5262,11 @@ PluginManagerI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.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" \ @@ -5223,6 +5280,7 @@ PluginManagerI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -5289,7 +5347,6 @@ PropertiesAdminI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -5322,12 +5379,12 @@ PropertiesAdminI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -5342,13 +5399,13 @@ PropertiesAdminI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(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\PropertiesAdmin.h" \ "$(includedir)\Ice\NativePropertiesAdmin.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\Logger.h" \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -5376,7 +5433,6 @@ PropertiesI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -5408,12 +5464,12 @@ PropertiesI.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -5428,6 +5484,7 @@ PropertiesI.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -5439,7 +5496,6 @@ PropertiesI.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" \ @@ -5479,7 +5535,6 @@ Protocol.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -5512,7 +5567,6 @@ ProtocolInstance.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -5549,12 +5603,12 @@ ProtocolInstance.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -5563,7 +5617,6 @@ ProtocolInstance.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "EndpointIF.h" \ "ConnectorF.h" \ "IPEndpointIF.h" \ @@ -5584,6 +5637,7 @@ ProtocolInstance.obj: \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Endpoint.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "RetryQueueF.h" \ @@ -5604,6 +5658,7 @@ ProtocolInstance.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" \ @@ -5634,7 +5689,6 @@ ProtocolPluginFacade.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -5689,11 +5743,11 @@ ProtocolPluginFacade.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" \ @@ -5704,7 +5758,7 @@ ProtocolPluginFacade.obj: \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Endpoint.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -5726,6 +5780,7 @@ ProtocolPluginFacade.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" \ @@ -5763,7 +5818,6 @@ Proxy.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ @@ -5788,12 +5842,12 @@ Proxy.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -5811,6 +5865,7 @@ Proxy.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -5842,7 +5897,6 @@ Proxy.obj: \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "EndpointI.h" \ @@ -5853,6 +5907,7 @@ Proxy.obj: \ "$(includedir)\Ice\InstrumentationF.h" \ "TraceLevelsF.h" \ "DefaultsAndOverridesF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ "RetryQueueF.h" \ @@ -5879,7 +5934,6 @@ Proxy.obj: \ "RequestHandler.h" \ "ResponseHandler.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ - "$(includedir)\Ice\Stream.h" \ ProxyFactory.obj: \ ProxyFactory.cpp \ @@ -5906,7 +5960,6 @@ ProxyFactory.obj: \ "$(includedir)\Ice\Format.h" \ "$(includedir)\Ice\ObjectF.h" \ "$(includedir)\Ice\ValueF.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\OutgoingAsyncF.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\IceUtil\PushDisableWarnings.h" \ @@ -5938,12 +5991,12 @@ ProxyFactory.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -5958,6 +6011,7 @@ ProxyFactory.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -5979,7 +6033,7 @@ ProxyFactory.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Endpoint.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -6034,7 +6088,6 @@ Reference.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -6069,12 +6122,12 @@ Reference.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -6088,6 +6141,7 @@ Reference.obj: \ "LocatorInfoF.h" \ "BatchRequestQueue.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ + "$(includedir)\Ice\OutputStream.h" \ "SharedContext.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -6116,7 +6170,7 @@ Reference.obj: \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Endpoint.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -6185,7 +6239,6 @@ ReferenceFactory.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -6222,12 +6275,12 @@ ReferenceFactory.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -6242,11 +6295,11 @@ ReferenceFactory.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(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" \ @@ -6337,7 +6390,6 @@ RegisterPluginsInit.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -6377,12 +6429,12 @@ RegisterPluginsInit.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -6391,7 +6443,6 @@ RegisterPluginsInit.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -6426,7 +6477,6 @@ RequestHandler.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ @@ -6456,12 +6506,12 @@ RequestHandler.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -6475,6 +6525,7 @@ RequestHandler.obj: \ "LocatorInfoF.h" \ "BatchRequestQueue.h" \ "$(includedir)\Ice\BatchRequestInterceptor.h" \ + "$(includedir)\Ice\OutputStream.h" \ "SharedContext.h" \ "$(includedir)\Ice\Properties.h" \ "$(includedir)\Ice\GCObject.h" \ @@ -6526,7 +6577,6 @@ RequestHandlerFactory.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ @@ -6539,20 +6589,17 @@ RequestHandlerFactory.obj: \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\VirtualShared.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\LoggerF.h" \ "TraceLevelsF.h" \ "ConnectRequestHandler.h" \ @@ -6566,10 +6613,13 @@ RequestHandlerFactory.obj: \ "$(includedir)\Ice\EndpointTypes.h" \ "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\AsyncResultF.h" \ "$(includedir)\Ice\ObserverHelper.h" \ "$(includedir)\Ice\Instrumentation.h" \ + "$(includedir)\Ice\InputStream.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\Ice\UserExceptionFactory.h" \ + "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\LocatorF.h" \ "RouterInfoF.h" \ "LocatorInfoF.h" \ @@ -6608,6 +6658,7 @@ RequestHandlerFactory.obj: \ "Instance.h" \ "$(includedir)\Ice\InstrumentationF.h" \ "DefaultsAndOverridesF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ "RetryQueueF.h" \ @@ -6640,7 +6691,6 @@ ResponseHandler.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -6696,7 +6746,6 @@ RetryQueue.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ "$(includedir)\IceUtil\ScopedArray.h" \ "$(includedir)\IceUtil\Iterator.h" \ @@ -6713,17 +6762,18 @@ RetryQueue.obj: \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(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\OutputStream.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "Instance.h" \ @@ -6745,7 +6795,7 @@ RetryQueue.obj: \ "$(includedir)\Ice\BatchRequestQueueF.h" \ "$(includedir)\Ice\Endpoint.h" \ "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -6798,7 +6848,6 @@ RouterInfo.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -6830,12 +6879,12 @@ RouterInfo.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -6850,6 +6899,7 @@ RouterInfo.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" \ @@ -6900,7 +6950,6 @@ Selector.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -6930,12 +6979,12 @@ Selector.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -6944,7 +6993,6 @@ Selector.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "ProtocolInstanceF.h" \ "EventHandlerF.h" \ "EventHandler.h" \ @@ -6964,6 +7012,7 @@ Selector.obj: \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Endpoint.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -6984,6 +7033,7 @@ Selector.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" \ @@ -7015,7 +7065,6 @@ ServantManager.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -7070,11 +7119,10 @@ ServantManager.obj: \ "$(includedir)\Ice\AsyncResultF.h" \ "$(includedir)\Ice\ObserverHelper.h" \ "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.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" \ @@ -7083,6 +7131,7 @@ ServantManager.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\Endpoint.h" \ "$(includedir)\Ice\PropertiesF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -7101,6 +7150,7 @@ ServantManager.obj: \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ "$(includedir)\Ice\Incoming.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ "$(includedir)\Ice\DefaultValueFactory.h" \ @@ -7141,7 +7191,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" \ @@ -7171,11 +7220,11 @@ Service.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" \ @@ -7184,7 +7233,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" \ @@ -7196,6 +7244,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" \ @@ -7224,7 +7273,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" \ @@ -7275,7 +7323,6 @@ SliceChecksums.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -7319,7 +7366,6 @@ SlicedData.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -7335,200 +7381,17 @@ SlicedData.obj: \ "$(includedir)\Ice\Version.h" \ "$(includedir)\IceUtil\MutexPtrLock.h" \ "$(includedir)\Ice\Value.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ - "$(includedir)\Ice\Buffer.h" \ - "$(includedir)\Ice\Protocol.h" \ - "$(includedir)\Ice\UserExceptionFactory.h" \ - "$(includedir)\Ice\FactoryTable.h" \ - -Stream.obj: \ - Stream.cpp \ - "$(includedir)\Ice\Stream.h" \ - "$(includedir)\Ice\StreamF.h" \ - "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\Ice\Config.h" \ "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\Ice\ProxyF.h" \ - "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\ValueF.h" \ - "$(includedir)\Ice\Exception.h" \ - "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\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\Object.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.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\ReferenceF.h" \ - "$(includedir)\Ice\BatchRequestQueueF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\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" \ - -StreamI.obj: \ - StreamI.cpp \ - "StreamI.h" \ - "$(includedir)\Ice\Stream.h" \ - "$(includedir)\Ice\StreamF.h" \ - "$(includedir)\IceUtil\Shared.h" \ - "$(includedir)\IceUtil\Config.h" \ - "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\Ice\Config.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\Ice\ProxyF.h" \ - "$(includedir)\Ice\ProxyHandle.h" \ - "$(includedir)\Ice\ObjectF.h" \ - "$(includedir)\Ice\ValueF.h" \ - "$(includedir)\Ice\Exception.h" \ - "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\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\Object.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.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\ReferenceF.h" \ - "$(includedir)\Ice\BatchRequestQueueF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\InputStream.h" \ + "$(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\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ - "Instance.h" \ - "$(includedir)\IceUtil\RecMutex.h" \ - "$(includedir)\IceUtil\Timer.h" \ - "$(includedir)\IceUtil\Thread.h" \ - "$(includedir)\Ice\InstrumentationF.h" \ - "TraceLevelsF.h" \ - "DefaultsAndOverridesF.h" \ - "RouterInfoF.h" \ - "LocatorInfoF.h" \ - "ReferenceFactoryF.h" \ - "$(includedir)\Ice\ThreadPoolF.h" \ - "$(includedir)\Ice\ConnectionFactoryF.h" \ - "ACM.h" \ - "$(includedir)\Ice\ACMF.h" \ - "$(includedir)\Ice\Connection.h" \ - "$(includedir)\Ice\Endpoint.h" \ - "$(includedir)\Ice\PropertiesF.h" \ - "$(includedir)\Ice\LoggerF.h" \ - "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ - "EndpointFactoryManagerF.h" \ - "IPEndpointIF.h" \ - "RetryQueueF.h" \ - "$(includedir)\Ice\DynamicLibraryF.h" \ - "$(includedir)\Ice\PluginF.h" \ - "NetworkF.h" \ - "NetworkProxyF.h" \ - "$(includedir)\Ice\Initialize.h" \ - "$(includedir)\Ice\Dispatcher.h" \ - "$(includedir)\Ice\Plugin.h" \ - "$(includedir)\Ice\BatchRequestInterceptor.h" \ - "ImplicitContextI.h" \ - "$(includedir)\Ice\ImplicitContext.h" \ - "$(includedir)\Ice\FacetMap.h" \ - "$(includedir)\Ice\Process.h" \ - "$(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" \ - "DefaultsAndOverrides.h" \ - "Network.h" \ - "ProtocolInstanceF.h" \ StreamSocket.obj: \ StreamSocket.cpp \ @@ -7551,7 +7414,6 @@ StreamSocket.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -7588,12 +7450,12 @@ StreamSocket.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -7602,7 +7464,6 @@ StreamSocket.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "ProtocolInstanceF.h" \ "NetworkProxy.h" \ "ProtocolInstance.h" \ @@ -7625,6 +7486,7 @@ StreamSocket.obj: \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Endpoint.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "RetryQueueF.h" \ @@ -7644,6 +7506,7 @@ StreamSocket.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" \ @@ -7674,7 +7537,6 @@ TcpAcceptor.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -7711,12 +7573,12 @@ TcpAcceptor.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -7725,7 +7587,6 @@ TcpAcceptor.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "TcpTransceiver.h" \ "Transceiver.h" \ "StreamSocket.h" \ @@ -7749,6 +7610,7 @@ TcpAcceptor.obj: \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Endpoint.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "RetryQueueF.h" \ @@ -7768,6 +7630,7 @@ TcpAcceptor.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" \ @@ -7810,7 +7673,6 @@ TcpConnector.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -7847,12 +7709,12 @@ TcpConnector.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -7861,7 +7723,6 @@ TcpConnector.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "TcpTransceiver.h" \ "Transceiver.h" \ "EndpointIF.h" \ @@ -7885,6 +7746,7 @@ TcpConnector.obj: \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Endpoint.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "RetryQueueF.h" \ @@ -7904,6 +7766,7 @@ TcpConnector.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" \ @@ -7949,7 +7812,6 @@ TcpEndpointI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -7988,19 +7850,18 @@ TcpEndpointI.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" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\LoggerF.h" \ "ProtocolInstanceF.h" \ "EndpointFactory.h" \ "EndpointFactoryF.h" \ @@ -8021,6 +7882,7 @@ TcpEndpointI.obj: \ "ACM.h" \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "RetryQueueF.h" \ @@ -8039,6 +7901,7 @@ TcpEndpointI.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" \ @@ -8074,7 +7937,6 @@ TcpTransceiver.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -8115,12 +7977,12 @@ TcpTransceiver.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -8129,7 +7991,6 @@ TcpTransceiver.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "StreamSocket.h" \ "WSTransceiver.h" \ "ProtocolInstance.h" \ @@ -8151,6 +8012,7 @@ TcpTransceiver.obj: \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Endpoint.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "RetryQueueF.h" \ @@ -8170,6 +8032,7 @@ TcpTransceiver.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" \ @@ -8204,7 +8067,6 @@ ThreadPool.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -8236,12 +8098,11 @@ ThreadPool.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.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" \ @@ -8272,6 +8133,7 @@ ThreadPool.obj: \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Endpoint.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -8291,6 +8153,7 @@ ThreadPool.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" \ @@ -8326,7 +8189,6 @@ TraceLevels.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -8363,12 +8225,12 @@ TraceLevels.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -8384,6 +8246,7 @@ TraceLevels.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -8415,7 +8278,6 @@ TraceUtil.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -8463,11 +8325,10 @@ TraceUtil.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\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -8478,6 +8339,7 @@ TraceUtil.obj: \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\Endpoint.h" \ "$(includedir)\Ice\PropertiesF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -8499,6 +8361,7 @@ TraceUtil.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" \ @@ -8525,7 +8388,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" \ @@ -8566,12 +8428,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" \ @@ -8580,7 +8442,6 @@ Transceiver.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "ProtocolInstanceF.h" \ UdpConnector.obj: \ @@ -8608,7 +8469,6 @@ UdpConnector.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -8645,12 +8505,12 @@ UdpConnector.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -8659,7 +8519,6 @@ UdpConnector.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "ProtocolInstance.h" \ "EndpointIF.h" \ "IPEndpointIF.h" \ @@ -8679,6 +8538,7 @@ UdpConnector.obj: \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Endpoint.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "RetryQueueF.h" \ @@ -8698,6 +8558,7 @@ UdpConnector.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" \ @@ -8740,7 +8601,6 @@ UdpEndpointI.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -8779,19 +8639,18 @@ UdpEndpointI.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" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\LoggerF.h" \ "ProtocolInstanceF.h" \ "EndpointFactory.h" \ "EndpointFactoryF.h" \ @@ -8800,6 +8659,7 @@ UdpEndpointI.obj: \ "Connector.h" \ "UdpTransceiver.h" \ "Transceiver.h" \ + "$(includedir)\Ice\OutputStream.h" \ "ProtocolInstance.h" \ "Instance.h" \ "$(includedir)\IceUtil\RecMutex.h" \ @@ -8815,6 +8675,7 @@ UdpEndpointI.obj: \ "ACM.h" \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "RetryQueueF.h" \ @@ -8865,7 +8726,6 @@ UdpTransceiver.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -8901,12 +8761,12 @@ UdpTransceiver.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -8915,7 +8775,6 @@ UdpTransceiver.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "UdpEndpointI.h" \ "IPEndpointI.h" \ "$(includedir)\IceUtil\Thread.h" \ @@ -8942,6 +8801,7 @@ UdpTransceiver.obj: \ "$(includedir)\Ice\ConnectionFactoryF.h" \ "ACM.h" \ "$(includedir)\Ice\ACMF.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "RetryQueueF.h" \ @@ -8960,6 +8820,7 @@ UdpTransceiver.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" \ @@ -8973,20 +8834,18 @@ UdpTransceiver.obj: \ Value.obj: \ Value.cpp \ "$(includedir)\Ice\Value.h" \ - "$(includedir)\Ice\Stream.h" \ - "$(includedir)\Ice\StreamF.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\IceUtil\PushDisableWarnings.h" \ + "$(includedir)\Ice\ProxyF.h" \ "$(includedir)\IceUtil\Shared.h" \ "$(includedir)\IceUtil\Config.h" \ "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\IceUtil\Handle.h" \ - "$(includedir)\IceUtil\Exception.h" \ "$(includedir)\Ice\Config.h" \ - "$(includedir)\Ice\CommunicatorF.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\Ice\ProxyF.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" \ @@ -8997,8 +8856,15 @@ Value.obj: \ "$(includedir)\IceUtil\Iterator.h" \ "$(includedir)\Ice\Traits.h" \ "$(includedir)\IceUtil\Optional.h" \ + "$(includedir)\Ice\Identity.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ + "$(includedir)\Ice\Version.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\OutputStream.h" \ + "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ + "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\IceUtil\Mutex.h" \ "$(includedir)\IceUtil\Lock.h" \ @@ -9009,63 +8875,34 @@ Value.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\Identity.h" \ - "$(includedir)\Ice\Version.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\ReferenceF.h" \ - "$(includedir)\Ice\BatchRequestQueueF.h" \ - "$(includedir)\Ice\AsyncResult.h" \ - "$(includedir)\IceUtil\Monitor.h" \ - "$(includedir)\IceUtil\Cond.h" \ - "$(includedir)\IceUtil\UniquePtr.h" \ - "$(includedir)\Ice\InstanceF.h" \ - "$(includedir)\Ice\AsyncResultF.h" \ - "$(includedir)\Ice\ObserverHelper.h" \ - "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\BasicStream.h" \ - "$(includedir)\IceUtil\StringConverter.h" \ - "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ + "$(includedir)\Ice\InputStream.h" \ + "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\ValueFactory.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ - "$(includedir)\Ice\VirtualShared.h" \ - "$(includedir)\Ice\LocalException.h" \ - "$(includedir)\Ice\BuiltinSequences.h" \ -ValueFactoryManager.obj: \ - ValueFactoryManager.cpp \ +ValueFactoryManagerI.obj: \ + ValueFactoryManagerI.cpp \ "$(includedir)\IceUtil\DisableWarnings.h" \ - "ValueFactoryManager.h" \ + "ValueFactoryManagerI.h" \ + "$(includedir)\Ice\ValueFactory.h" \ + "$(includedir)\IceUtil\PushDisableWarnings.h" \ + "$(includedir)\Ice\ProxyF.h" \ "$(includedir)\IceUtil\Shared.h" \ "$(includedir)\IceUtil\Config.h" \ "$(includedir)\IceUtil\Atomic.h" \ - "$(includedir)\IceUtil\Mutex.h" \ - "$(includedir)\IceUtil\Lock.h" \ - "$(includedir)\IceUtil\ThreadException.h" \ - "$(includedir)\IceUtil\Exception.h" \ - "$(includedir)\IceUtil\Time.h" \ - "$(includedir)\IceUtil\MutexProtocol.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ - "$(includedir)\Ice\Handle.h" \ - "$(includedir)\IceUtil\Handle.h" \ "$(includedir)\Ice\Config.h" \ - "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\IceUtil\PushDisableWarnings.h" \ - "$(includedir)\Ice\ProxyF.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" \ @@ -9075,17 +8912,15 @@ ValueFactoryManager.obj: \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ - "$(includedir)\Ice\Object.h" \ - "$(includedir)\Ice\IncomingAsyncF.h" \ - "$(includedir)\Ice\Current.h" \ - "$(includedir)\Ice\ObjectAdapterF.h" \ - "$(includedir)\Ice\ConnectionF.h" \ + "$(includedir)\Ice\VirtualShared.h" \ + "$(includedir)\IceUtil\Mutex.h" \ + "$(includedir)\IceUtil\Lock.h" \ + "$(includedir)\IceUtil\ThreadException.h" \ + "$(includedir)\IceUtil\Time.h" \ + "$(includedir)\IceUtil\MutexProtocol.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\Functional.h" \ - "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ WSAcceptor.obj: \ @@ -9106,7 +8941,6 @@ WSAcceptor.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -9151,12 +8985,11 @@ WSAcceptor.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.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" \ @@ -9185,6 +9018,7 @@ WSAcceptor.obj: \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Endpoint.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "RetryQueueF.h" \ @@ -9204,6 +9038,7 @@ WSAcceptor.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" \ @@ -9233,7 +9068,6 @@ WSConnector.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -9276,12 +9110,11 @@ WSConnector.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.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" \ @@ -9309,6 +9142,7 @@ WSConnector.obj: \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Endpoint.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "RetryQueueF.h" \ @@ -9329,6 +9163,7 @@ WSConnector.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" \ @@ -9362,7 +9197,6 @@ WSEndpoint.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -9412,12 +9246,11 @@ WSEndpoint.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" \ @@ -9440,6 +9273,7 @@ WSEndpoint.obj: \ "ACM.h" \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "RetryQueueF.h" \ @@ -9459,6 +9293,7 @@ WSEndpoint.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" \ @@ -9492,7 +9327,6 @@ WSTransceiver.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -9529,12 +9363,12 @@ WSTransceiver.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -9543,7 +9377,6 @@ WSTransceiver.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\LoggerF.h" \ "EndpointIF.h" \ "ConnectorF.h" \ "IPEndpointIF.h" \ @@ -9564,6 +9397,7 @@ WSTransceiver.obj: \ "$(includedir)\Ice\ACMF.h" \ "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\Endpoint.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ "EndpointFactoryManagerF.h" \ "RetryQueueF.h" \ @@ -9584,6 +9418,7 @@ WSTransceiver.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" \ @@ -9593,7 +9428,6 @@ WSTransceiver.obj: \ "Network.h" \ "$(includedir)\Ice\Communicator.h" \ "$(includedir)\Ice\IncomingAsync.h" \ - "$(includedir)\Ice\ObjectFactory.h" \ "$(includedir)\Ice\RouterF.h" \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\ImplicitContextF.h" \ @@ -9624,7 +9458,6 @@ DLLMain.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -9670,19 +9503,18 @@ DLLMain.obj: \ "$(includedir)\Ice\AsyncResultF.h" \ "$(includedir)\Ice\ObserverHelper.h" \ "$(includedir)\Ice\Instrumentation.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(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" \ "$(includedir)\Ice\InstrumentationF.h" \ "$(includedir)\Ice\Dispatcher.h" \ "$(includedir)\Ice\Plugin.h" \ @@ -9694,6 +9526,7 @@ DLLMain.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -9722,7 +9555,6 @@ DLLMain.obj: \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ - "$(includedir)\Ice\Stream.h" \ "$(includedir)\Ice\Locator.h" \ "$(includedir)\Ice\Router.h" \ "$(includedir)\Ice\DispatchInterceptor.h" \ @@ -9750,7 +9582,6 @@ BuiltinSequences.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -9760,8 +9591,9 @@ BuiltinSequences.obj: \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\IceUtil\Mutex.h" \ @@ -9775,13 +9607,14 @@ BuiltinSequences.obj: \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ + "$(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\OutputStream.h" \ Communicator.obj: \ Communicator.cpp \ @@ -9800,7 +9633,6 @@ Communicator.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -9837,12 +9669,12 @@ Communicator.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -9857,11 +9689,11 @@ Communicator.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(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" \ @@ -9894,7 +9726,6 @@ CommunicatorF.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -9922,7 +9753,6 @@ Connection.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -9959,12 +9789,12 @@ Connection.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -9978,6 +9808,7 @@ Connection.obj: \ "$(includedir)\IceUtil\Timer.h" \ "$(includedir)\IceUtil\Thread.h" \ "$(includedir)\Ice\OutgoingAsyncF.h" \ + "$(includedir)\Ice\OutputStream.h" \ ConnectionF.obj: \ ConnectionF.cpp \ @@ -9996,7 +9827,6 @@ ConnectionF.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -10024,7 +9854,6 @@ Current.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -10038,8 +9867,9 @@ Current.obj: \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\IceUtil\Mutex.h" \ @@ -10048,13 +9878,14 @@ Current.obj: \ "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\MutexProtocol.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(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\OutputStream.h" \ Endpoint.obj: \ Endpoint.cpp \ @@ -10073,7 +9904,6 @@ Endpoint.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -10086,8 +9916,9 @@ Endpoint.obj: \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ "$(includedir)\Ice\EndpointF.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\IceUtil\Mutex.h" \ @@ -10100,13 +9931,14 @@ Endpoint.obj: \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ + "$(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\OutputStream.h" \ EndpointF.obj: \ EndpointF.cpp \ @@ -10125,7 +9957,6 @@ EndpointF.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -10153,7 +9984,6 @@ EndpointTypes.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -10181,7 +10011,6 @@ FacetMap.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -10191,8 +10020,9 @@ FacetMap.obj: \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\IceUtil\Mutex.h" \ @@ -10206,13 +10036,14 @@ FacetMap.obj: \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ + "$(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\OutputStream.h" \ Identity.obj: \ Identity.cpp \ @@ -10231,7 +10062,6 @@ Identity.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -10241,8 +10071,9 @@ Identity.obj: \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\IceUtil\Mutex.h" \ @@ -10255,13 +10086,14 @@ Identity.obj: \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Version.h" \ + "$(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\OutputStream.h" \ ImplicitContext.obj: \ ImplicitContext.cpp \ @@ -10280,7 +10112,6 @@ ImplicitContext.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -10297,8 +10128,9 @@ ImplicitContext.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ConnectionF.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\IceUtil\Mutex.h" \ @@ -10307,13 +10139,14 @@ ImplicitContext.obj: \ "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\MutexProtocol.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(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\OutputStream.h" \ ImplicitContextF.obj: \ ImplicitContextF.cpp \ @@ -10332,7 +10165,6 @@ ImplicitContextF.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -10360,7 +10192,6 @@ Instrumentation.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -10376,8 +10207,9 @@ Instrumentation.obj: \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\IceUtil\Mutex.h" \ @@ -10386,13 +10218,14 @@ Instrumentation.obj: \ "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\MutexProtocol.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(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\OutputStream.h" \ InstrumentationF.obj: \ InstrumentationF.cpp \ @@ -10411,7 +10244,6 @@ InstrumentationF.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -10439,7 +10271,6 @@ LocalException.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -10452,8 +10283,9 @@ LocalException.obj: \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ "$(includedir)\Ice\Version.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\IceUtil\Mutex.h" \ @@ -10465,13 +10297,14 @@ LocalException.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ConnectionF.h" \ + "$(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\OutputStream.h" \ Locator.obj: \ Locator.cpp \ @@ -10490,7 +10323,6 @@ Locator.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -10527,12 +10359,12 @@ Locator.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -10547,6 +10379,7 @@ Locator.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -10575,7 +10408,6 @@ LocatorF.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -10612,12 +10444,12 @@ LocatorF.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -10626,6 +10458,7 @@ LocatorF.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\OutputStream.h" \ Logger.obj: \ Logger.cpp \ @@ -10644,7 +10477,6 @@ Logger.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -10672,7 +10504,6 @@ LoggerF.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -10700,7 +10531,6 @@ Metrics.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -10737,12 +10567,12 @@ Metrics.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -10757,6 +10587,7 @@ Metrics.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" \ @@ -10783,7 +10614,6 @@ ObjectAdapter.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -10820,12 +10650,12 @@ ObjectAdapter.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -10838,6 +10668,7 @@ ObjectAdapter.obj: \ "$(includedir)\Ice\LocatorF.h" \ "$(includedir)\Ice\FacetMap.h" \ "$(includedir)\Ice\Endpoint.h" \ + "$(includedir)\Ice\OutputStream.h" \ ObjectAdapterF.obj: \ ObjectAdapterF.cpp \ @@ -10856,7 +10687,6 @@ ObjectAdapterF.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -10884,7 +10714,6 @@ ObjectFactory.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -10894,8 +10723,9 @@ ObjectFactory.obj: \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\IceUtil\Mutex.h" \ @@ -10909,13 +10739,14 @@ ObjectFactory.obj: \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ + "$(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\OutputStream.h" \ Plugin.obj: \ Plugin.cpp \ @@ -10934,7 +10765,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" \ @@ -10946,8 +10776,9 @@ Plugin.obj: \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\IceUtil\Mutex.h" \ @@ -10962,12 +10793,12 @@ Plugin.obj: \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\OutputStream.h" \ PluginF.obj: \ PluginF.cpp \ @@ -10986,7 +10817,6 @@ PluginF.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -11014,7 +10844,6 @@ Process.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -11051,12 +10880,12 @@ Process.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -11071,6 +10900,7 @@ Process.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" \ @@ -11097,7 +10927,6 @@ ProcessF.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -11134,12 +10963,12 @@ ProcessF.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -11148,6 +10977,7 @@ ProcessF.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\OutputStream.h" \ Properties.obj: \ Properties.cpp \ @@ -11166,7 +10996,6 @@ Properties.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -11203,12 +11032,12 @@ Properties.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -11223,6 +11052,7 @@ Properties.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -11251,7 +11081,6 @@ PropertiesAdmin.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -11288,12 +11117,12 @@ PropertiesAdmin.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -11308,6 +11137,7 @@ PropertiesAdmin.obj: \ "$(includedir)\Ice\Incoming.h" \ "$(includedir)\Ice\ServantLocatorF.h" \ "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\OutputStream.h" \ "$(includedir)\Ice\ResponseHandlerF.h" \ "$(includedir)\Ice\IncomingAsync.h" \ "$(includedir)\Ice\FactoryTableInit.h" \ @@ -11335,7 +11165,6 @@ PropertiesF.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -11372,12 +11201,12 @@ PropertiesF.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -11386,6 +11215,7 @@ PropertiesF.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\OutputStream.h" \ RemoteLogger.obj: \ RemoteLogger.cpp \ @@ -11404,7 +11234,6 @@ RemoteLogger.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -11441,12 +11270,12 @@ RemoteLogger.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -11461,6 +11290,7 @@ RemoteLogger.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" \ @@ -11487,7 +11317,6 @@ Router.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -11524,12 +11353,12 @@ Router.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -11544,6 +11373,7 @@ Router.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" \ @@ -11570,7 +11400,6 @@ RouterF.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -11607,12 +11436,12 @@ RouterF.obj: \ "$(includedir)\Ice\Current.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\ValueFactory.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ @@ -11621,6 +11450,7 @@ RouterF.obj: \ "$(includedir)\Ice\VirtualShared.h" \ "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\OutputStream.h" \ ServantLocator.obj: \ ServantLocator.cpp \ @@ -11639,7 +11469,6 @@ ServantLocator.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -11654,8 +11483,9 @@ ServantLocator.obj: \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\IceUtil\Mutex.h" \ @@ -11664,13 +11494,14 @@ ServantLocator.obj: \ "$(includedir)\IceUtil\Time.h" \ "$(includedir)\IceUtil\MutexProtocol.h" \ "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(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\OutputStream.h" \ ServantLocatorF.obj: \ ServantLocatorF.cpp \ @@ -11689,7 +11520,6 @@ ServantLocatorF.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -11717,7 +11547,6 @@ SliceChecksumDict.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -11727,8 +11556,9 @@ SliceChecksumDict.obj: \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\IceUtil\Mutex.h" \ @@ -11742,13 +11572,14 @@ SliceChecksumDict.obj: \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ + "$(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\OutputStream.h" \ ValueFactory.obj: \ ValueFactory.cpp \ @@ -11767,7 +11598,6 @@ ValueFactory.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -11777,8 +11607,9 @@ ValueFactory.obj: \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\IceUtil\Mutex.h" \ @@ -11792,12 +11623,13 @@ ValueFactory.obj: \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ "$(includedir)\Ice\Version.h" \ - "$(includedir)\Ice\ValueFactoryManagerF.h" \ + "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\Buffer.h" \ "$(includedir)\Ice\Protocol.h" \ "$(includedir)\Ice\SlicedDataF.h" \ "$(includedir)\Ice\UserExceptionFactory.h" \ "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\OutputStream.h" \ Version.obj: \ Version.cpp \ @@ -11816,7 +11648,6 @@ Version.obj: \ "$(includedir)\Ice\ValueF.h" \ "$(includedir)\Ice\Exception.h" \ "$(includedir)\Ice\Format.h" \ - "$(includedir)\Ice\StreamF.h" \ "$(includedir)\Ice\LocalObject.h" \ "$(includedir)\Ice\LocalObjectF.h" \ "$(includedir)\Ice\StreamHelpers.h" \ @@ -11826,8 +11657,9 @@ Version.obj: \ "$(includedir)\IceUtil\Optional.h" \ "$(includedir)\IceUtil\UndefSysMacros.h" \ "$(includedir)\IceUtil\PopDisableWarnings.h" \ - "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\Ice\InputStream.h" \ "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ "$(includedir)\Ice\InstanceF.h" \ "$(includedir)\Ice\Object.h" \ "$(includedir)\IceUtil\Mutex.h" \ @@ -11840,10 +11672,11 @@ Version.obj: \ "$(includedir)\Ice\ObjectAdapterF.h" \ "$(includedir)\Ice\ConnectionF.h" \ "$(includedir)\Ice\Identity.h" \ + "$(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\OutputStream.h" \ diff --git a/cpp/src/Ice/AsyncResult.cpp b/cpp/src/Ice/AsyncResult.cpp index bd8cdc80ccf..37a5581f11a 100644 --- a/cpp/src/Ice/AsyncResult.cpp +++ b/cpp/src/Ice/AsyncResult.cpp @@ -128,12 +128,12 @@ AsyncResult::__throwUserException() { try { - _is.startReadEncaps(); + _is.startEncapsulation(); _is.throwException(); } catch(const Ice::UserException&) { - _is.endReadEncaps(); + _is.endEncapsulation(); throw; } } diff --git a/cpp/src/Ice/BatchRequestQueue.cpp b/cpp/src/Ice/BatchRequestQueue.cpp index 9f5d506545b..ff152dc19ea 100644 --- a/cpp/src/Ice/BatchRequestQueue.cpp +++ b/cpp/src/Ice/BatchRequestQueue.cpp @@ -12,6 +12,7 @@ #include <Ice/Properties.h> using namespace std; +using namespace Ice; using namespace IceInternal; IceUtil::Shared* IceInternal::upCast(BatchRequestQueue* p) { return p; } @@ -87,7 +88,7 @@ BatchRequestQueue::BatchRequestQueue(const InstancePtr& instance, bool datagram) } void -BatchRequestQueue::prepareBatchRequest(BasicStream* os) +BatchRequestQueue::prepareBatchRequest(OutputStream* os) { Lock sync(*this); if(ICE_EXCEPTION_GET(_exception)) @@ -100,7 +101,7 @@ BatchRequestQueue::prepareBatchRequest(BasicStream* os) } void -BatchRequestQueue::finishBatchRequest(BasicStream* os, const Ice::ObjectPrxPtr& proxy, const std::string& operation) +BatchRequestQueue::finishBatchRequest(OutputStream* os, const Ice::ObjectPrxPtr& proxy, const std::string& operation) { // // No need for synchronization, no other threads are supposed @@ -156,7 +157,7 @@ BatchRequestQueue::finishBatchRequest(BasicStream* os, const Ice::ObjectPrxPtr& } void -BatchRequestQueue::abortBatchRequest(BasicStream* os) +BatchRequestQueue::abortBatchRequest(OutputStream* os) { Lock sync(*this); if(_batchStreamInUse) @@ -169,7 +170,7 @@ BatchRequestQueue::abortBatchRequest(BasicStream* os) } int -BatchRequestQueue::swap(BasicStream* os) +BatchRequestQueue::swap(OutputStream* os) { Lock sync(*this); if(_batchRequestNum == 0) diff --git a/cpp/src/Ice/BatchRequestQueue.h b/cpp/src/Ice/BatchRequestQueue.h index 64d6bc5f658..62efb23454c 100644 --- a/cpp/src/Ice/BatchRequestQueue.h +++ b/cpp/src/Ice/BatchRequestQueue.h @@ -18,7 +18,7 @@ #include <Ice/BatchRequestInterceptor.h> #include <Ice/BatchRequestQueueF.h> #include <Ice/InstanceF.h> -#include <Ice/BasicStream.h> +#include <Ice/OutputStream.h> namespace IceInternal { @@ -29,11 +29,11 @@ public: BatchRequestQueue(const InstancePtr&, bool); - void prepareBatchRequest(BasicStream*); - void finishBatchRequest(BasicStream*, const Ice::ObjectPrxPtr&, const std::string&); - void abortBatchRequest(BasicStream*); + void prepareBatchRequest(Ice::OutputStream*); + void finishBatchRequest(Ice::OutputStream*, const Ice::ObjectPrxPtr&, const std::string&); + void abortBatchRequest(Ice::OutputStream*); - int swap(BasicStream*); + int swap(Ice::OutputStream*); void destroy(const Ice::LocalException&); bool isEmpty(); @@ -49,7 +49,7 @@ private: #else Ice::BatchRequestInterceptorPtr _interceptor; #endif - BasicStream _batchStream; + Ice::OutputStream _batchStream; bool _batchStreamInUse; bool _batchStreamCanFlush; int _batchRequestNum; diff --git a/cpp/src/Ice/Buffer.cpp b/cpp/src/Ice/Buffer.cpp index 8f29d39b6a6..b906c99ae74 100644 --- a/cpp/src/Ice/Buffer.cpp +++ b/cpp/src/Ice/Buffer.cpp @@ -37,6 +37,45 @@ IceInternal::Buffer::Container::Container(const_iterator beg, const_iterator end { } +IceInternal::Buffer::Container::Container(const vector<value_type>& v) : + _capacity(0), + _shrinkCounter(0) +{ + if(v.empty()) + { + _buf = 0; + _size = 0; + } + else + { + _buf = const_cast<value_type*>(&v[0]); + _size = v.size(); + } +} + +IceInternal::Buffer::Container::Container(Container& other, bool adopt) +{ + if(adopt) + { + _buf = other._buf; + _size = other._size; + _capacity = other._capacity; + _shrinkCounter = other._shrinkCounter; + + other._buf = 0; + other._size = 0; + other._capacity = 0; + other._shrinkCounter = 0; + } + else + { + _buf = other._buf; + _size = other._size; + _capacity = 0; + _shrinkCounter = 0; + } +} + IceInternal::Buffer::Container::~Container() { if(_buf && _capacity > 0) diff --git a/cpp/src/Ice/CollocatedRequestHandler.cpp b/cpp/src/Ice/CollocatedRequestHandler.cpp index 87a3d09c0f2..d57d9d72934 100644 --- a/cpp/src/Ice/CollocatedRequestHandler.cpp +++ b/cpp/src/Ice/CollocatedRequestHandler.cpp @@ -31,7 +31,7 @@ class InvokeAll : public DispatchWorkItem public: InvokeAll(OutgoingBase* out, - BasicStream* os, + OutputStream* os, CollocatedRequestHandler* handler, Int requestId, Int batchRequestNum) : @@ -59,7 +59,7 @@ public: private: OutgoingBase* _out; - BasicStream* _os; + OutputStream* _os; CollocatedRequestHandlerPtr _handler; Int _requestId; Int _batchRequestNum; @@ -70,7 +70,7 @@ class InvokeAllAsync : public DispatchWorkItem public: InvokeAllAsync(const OutgoingAsyncBasePtr& outAsync, - BasicStream* os, + OutputStream* os, const CollocatedRequestHandlerPtr& handler, Int requestId, Int batchRequestNum) : @@ -90,14 +90,14 @@ public: private: OutgoingAsyncBasePtr _outAsync; - BasicStream* _os; + OutputStream* _os; CollocatedRequestHandlerPtr _handler; Int _requestId; Int _batchRequestNum; }; void -fillInValue(BasicStream* os, int pos, Int value) +fillInValue(OutputStream* os, int pos, Int value) { const Byte* p = reinterpret_cast<const Byte*>(&value); #ifdef ICE_BIG_ENDIAN @@ -316,25 +316,27 @@ CollocatedRequestHandler::invokeAsyncRequest(OutgoingAsyncBase* outAsync, int ba } void -CollocatedRequestHandler::sendResponse(Int requestId, BasicStream* os, Byte, bool amd) +CollocatedRequestHandler::sendResponse(Int requestId, OutputStream* os, Byte, bool amd) { OutgoingAsyncBasePtr outAsync; { Lock sync(*this); assert(_response); - os->i = os->b.begin() + sizeof(replyHdr) + 4; + InputStream is(os->instance(), os->getEncoding(), *os, true); // Adopting the OutputStream's buffer. + + is.i = is.b.begin() + sizeof(replyHdr) + 4; if(_traceLevels->protocol >= 1) { fillInValue(os, 10, static_cast<Int>(os->b.size())); - traceRecv(*os, _logger, _traceLevels); + traceRecv(is, _logger, _traceLevels); } map<int, OutgoingBase*>::iterator p = _requests.find(requestId); if(p != _requests.end()) { - p->second->completed(*os); + p->second->completed(is); _requests.erase(p); } else @@ -342,7 +344,7 @@ CollocatedRequestHandler::sendResponse(Int requestId, BasicStream* os, Byte, boo map<int, OutgoingAsyncBasePtr>::iterator q = _asyncRequests.find(requestId); if(q != _asyncRequests.end()) { - os->swap(*q->second->getIs()); + is.swap(*q->second->getIs()); if(q->second->completed()) { outAsync = q->second; @@ -442,15 +444,17 @@ CollocatedRequestHandler::sentAsync(OutgoingAsyncBase* outAsync) } void -CollocatedRequestHandler::invokeAll(BasicStream* os, Int requestId, Int batchRequestNum) +CollocatedRequestHandler::invokeAll(OutputStream* os, Int requestId, Int batchRequestNum) { + InputStream is(os->instance(), os->getEncoding(), *os); + if(batchRequestNum > 0) { - os->i = os->b.begin() + sizeof(requestBatchHdr); + is.i = is.b.begin() + sizeof(requestBatchHdr); } else { - os->i = os->b.begin() + sizeof(requestHdr); + is.i = is.b.begin() + sizeof(requestHdr); } if(_traceLevels->protocol >= 1) @@ -490,7 +494,7 @@ CollocatedRequestHandler::invokeAll(BasicStream* os, Int requestId, Int batchReq } Incoming in(_reference->getInstance().get(), this, 0, _adapter, _response, 0, requestId); - in.invoke(servantManager, os); + in.invoke(servantManager, &is); --invokeNum; } } diff --git a/cpp/src/Ice/CollocatedRequestHandler.h b/cpp/src/Ice/CollocatedRequestHandler.h index c4baefb7b30..809c79cb9e9 100644 --- a/cpp/src/Ice/CollocatedRequestHandler.h +++ b/cpp/src/Ice/CollocatedRequestHandler.h @@ -15,7 +15,7 @@ #include <Ice/RequestHandler.h> #include <Ice/ResponseHandler.h> -#include <Ice/BasicStream.h> +#include <Ice/OutputStream.h> #include <Ice/ObjectAdapterF.h> #include <Ice/LoggerF.h> #include <Ice/TraceLevelsF.h> @@ -55,7 +55,7 @@ public: virtual void requestCanceled(OutgoingBase*, const Ice::LocalException&); virtual void asyncRequestCanceled(const OutgoingAsyncBasePtr&, const Ice::LocalException&); - virtual void sendResponse(Ice::Int, BasicStream*, Ice::Byte, bool); + virtual void sendResponse(Ice::Int, Ice::OutputStream*, Ice::Byte, bool); virtual void sendNoResponse(); virtual bool systemException(Ice::Int, const Ice::SystemException&, bool); virtual void invokeException(Ice::Int, const Ice::LocalException&, int, bool); @@ -71,7 +71,7 @@ public: bool sent(OutgoingBase*); bool sentAsync(OutgoingAsyncBase*); - void invokeAll(BasicStream*, Ice::Int, Ice::Int); + void invokeAll(Ice::OutputStream*, Ice::Int, Ice::Int); private: diff --git a/cpp/src/Ice/CommunicatorI.cpp b/cpp/src/Ice/CommunicatorI.cpp index 60d7b871275..8d13727d9ea 100644 --- a/cpp/src/Ice/CommunicatorI.cpp +++ b/cpp/src/Ice/CommunicatorI.cpp @@ -14,7 +14,6 @@ #include <Ice/ConnectionFactory.h> #include <Ice/ReferenceFactory.h> #include <Ice/ProxyFactory.h> -#include <Ice/ValueFactoryManager.h> #include <Ice/ObjectAdapterFactory.h> #include <Ice/LoggerUtil.h> #include <Ice/LocalException.h> @@ -133,41 +132,15 @@ Ice::CommunicatorI::createObjectAdapterWithRouter(const string& name, const Rout void Ice::CommunicatorI::addObjectFactory(const ::Ice::ObjectFactoryPtr& factory, const string& id) { - _instance->servantFactoryManager()->add(factory, id); + _instance->addObjectFactory(factory, id); } ::Ice::ObjectFactoryPtr Ice::CommunicatorI::findObjectFactory(const string& id) const { - return _instance->servantFactoryManager()->findObjectFactory(id); + return _instance->findObjectFactory(id); } -#ifdef ICE_CPP11_MAPPING -void -Ice::CommunicatorI::addValueFactory(function<::Ice::ValuePtr (string)> factory, const string& id) -{ - _instance->servantFactoryManager()->add(move(factory), id); -} - -function<::Ice::ValuePtr (const string&)> -Ice::CommunicatorI::findValueFactory(const string& id) const -{ - return _instance->servantFactoryManager()->find(id); -} -#else -void -Ice::CommunicatorI::addValueFactory(const ::Ice::ValueFactoryPtr& factory, const string& id) -{ - _instance->servantFactoryManager()->add(factory, id); -} - -::Ice::ValueFactoryPtr -Ice::CommunicatorI::findValueFactory(const string& id) const -{ - return _instance->servantFactoryManager()->find(id); -} -#endif - PropertiesPtr Ice::CommunicatorI::getProperties() const { @@ -222,6 +195,12 @@ Ice::CommunicatorI::getPluginManager() const return _instance->pluginManager(); } +ValueFactoryManagerPtr +Ice::CommunicatorI::getValueFactoryManager() const +{ + return _instance->initializationData().valueFactoryManager; +} + namespace { diff --git a/cpp/src/Ice/CommunicatorI.h b/cpp/src/Ice/CommunicatorI.h index 4472e688097..50e0d44973b 100644 --- a/cpp/src/Ice/CommunicatorI.h +++ b/cpp/src/Ice/CommunicatorI.h @@ -49,14 +49,6 @@ public: virtual void addObjectFactory(const ObjectFactoryPtr&, const std::string&); virtual ObjectFactoryPtr findObjectFactory(const std::string&) const; -#ifdef ICE_CPP11_MAPPING - virtual void addValueFactory(std::function<std::shared_ptr<Ice::Value> (std::string)>, const ::std::string&); - virtual std::function<::std::shared_ptr<Ice::Value> (const std::string&)> findValueFactory(const std::string&) const; -#else - virtual void addValueFactory(const ValueFactoryPtr&, const std::string&); - virtual ValueFactoryPtr findValueFactory(const std::string&) const; -#endif - virtual ImplicitContextPtr getImplicitContext() const; virtual PropertiesPtr getProperties() const; @@ -71,6 +63,8 @@ public: virtual PluginManagerPtr getPluginManager() const; + virtual ValueFactoryManagerPtr getValueFactoryManager() const; + virtual void flushBatchRequests(); #ifdef ICE_CPP11_MAPPING @@ -97,8 +91,9 @@ public: private: - static CommunicatorIPtr - create(const InitializationData&); + CommunicatorI() {} + + static CommunicatorIPtr create(const InitializationData&); // // Certain initialization tasks need to be completed after the diff --git a/cpp/src/Ice/ConnectRequestHandler.h b/cpp/src/Ice/ConnectRequestHandler.h index e8e3cc52686..ce441a4489f 100644 --- a/cpp/src/Ice/ConnectRequestHandler.h +++ b/cpp/src/Ice/ConnectRequestHandler.h @@ -19,7 +19,6 @@ #include <Ice/Reference.h> #include <Ice/RouterInfo.h> #include <Ice/ProxyF.h> -#include <Ice/BasicStream.h> #include <deque> #include <set> diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp index c0c1f55df22..2c8688b7a00 100644 --- a/cpp/src/Ice/ConnectionI.cpp +++ b/cpp/src/Ice/ConnectionI.cpp @@ -74,7 +74,7 @@ public: const vector<ConnectionI::OutgoingMessage>& sentCBs, Byte compress, Int requestId, Int invokeNum, const ServantManagerPtr& servantManager, const ObjectAdapterPtr& adapter, const OutgoingAsyncBasePtr& outAsync, const ICE_HEARTBEAT_CALLBACK& heartbeatCallback, - BasicStream& stream) : + InputStream& stream) : DispatchWorkItem(connection), _connection(connection), _startCB(startCB), @@ -110,7 +110,7 @@ private: const ObjectAdapterPtr _adapter; const OutgoingAsyncBasePtr _outAsync; const ICE_HEARTBEAT_CALLBACK _heartbeatCallback; - BasicStream _stream; + InputStream _stream; }; class FinishCall : public DispatchWorkItem @@ -212,7 +212,7 @@ Ice::ConnectionI::Observer::attach(const Ice::Instrumentation::ConnectionObserve void -Ice::ConnectionI::OutgoingMessage::adopt(BasicStream* str) +Ice::ConnectionI::OutgoingMessage::adopt(OutputStream* str) { if(adopted) { @@ -241,7 +241,7 @@ Ice::ConnectionI::OutgoingMessage::adopt(BasicStream* str) } assert(str); - stream = new BasicStream(str->instance(), currentProtocolEncoding); + stream = new OutputStream(str->instance(), currentProtocolEncoding); stream->swap(*str); adopted = true; } @@ -614,7 +614,7 @@ Ice::ConnectionI::monitor(const IceUtil::Time& now, const ACMConfig& acm) bool Ice::ConnectionI::sendRequest(OutgoingBase* out, bool compress, bool response, int batchRequestNum) { - BasicStream* os = out->os(); + OutputStream* os = out->os(); IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this); // @@ -706,7 +706,7 @@ Ice::ConnectionI::sendRequest(OutgoingBase* out, bool compress, bool response, i AsyncStatus Ice::ConnectionI::sendAsyncRequest(const OutgoingAsyncBasePtr& out, bool compress, bool response, int batchRequestNum) { - BasicStream* os = out->getOs(); + OutputStream* os = out->getOs(); IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this); // @@ -1248,7 +1248,7 @@ Ice::ConnectionI::asyncRequestCanceled(const OutgoingAsyncBasePtr& outAsync, con } void -Ice::ConnectionI::sendResponse(Int, BasicStream* os, Byte compressFlag, bool /*amd*/) +Ice::ConnectionI::sendResponse(Int, OutputStream* os, Byte compressFlag, bool /*amd*/) { IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this); assert(_state > StateNotValidated); @@ -1800,7 +1800,7 @@ void ConnectionI::dispatch(const StartCallbackPtr& startCB, const vector<OutgoingMessage>& sentCBs, Byte compress, Int requestId, Int invokeNum, const ServantManagerPtr& servantManager, const ObjectAdapterPtr& adapter, const OutgoingAsyncBasePtr& outAsync, - const ICE_HEARTBEAT_CALLBACK& heartbeatCallback, BasicStream& stream) + const ICE_HEARTBEAT_CALLBACK& heartbeatCallback, InputStream& stream) { int dispatchedCount = 0; @@ -2649,7 +2649,7 @@ Ice::ConnectionI::initiateShutdown() // // Before we shut down, we send a close connection message. // - BasicStream os(_instance.get(), Ice::currentProtocolEncoding); + OutputStream os(_instance.get(), Ice::currentProtocolEncoding); os.write(magic[0]); os.write(magic[1]); os.write(magic[2]); @@ -2689,7 +2689,7 @@ Ice::ConnectionI::heartbeat() if(!_endpoint->datagram()) { - BasicStream os(_instance.get(), Ice::currentProtocolEncoding); + OutputStream os(_instance.get(), Ice::currentProtocolEncoding); os.write(magic[0]); os.write(magic[1]); os.write(magic[2]); @@ -2939,7 +2939,7 @@ Ice::ConnectionI::sendNextMessage(vector<OutgoingMessage>& callbacks) // // Do compression. // - BasicStream stream(_instance.get(), Ice::currentProtocolEncoding); + OutputStream stream(_instance.get(), Ice::currentProtocolEncoding); doCompress(*message->stream, stream); if(message->outAsync) @@ -3068,7 +3068,7 @@ Ice::ConnectionI::sendMessage(OutgoingMessage& message) // // Do compression. // - BasicStream stream(_instance.get(), Ice::currentProtocolEncoding); + OutputStream stream(_instance.get(), Ice::currentProtocolEncoding); doCompress(*message.stream, stream); stream.i = stream.b.begin(); @@ -3244,7 +3244,7 @@ getBZ2Error(int bzError) } void -Ice::ConnectionI::doCompress(BasicStream& uncompressed, BasicStream& compressed) +Ice::ConnectionI::doCompress(OutputStream& uncompressed, OutputStream& compressed) { const Byte* p; @@ -3299,7 +3299,7 @@ Ice::ConnectionI::doCompress(BasicStream& uncompressed, BasicStream& compressed) } void -Ice::ConnectionI::doUncompress(BasicStream& compressed, BasicStream& uncompressed) +Ice::ConnectionI::doUncompress(InputStream& compressed, InputStream& uncompressed) { Int uncompressedSize; compressed.i = compressed.b.begin() + headerSize; @@ -3334,7 +3334,7 @@ Ice::ConnectionI::doUncompress(BasicStream& compressed, BasicStream& uncompresse #endif SocketOperation -Ice::ConnectionI::parseMessage(BasicStream& stream, Int& invokeNum, Int& requestId, Byte& compress, +Ice::ConnectionI::parseMessage(InputStream& stream, Int& invokeNum, Int& requestId, Byte& compress, ServantManagerPtr& servantManager, ObjectAdapterPtr& adapter, OutgoingAsyncBasePtr& outAsync, ICE_HEARTBEAT_CALLBACK& heartbeatCallback, int& dispatchCount) @@ -3372,7 +3372,7 @@ Ice::ConnectionI::parseMessage(BasicStream& stream, Int& invokeNum, Int& request if(compress == 2) { #ifdef ICE_HAS_BZIP2 - BasicStream ustream(_instance.get(), Ice::currentProtocolEncoding); + InputStream ustream(_instance.get(), Ice::currentProtocolEncoding); doUncompress(stream, ustream); stream.b.swap(ustream.b); #else @@ -3602,7 +3602,7 @@ Ice::ConnectionI::parseMessage(BasicStream& stream, Int& invokeNum, Int& request } void -Ice::ConnectionI::invokeAll(BasicStream& stream, Int invokeNum, Int requestId, Byte compress, +Ice::ConnectionI::invokeAll(InputStream& stream, Int invokeNum, Int requestId, Byte compress, const ServantManagerPtr& servantManager, const ObjectAdapterPtr& adapter) { // diff --git a/cpp/src/Ice/ConnectionI.h b/cpp/src/Ice/ConnectionI.h index 0b2f3e66b97..1d44498610b 100644 --- a/cpp/src/Ice/ConnectionI.h +++ b/cpp/src/Ice/ConnectionI.h @@ -39,6 +39,8 @@ #include <Ice/BatchRequestQueueF.h> #include <Ice/ACM.h> #include <Ice/VirtualShared.h> +#include <Ice/OutputStream.h> +#include <Ice/InputStream.h> #include <deque> @@ -93,7 +95,7 @@ public: struct OutgoingMessage { - OutgoingMessage(IceInternal::BasicStream* str, bool comp) : + OutgoingMessage(Ice::OutputStream* str, bool comp) : stream(str), out(0), compress(comp), requestId(0), adopted(false) #if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) , isSent(false), invokeSent(false), receivedReply(false) @@ -101,7 +103,7 @@ public: { } - OutgoingMessage(IceInternal::OutgoingBase* o, IceInternal::BasicStream* str, bool comp, int rid) : + OutgoingMessage(IceInternal::OutgoingBase* o, Ice::OutputStream* str, bool comp, int rid) : stream(str), out(o), compress(comp), requestId(rid), adopted(false) #if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) , isSent(false), invokeSent(false), receivedReply(false) @@ -109,7 +111,7 @@ public: { } - OutgoingMessage(const IceInternal::OutgoingAsyncBasePtr& o, IceInternal::BasicStream* str, + OutgoingMessage(const IceInternal::OutgoingAsyncBasePtr& o, Ice::OutputStream* str, bool comp, int rid) : stream(str), out(0), outAsync(o), compress(comp), requestId(rid), adopted(false) #if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT) @@ -118,12 +120,12 @@ public: { } - void adopt(IceInternal::BasicStream*); + void adopt(Ice::OutputStream*); void canceled(bool); bool sent(); void completed(const Ice::LocalException&); - IceInternal::BasicStream* stream; + Ice::OutputStream* stream; IceInternal::OutgoingBase* out; IceInternal::OutgoingAsyncBasePtr outAsync; bool compress; @@ -216,7 +218,7 @@ public: virtual void requestCanceled(IceInternal::OutgoingBase*, const LocalException&); virtual void asyncRequestCanceled(const IceInternal::OutgoingAsyncBasePtr&, const LocalException&); - virtual void sendResponse(Int, IceInternal::BasicStream*, Byte, bool); + virtual void sendResponse(Int, Ice::OutputStream*, Byte, bool); virtual void sendNoResponse(); virtual bool systemException(Int, const SystemException&, bool); virtual void invokeException(Ice::Int, const LocalException&, int, bool); @@ -255,7 +257,7 @@ public: void dispatch(const StartCallbackPtr&, const std::vector<OutgoingMessage>&, Byte, Int, Int, const IceInternal::ServantManagerPtr&, const ObjectAdapterPtr&, const IceInternal::OutgoingAsyncBasePtr&, - const ICE_HEARTBEAT_CALLBACK&, IceInternal::BasicStream&); + const ICE_HEARTBEAT_CALLBACK&, Ice::InputStream&); void finish(bool); void closeCallback(const ICE_CLOSE_CALLBACK&); @@ -300,15 +302,15 @@ private: IceInternal::AsyncStatus sendMessage(OutgoingMessage&); #ifdef ICE_HAS_BZIP2 - void doCompress(IceInternal::BasicStream&, IceInternal::BasicStream&); - void doUncompress(IceInternal::BasicStream&, IceInternal::BasicStream&); + void doCompress(Ice::OutputStream&, Ice::OutputStream&); + void doUncompress(Ice::InputStream&, Ice::InputStream&); #endif - IceInternal::SocketOperation parseMessage(IceInternal::BasicStream&, Int&, Int&, Byte&, + IceInternal::SocketOperation parseMessage(Ice::InputStream&, Int&, Int&, Byte&, IceInternal::ServantManagerPtr&, ObjectAdapterPtr&, IceInternal::OutgoingAsyncBasePtr&, ICE_HEARTBEAT_CALLBACK&, int&); - void invokeAll(IceInternal::BasicStream&, Int, Int, Byte, + void invokeAll(Ice::InputStream&, Int, Int, Byte, const IceInternal::ServantManagerPtr&, const ObjectAdapterPtr&); void scheduleTimeout(IceInternal::SocketOperation status); @@ -377,9 +379,9 @@ private: std::deque<OutgoingMessage> _sendStreams; - IceInternal::BasicStream _readStream; + Ice::InputStream _readStream; bool _readHeader; - IceInternal::BasicStream _writeStream; + Ice::OutputStream _writeStream; Observer _observer; diff --git a/cpp/src/Ice/EndpointFactory.h b/cpp/src/Ice/EndpointFactory.h index 79873ae5c50..5ff16fbc088 100644 --- a/cpp/src/Ice/EndpointFactory.h +++ b/cpp/src/Ice/EndpointFactory.h @@ -17,10 +17,15 @@ #include <Ice/CommunicatorF.h> #include <Ice/Plugin.h> -namespace IceInternal +namespace Ice { -class BasicStream; +class InputStream; + +} + +namespace IceInternal +{ class ICE_API EndpointFactory : public ::IceUtil::Shared { @@ -31,7 +36,7 @@ public: virtual ::Ice::Short type() const = 0; virtual ::std::string protocol() const = 0; virtual EndpointIPtr create(std::vector<std::string>&, bool) const = 0; - virtual EndpointIPtr read(BasicStream*) const = 0; + virtual EndpointIPtr read(Ice::InputStream*) const = 0; virtual void destroy() = 0; virtual EndpointFactoryPtr clone(const ProtocolInstancePtr&) const = 0; diff --git a/cpp/src/Ice/EndpointFactoryManager.cpp b/cpp/src/Ice/EndpointFactoryManager.cpp index 6830eda8521..5ac223e57fc 100644 --- a/cpp/src/Ice/EndpointFactoryManager.cpp +++ b/cpp/src/Ice/EndpointFactoryManager.cpp @@ -10,7 +10,8 @@ #include <Ice/EndpointFactoryManager.h> #include <Ice/Endpoint.h> #include <Ice/OpaqueEndpointI.h> -#include <Ice/BasicStream.h> +#include <Ice/OutputStream.h> +#include <Ice/InputStream.h> #include <Ice/LocalException.h> #include <Ice/Instance.h> #include <Ice/Properties.h> @@ -122,7 +123,7 @@ IceInternal::EndpointFactoryManager::create(const string& str, bool oaEndpoint) // Code below left in place for debugging. EndpointIPtr e = factory->create(str.substr(end), oaEndpoint); - BasicStream bs(_instance.get(), Ice::currentProtocolEncoding); + OutputStream bs(_instance.get(), Ice::currentProtocolEncoding); e->streamWrite(&bs); bs.i = bs.b.begin(); short type; @@ -155,15 +156,15 @@ IceInternal::EndpointFactoryManager::create(const string& str, bool oaEndpoint) // and ask the factory to read the endpoint data from that stream to create // the actual endpoint. // - BasicStream bs(_instance.get(), Ice::currentProtocolEncoding); + OutputStream bs(_instance.get(), Ice::currentProtocolEncoding); bs.write(ue->type()); ue->streamWrite(&bs); - bs.i = bs.b.begin(); + InputStream is(bs.instance(), bs.getEncoding(), bs); short type; - bs.read(type); - bs.startReadEncaps(); - EndpointIPtr e = factory->read(&bs); - bs.endReadEncaps(); + is.read(type); + is.startEncapsulation(); + EndpointIPtr e = factory->read(&is); + is.endEncapsulation(); return e; } return ue; // Endpoint is opaque, but we don't have a factory for its type. @@ -173,7 +174,7 @@ IceInternal::EndpointFactoryManager::create(const string& str, bool oaEndpoint) } EndpointIPtr -IceInternal::EndpointFactoryManager::read(BasicStream* s) const +IceInternal::EndpointFactoryManager::read(InputStream* s) const { Short type; s->read(type); @@ -181,7 +182,7 @@ IceInternal::EndpointFactoryManager::read(BasicStream* s) const EndpointFactoryPtr factory = get(type); EndpointIPtr e; - s->startReadEncaps(); + s->startEncapsulation(); if(factory) { @@ -192,7 +193,7 @@ IceInternal::EndpointFactoryManager::read(BasicStream* s) const e = ICE_MAKE_SHARED(OpaqueEndpointI, type, s); } - s->endReadEncaps(); + s->endEncapsulation(); return e; } diff --git a/cpp/src/Ice/EndpointFactoryManager.h b/cpp/src/Ice/EndpointFactoryManager.h index 522691982c6..fc1e911bb49 100644 --- a/cpp/src/Ice/EndpointFactoryManager.h +++ b/cpp/src/Ice/EndpointFactoryManager.h @@ -17,10 +17,15 @@ #include <Ice/EndpointFactoryF.h> #include <Ice/EndpointFactoryManagerF.h> -namespace IceInternal +namespace Ice { -class BasicStream; +class InputStream; + +} + +namespace IceInternal +{ class EndpointFactoryManager : public ::IceUtil::Shared, public ::IceUtil::Mutex { @@ -29,7 +34,7 @@ public: void add(const EndpointFactoryPtr&); EndpointFactoryPtr get(::Ice::Short) const; EndpointIPtr create(const std::string&, bool) const; - EndpointIPtr read(BasicStream*) const; + EndpointIPtr read(Ice::InputStream*) const; private: diff --git a/cpp/src/Ice/EndpointI.h b/cpp/src/Ice/EndpointI.h index 1fb691ddd12..9385855f5ba 100644 --- a/cpp/src/Ice/EndpointI.h +++ b/cpp/src/Ice/EndpointI.h @@ -18,10 +18,16 @@ #include <Ice/AcceptorF.h> #include <Ice/VirtualShared.h> -namespace IceInternal +namespace Ice { -class BasicStream; +class OutputStream; +class InputStream; + +} + +namespace IceInternal +{ class ICE_API EndpointI_connectors : public virtual ICE_SHARED { @@ -40,7 +46,7 @@ public: // // Marshal the endpoint. // - virtual void streamWrite(BasicStream*) const = 0; + virtual void streamWrite(Ice::OutputStream*) const = 0; // // Return the endpoint type. diff --git a/cpp/src/Ice/EventHandler.h b/cpp/src/Ice/EventHandler.h index 9394984f339..1081abb7424 100644 --- a/cpp/src/Ice/EventHandler.h +++ b/cpp/src/Ice/EventHandler.h @@ -14,7 +14,6 @@ #include <Ice/EventHandlerF.h> #include <Ice/InstanceF.h> #include <Ice/ThreadPoolF.h> -#include <Ice/BasicStream.h> #include <Ice/Network.h> #include <Ice/VirtualShared.h> diff --git a/cpp/src/Ice/Exception.cpp b/cpp/src/Ice/Exception.cpp index 20203c94d52..8377c6c2230 100644 --- a/cpp/src/Ice/Exception.cpp +++ b/cpp/src/Ice/Exception.cpp @@ -12,8 +12,8 @@ #include <Ice/Network.h> #include <Ice/Plugin.h> #include <Ice/SlicedData.h> -#include <Ice/BasicStream.h> -#include <Ice/Stream.h> +#include <Ice/OutputStream.h> +#include <Ice/InputStream.h> #include <IceUtil/StringUtil.h> #ifdef ICE_OS_WINRT # include <IceUtil/StringConverter.h> @@ -103,23 +103,7 @@ throwMarshalException(const char* file, int line, const string& reason) } void -Ice::UserException::__write(::IceInternal::BasicStream* os) const -{ - os->startWriteException(0); - __writeImpl(os); - os->endWriteException(); -} - -void -Ice::UserException::__read(::IceInternal::BasicStream* is) -{ - is->startReadException(); - __readImpl(is); - is->endReadException(false); -} - -void -Ice::UserException::__write(const Ice::OutputStreamPtr& os) const +Ice::UserException::__write(::Ice::OutputStream* os) const { os->startException(0); __writeImpl(os); @@ -127,25 +111,13 @@ Ice::UserException::__write(const Ice::OutputStreamPtr& os) const } void -Ice::UserException::__read(const Ice::InputStreamPtr& is) +Ice::UserException::__read(::Ice::InputStream* is) { is->startException(); __readImpl(is); is->endException(false); } -void -Ice::UserException::__writeImpl(const Ice::OutputStreamPtr&) const -{ - throw MarshalException(__FILE__, __LINE__, "user exception was not generated with stream support"); -} - -void -Ice::UserException::__readImpl(const Ice::InputStreamPtr&) -{ - throw MarshalException(__FILE__, __LINE__, "user exception was not generated with stream support"); -} - bool Ice::UserException::__usesClasses() const { diff --git a/cpp/src/Ice/FactoryTable.cpp b/cpp/src/Ice/FactoryTable.cpp index 78d2c88434f..d8b37ec8b58 100644 --- a/cpp/src/Ice/FactoryTable.cpp +++ b/cpp/src/Ice/FactoryTable.cpp @@ -17,7 +17,7 @@ using namespace std; // If the factory is present already, increment its reference count. // void -IceInternal::FactoryTable::addExceptionFactory(const string& t, const IceInternal::UserExceptionFactoryPtr& f) +IceInternal::FactoryTable::addExceptionFactory(const string& t, const Ice::UserExceptionFactoryPtr& f) { IceUtil::Mutex::Lock lock(_m); assert(f); @@ -35,12 +35,12 @@ IceInternal::FactoryTable::addExceptionFactory(const string& t, const IceInterna // // Return the exception factory for a given type ID // -IceInternal::UserExceptionFactoryPtr +Ice::UserExceptionFactoryPtr IceInternal::FactoryTable::getExceptionFactory(const string& t) const { IceUtil::Mutex::Lock lock(_m); EFTable::const_iterator i = _eft.find(t); - return i != _eft.end() ? i->second.first : IceInternal::UserExceptionFactoryPtr(); + return i != _eft.end() ? i->second.first : Ice::UserExceptionFactoryPtr(); } // diff --git a/cpp/src/Ice/HttpParser.cpp b/cpp/src/Ice/HttpParser.cpp index ab0ae40bcc4..90f0979e7c1 100644 --- a/cpp/src/Ice/HttpParser.cpp +++ b/cpp/src/Ice/HttpParser.cpp @@ -9,7 +9,6 @@ #include <IceUtil/Config.h> #include <Ice/HttpParser.h> -#include <Ice/BasicStream.h> #include <Ice/LocalException.h> #include <IceUtil/StringUtil.h> diff --git a/cpp/src/Ice/IPEndpointI.cpp b/cpp/src/Ice/IPEndpointI.cpp index 82da554a960..fd03236dbd9 100644 --- a/cpp/src/Ice/IPEndpointI.cpp +++ b/cpp/src/Ice/IPEndpointI.cpp @@ -18,6 +18,7 @@ #include <IceUtil/MutexPtrLock.h> using namespace std; +using namespace Ice; using namespace Ice::Instrumentation; using namespace IceInternal; @@ -105,11 +106,11 @@ IceInternal::IPEndpointI::secure() const } void -IceInternal::IPEndpointI::streamWrite(BasicStream* s) const +IceInternal::IPEndpointI::streamWrite(OutputStream* s) const { - s->startWriteEncaps(); + s->startEncapsulation(); streamWriteImpl(s); - s->endWriteEncaps(); + s->endEncapsulation(); } const string& @@ -354,7 +355,7 @@ IceInternal::IPEndpointI::connectors(const vector<Address>& addresses, const Net } void -IceInternal::IPEndpointI::streamWriteImpl(BasicStream* s) const +IceInternal::IPEndpointI::streamWriteImpl(OutputStream* s) const { s->write(_host, false); s->write(_port); @@ -496,7 +497,7 @@ IceInternal::IPEndpointI::IPEndpointI(const ProtocolInstancePtr& instance) : { } -IceInternal::IPEndpointI::IPEndpointI(const ProtocolInstancePtr& instance, BasicStream* s) : +IceInternal::IPEndpointI::IPEndpointI(const ProtocolInstancePtr& instance, InputStream* s) : _instance(instance), _port(0), _hashInitialized(false) diff --git a/cpp/src/Ice/IPEndpointI.h b/cpp/src/Ice/IPEndpointI.h index 8e5e033647f..eb899cd5921 100644 --- a/cpp/src/Ice/IPEndpointI.h +++ b/cpp/src/Ice/IPEndpointI.h @@ -51,7 +51,7 @@ public: virtual Ice::Short type() const; virtual const std::string& protocol() const; virtual bool secure() const; - virtual void streamWrite(BasicStream*) const; + virtual void streamWrite(Ice::OutputStream*) const; virtual const std::string& connectionId() const; virtual EndpointIPtr connectionId(const ::std::string&) const; @@ -74,7 +74,7 @@ public: const std::string& host() const; int port() const; - virtual void streamWriteImpl(BasicStream*) const; + virtual void streamWriteImpl(Ice::OutputStream*) const; virtual void hashInit(Ice::Int&) const; virtual void fillEndpointInfo(Ice::IPEndpointInfo*) const; @@ -93,7 +93,7 @@ protected: IPEndpointI(const ProtocolInstancePtr&, const std::string&, int, const Address&, const std::string&); IPEndpointI(const ProtocolInstancePtr&); - IPEndpointI(const ProtocolInstancePtr&, BasicStream*); + IPEndpointI(const ProtocolInstancePtr&, Ice::InputStream*); const ProtocolInstancePtr _instance; const std::string _host; diff --git a/cpp/src/Ice/ImplicitContextI.cpp b/cpp/src/Ice/ImplicitContextI.cpp index a4d58f9e9b7..96905f661f2 100644 --- a/cpp/src/Ice/ImplicitContextI.cpp +++ b/cpp/src/Ice/ImplicitContextI.cpp @@ -8,7 +8,7 @@ // ********************************************************************** #include <Ice/ImplicitContextI.h> -#include <Ice/BasicStream.h> +#include <Ice/OutputStream.h> #include <Ice/Object.h> #include <IceUtil/Mutex.h> #include <IceUtil/MutexPtrLock.h> @@ -31,7 +31,7 @@ public: virtual string put(const string&, const string&); virtual string remove(const string&); - virtual void write(const Context&, ::IceInternal::BasicStream*) const; + virtual void write(const Context&, ::Ice::OutputStream*) const; virtual void combine(const Context&, Context&) const; private: @@ -55,7 +55,7 @@ public: virtual string put(const string&, const string&); virtual string remove(const string&); - virtual void write(const Context&, ::IceInternal::BasicStream*) const; + virtual void write(const Context&, ::Ice::OutputStream*) const; virtual void combine(const Context&, Context&) const; struct Slot @@ -217,7 +217,7 @@ SharedImplicitContext::remove(const string& k) } void -SharedImplicitContext::write(const Context& proxyCtx, ::IceInternal::BasicStream* s) const +SharedImplicitContext::write(const Context& proxyCtx, ::Ice::OutputStream* s) const { IceUtil::Mutex::Lock lock(_mutex); if(proxyCtx.size() == 0) @@ -577,7 +577,7 @@ PerThreadImplicitContext::remove(const string& k) } void -PerThreadImplicitContext::write(const Context& proxyCtx, ::IceInternal::BasicStream* s) const +PerThreadImplicitContext::write(const Context& proxyCtx, ::Ice::OutputStream* s) const { const Context* threadCtx = getThreadContext(false); diff --git a/cpp/src/Ice/ImplicitContextI.h b/cpp/src/Ice/ImplicitContextI.h index 3fa3292fb1f..22c52e38bf1 100644 --- a/cpp/src/Ice/ImplicitContextI.h +++ b/cpp/src/Ice/ImplicitContextI.h @@ -36,7 +36,7 @@ public: // (entries in the given context overwrite entries in // the underlying context) // - virtual void write(const Context&, ::IceInternal::BasicStream*) const = 0; + virtual void write(const Context&, ::Ice::OutputStream*) const = 0; // // Combines the underlying context plus the given context diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp index 18b0e23301f..fafdb3cce83 100644 --- a/cpp/src/Ice/Incoming.cpp +++ b/cpp/src/Ice/Incoming.cpp @@ -89,7 +89,7 @@ IceInternal::IncomingBase::__adopt(IncomingBase& other) other._responseHandler = 0; } -BasicStream* +OutputStream* IncomingBase::__startWriteParams(FormatType format) { if(!_response) @@ -100,7 +100,7 @@ IncomingBase::__startWriteParams(FormatType format) assert(_os.b.size() == headerSize + 4); // Reply status position. assert(_current.encoding >= Ice::Encoding_1_0); // Encoding for reply is known. _os.write(static_cast<Ice::Byte>(0)); - _os.startWriteEncaps(_current.encoding, format); + _os.startEncapsulation(_current.encoding, format); // // We still return the stream even if no response is expected. The @@ -123,7 +123,7 @@ IncomingBase::__endWriteParams(bool ok) if(_response) { *(_os.b.begin() + headerSize + 4) = ok ? replyOK : replyUserException; // Reply status position. - _os.endWriteEncaps(); + _os.endEncapsulation(); } } @@ -135,7 +135,7 @@ IncomingBase::__writeEmptyParams() assert(_os.b.size() == headerSize + 4); // Reply status position. assert(_current.encoding >= Ice::Encoding_1_0); // Encoding for reply is known. _os.write(replyOK); - _os.writeEmptyEncaps(_current.encoding); + _os.writeEmptyEncapsulation(_current.encoding); } } @@ -154,11 +154,11 @@ IncomingBase::__writeParamEncaps(const Byte* v, Ice::Int sz, bool ok) _os.write(ok ? replyOK : replyUserException); if(sz == 0) { - _os.writeEmptyEncaps(_current.encoding); + _os.writeEmptyEncapsulation(_current.encoding); } else { - _os.writeEncaps(v, sz); + _os.writeEncapsulation(v, sz); } } } @@ -166,7 +166,7 @@ IncomingBase::__writeParamEncaps(const Byte* v, Ice::Int sz, bool ok) void IncomingBase::__writeUserException(const Ice::UserException& ex, Ice::FormatType format) { - ::IceInternal::BasicStream* __os = __startWriteParams(format); + ::Ice::OutputStream* __os = __startWriteParams(format); __os->write(ex); __endWriteParams(false); } @@ -235,9 +235,9 @@ IceInternal::IncomingBase::__servantLocatorFinished(bool amd) { _os.b.resize(headerSize + 4); // Reply status position. _os.write(replyUserException); - _os.startWriteEncaps(_current.encoding, DefaultFormat); + _os.startEncapsulation(_current.encoding, DefaultFormat); _os.write(ex); - _os.endWriteEncaps(); + _os.endEncapsulation(); _observer.reply(static_cast<Int>(_os.b.size() - headerSize - 4)); _responseHandler->sendResponse(_current.requestId, &_os, _compress, amd); } @@ -571,11 +571,11 @@ IceInternal::Incoming::setActive(IncomingAsync& cb) } void -IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager, BasicStream* stream) +IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager, InputStream* stream) { _is = stream; - BasicStream::Container::iterator start = _is->i; + InputStream::Container::iterator start = _is->i; // // Read the current. @@ -651,16 +651,16 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager, BasicStre } catch(const UserException& ex) { - Ice::EncodingVersion encoding = _is->skipEncaps(); // Required for batch requests. + Ice::EncodingVersion encoding = _is->skipEncapsulation(); // Required for batch requests. _observer.userException(); if(_response) { _os.write(replyUserException); - _os.startWriteEncaps(encoding, DefaultFormat); + _os.startEncapsulation(encoding, DefaultFormat); _os.write(ex); - _os.endWriteEncaps(); + _os.endEncapsulation(); _observer.reply(static_cast<Int>(_os.b.size() - headerSize - 4)); _responseHandler->sendResponse(_current.requestId, &_os, _compress, false); } @@ -675,13 +675,13 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager, BasicStre } catch(const std::exception& ex) { - _is->skipEncaps(); // Required for batch requests. + _is->skipEncapsulation(); // Required for batch requests. __handleException(ex, false); return; } catch(...) { - _is->skipEncaps(); // Required for batch requests. + _is->skipEncapsulation(); // Required for batch requests. __handleException(false); return; } @@ -713,7 +713,7 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager, BasicStre // Skip the input parameters, this is required for reading // the next batch request if dispatching batch requests. // - _is->skipEncaps(); + _is->skipEncapsulation(); if(servantManager && servantManager->hasServant(_current.id)) { diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp index bdb3f4360ad..63d89b45182 100644 --- a/cpp/src/Ice/Initialize.cpp +++ b/cpp/src/Ice/Initialize.cpp @@ -13,7 +13,6 @@ #include <Ice/PropertiesI.h> #include <Ice/Initialize.h> #include <Ice/LocalException.h> -#include <Ice/StreamI.h> #include <Ice/LoggerI.h> #include <Ice/Instance.h> #include <Ice/PluginManagerI.h> @@ -262,85 +261,6 @@ Ice::initialize(const InitializationData& initData, Int version) return communicator; } -namespace -{ - -pair<const Byte*, const Byte*> -makePair(const vector<Byte>& v) -{ - if(v.empty()) - { - return pair<const Byte*, const Byte*>(static_cast<Byte*>(0), static_cast<Byte*>(0)); - } - else - { - return pair<const Byte*, const Byte*>(&v[0], &v[0] + v.size()); - } -} - -} -InputStreamPtr -Ice::createInputStream(const CommunicatorPtr& communicator, const vector<Byte>& bytes) -{ - return new InputStreamI(communicator, makePair(bytes), true); -} - -InputStreamPtr -Ice::createInputStream(const CommunicatorPtr& communicator, const vector<Byte>& bytes, const EncodingVersion& v) -{ - return new InputStreamI(communicator, makePair(bytes), v, true); -} - -InputStreamPtr -Ice::wrapInputStream(const CommunicatorPtr& communicator, const vector<Byte>& bytes) -{ - return new InputStreamI(communicator, makePair(bytes), false); -} - -InputStreamPtr -Ice::wrapInputStream(const CommunicatorPtr& communicator, const vector<Byte>& bytes, const EncodingVersion& v) -{ - return new InputStreamI(communicator, makePair(bytes), v, false); -} - -InputStreamPtr -Ice::createInputStream(const CommunicatorPtr& communicator, const pair<const Ice::Byte*, const Ice::Byte*>& bytes) -{ - return new InputStreamI(communicator, bytes, true); -} - -InputStreamPtr -Ice::createInputStream(const CommunicatorPtr& communicator, const pair<const Ice::Byte*, const Ice::Byte*>& bytes, - const EncodingVersion& v) -{ - return new InputStreamI(communicator, bytes, v, true); -} - -InputStreamPtr -Ice::wrapInputStream(const CommunicatorPtr& communicator, const pair<const Ice::Byte*, const Ice::Byte*>& bytes) -{ - return new InputStreamI(communicator, bytes, false); -} - -InputStreamPtr -Ice::wrapInputStream(const CommunicatorPtr& communicator, const pair<const Ice::Byte*, const Ice::Byte*>& bytes, - const EncodingVersion& v) -{ - return new InputStreamI(communicator, bytes, v, false); -} - -OutputStreamPtr -Ice::createOutputStream(const CommunicatorPtr& communicator) -{ - return new OutputStreamI(communicator); -} - -OutputStreamPtr -Ice::createOutputStream(const CommunicatorPtr& communicator, const EncodingVersion& v) -{ - return new OutputStreamI(communicator, v); -} - LoggerPtr Ice::getProcessLogger() { diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/InputStream.cpp index 7599b6b8223..535d26a5d96 100644 --- a/cpp/src/Ice/BasicStream.cpp +++ b/cpp/src/Ice/InputStream.cpp @@ -8,14 +8,13 @@ // ********************************************************************** #include <IceUtil/DisableWarnings.h> -#include <Ice/BasicStream.h> +#include <Ice/InputStream.h> #include <Ice/DefaultsAndOverrides.h> #include <Ice/Instance.h> #include <Ice/Object.h> #include <Ice/Proxy.h> #include <Ice/ProxyFactory.h> #include <Ice/ValueFactory.h> -#include <Ice/ValueFactoryManager.h> #include <Ice/UserExceptionFactory.h> #include <Ice/LocalException.h> #include <Ice/Protocol.h> @@ -31,119 +30,170 @@ using namespace std; using namespace Ice; using namespace IceInternal; -namespace +Ice::InputStream::InputStream() { + initialize(currentEncoding); +} -class StreamUTF8BufferI : public IceUtil::UTF8Buffer +Ice::InputStream::InputStream(const vector<Byte>& v) : + Buffer(v) { -public: + initialize(currentEncoding); +} - StreamUTF8BufferI(BasicStream& stream) : - _stream(stream) - { - } +Ice::InputStream::InputStream(const pair<const Byte*, const Byte*>& p) : + Buffer(p.first, p.second) +{ + initialize(currentEncoding); +} - Ice::Byte* - getMoreBytes(size_t howMany, Ice::Byte* firstUnused) - { - assert(howMany > 0); +Ice::InputStream::InputStream(Buffer& buf, bool adopt) : + Buffer(buf, adopt) +{ + initialize(currentEncoding); +} - if(firstUnused != 0) - { - // - // Return unused bytes - // - _stream.resize(firstUnused - _stream.b.begin()); - } +Ice::InputStream::InputStream(const CommunicatorPtr& communicator) +{ + initialize(communicator); +} - // - // Index of first unused byte - // - Buffer::Container::size_type pos = _stream.b.size(); +Ice::InputStream::InputStream(const CommunicatorPtr& communicator, const vector<Byte>& v) : + Buffer(v) +{ + initialize(communicator); +} - // - // Since resize may reallocate the buffer, when firstUnused != 0, the - // return value can be != firstUnused - // - _stream.resize(pos + howMany); +Ice::InputStream::InputStream(const CommunicatorPtr& communicator, const pair<const Byte*, const Byte*>& p) : + Buffer(p.first, p.second) +{ + initialize(communicator); +} - return &_stream.b[pos]; - } +Ice::InputStream::InputStream(const CommunicatorPtr& communicator, Buffer& buf, bool adopt) : + Buffer(buf, adopt) +{ + initialize(communicator); +} + +Ice::InputStream::InputStream(const EncodingVersion& encoding) +{ + initialize(encoding); +} -private: +Ice::InputStream::InputStream(const EncodingVersion& encoding, const vector<Byte>& v) : + Buffer(v) +{ + initialize(encoding); +} - BasicStream& _stream; -}; +Ice::InputStream::InputStream(const EncodingVersion& encoding, const pair<const Byte*, const Byte*>& p) : + Buffer(p.first, p.second) +{ + initialize(encoding); +} -const Byte OPTIONAL_END_MARKER = 0xFF; +Ice::InputStream::InputStream(const EncodingVersion& encoding, Buffer& buf, bool adopt) : + Buffer(buf, adopt) +{ + initialize(encoding); +} -const Byte FLAG_HAS_TYPE_ID_STRING = (1<<0); -const Byte FLAG_HAS_TYPE_ID_INDEX = (1<<1); -const Byte FLAG_HAS_TYPE_ID_COMPACT = (1<<0) | (1<<1); -const Byte FLAG_HAS_OPTIONAL_MEMBERS = (1<<2); -const Byte FLAG_HAS_INDIRECTION_TABLE = (1<<3); -const Byte FLAG_HAS_SLICE_SIZE = (1<<4); -const Byte FLAG_IS_LAST_SLICE = (1<<5); +Ice::InputStream::InputStream(const CommunicatorPtr& communicator, const EncodingVersion& encoding) +{ + initialize(communicator, encoding); +} +Ice::InputStream::InputStream(const CommunicatorPtr& communicator, const EncodingVersion& encoding, + const vector<Byte>& v) : + Buffer(v) +{ + initialize(communicator, encoding); } +Ice::InputStream::InputStream(const CommunicatorPtr& communicator, const EncodingVersion& encoding, + const pair<const Byte*, const Byte*>& p) : + Buffer(p.first, p.second) +{ + initialize(communicator, encoding); +} -IceInternal::BasicStream::BasicStream(Instance* instance, const EncodingVersion& encoding) : - _instance(instance), - _closure(0), - _encoding(encoding), - _currentReadEncaps(0), - _currentWriteEncaps(0), - _sliceObjects(true), - _stringConverter(instance->getStringConverter()), - _wstringConverter(instance->getWstringConverter()), - _startSeq(-1), - _minSeqSize(0) +Ice::InputStream::InputStream(const CommunicatorPtr& communicator, const EncodingVersion& encoding, + Buffer& buf, bool adopt) : + Buffer(buf, adopt) { - // - // Initialize the encoding members of our pre-allocated encapsulations, in case - // this stream is used without an explicit encapsulation. - // - _preAllocatedReadEncaps.encoding = encoding; - _preAllocatedWriteEncaps.encoding = encoding; + initialize(communicator, encoding); +} + +Ice::InputStream::InputStream(Instance* instance, const EncodingVersion& encoding) +{ + initialize(instance, encoding); +} + +Ice::InputStream::InputStream(Instance* instance, const EncodingVersion& encoding, Buffer& buf, bool adopt) : + Buffer(buf, adopt) +{ + initialize(instance, encoding); } -IceInternal::BasicStream::BasicStream(Instance* instance, const EncodingVersion& encoding, const Byte* begin, - const Byte* end) : - IceInternal::Buffer(begin, end), - _instance(instance), - _closure(0), - _encoding(encoding), - _currentReadEncaps(0), - _currentWriteEncaps(0), - _sliceObjects(true), - _stringConverter(instance->getStringConverter()), - _wstringConverter(instance->getWstringConverter()), - _startSeq(-1), - _minSeqSize(0) +void +Ice::InputStream::initialize(const CommunicatorPtr& communicator) { + Instance* instance = getInstance(communicator).get(); + initialize(instance, instance->defaultsAndOverrides()->defaultEncoding); +} + +void +Ice::InputStream::initialize(const CommunicatorPtr& communicator, const EncodingVersion& encoding) +{ + initialize(getInstance(communicator).get(), encoding); +} + +void +Ice::InputStream::initialize(Instance* instance, const EncodingVersion& encoding) +{ + initialize(encoding); + + _instance = instance; + + _stringConverter = _instance->getStringConverter(); + _wstringConverter = _instance->getWstringConverter(); + +#ifndef ICE_CPP11_MAPPING + _collectObjects = _instance->collectObjects(); +#endif + _traceSlicing = _instance->traceLevels()->slicing > 0; +} + +void +Ice::InputStream::initialize(const EncodingVersion& encoding) +{ + _instance = 0; + _encoding = encoding; + _currentEncaps = 0; +#ifndef ICE_CPP11_MAPPING + _collectObjects = false; +#endif + _traceSlicing = false; + _closure = 0; + _sliceObjects = true; + _startSeq = -1; + _minSeqSize = 0; + // - // Initialize the encoding members of our pre-allocated encapsulations, in case + // Initialize the encoding members of our pre-allocated encapsulation, in case // this stream is used without an explicit encapsulation. // - _preAllocatedReadEncaps.encoding = encoding; - _preAllocatedWriteEncaps.encoding = encoding; + _preAllocatedEncaps.encoding = encoding; } void -IceInternal::BasicStream::clear() +Ice::InputStream::clear() { - while(_currentReadEncaps && _currentReadEncaps != &_preAllocatedReadEncaps) + while(_currentEncaps && _currentEncaps != &_preAllocatedEncaps) { - ReadEncaps* oldEncaps = _currentReadEncaps; - _currentReadEncaps = _currentReadEncaps->previous; - delete oldEncaps; - } - - while(_currentWriteEncaps && _currentWriteEncaps != &_preAllocatedWriteEncaps) - { - WriteEncaps* oldEncaps = _currentWriteEncaps; - _currentWriteEncaps = _currentWriteEncaps->previous; + Encaps* oldEncaps = _currentEncaps; + _currentEncaps = _currentEncaps->previous; delete oldEncaps; } @@ -151,14 +201,63 @@ IceInternal::BasicStream::clear() _sliceObjects = true; } +void +Ice::InputStream::setStringConverters(const IceUtil::StringConverterPtr& sc, const IceUtil::WstringConverterPtr& wsc) +{ + _stringConverter = sc; + _wstringConverter = wsc; +} + +void +Ice::InputStream::setValueFactoryManager(const ValueFactoryManagerPtr& vfm) +{ + _valueFactoryManager = vfm; +} + +void +Ice::InputStream::setLogger(const LoggerPtr& logger) +{ + _logger = logger; +} + +void +#ifdef ICE_CPP11_MAPPING +Ice::InputStream::setCompactIdResolver(std::function<std::string (int)> r) +#else +Ice::InputStream::setCompactIdResolver(const CompactIdResolverPtr& r) +#endif +{ + _compactIdResolver = r; +} + +#ifndef ICE_CPP11_MAPPING +void +Ice::InputStream::setCollectObjects(bool b) +{ + _collectObjects = b; +} +#endif + +void +Ice::InputStream::setSliceObjects(bool b) +{ + _sliceObjects = b; +} + +void +Ice::InputStream::setTraceSlicing(bool b) +{ + _traceSlicing = b; +} + void* -IceInternal::BasicStream::closure() const +Ice::InputStream::getClosure() const { return _closure; } void* -IceInternal::BasicStream::closure(void* p) +Ice::InputStream::setClosure(void* p) { void* prev = _closure; _closure = p; @@ -166,95 +265,64 @@ IceInternal::BasicStream::closure(void* p) } void -IceInternal::BasicStream::swap(BasicStream& other) +Ice::InputStream::swap(InputStream& other) { assert(_instance == other._instance); swapBuffer(other); + std::swap(_encoding, other._encoding); + +#ifndef ICE_CPP11_MAPPING + std::swap(_collectObjects, other._collectObjects); +#endif + + std::swap(_traceSlicing, other._traceSlicing); + std::swap(_closure, other._closure); + std::swap(_sliceObjects, other._sliceObjects); + // - // Swap is never called for BasicStreams that have encapsulations being read/write. However, - // encapsulations might still be set in case marhsalling or un-marhsalling failed. We just + // Swap is never called for streams that have encapsulations being read. However, + // encapsulations might still be set in case unmarshaling failed. We just // reset the encapsulations if there are still some set. // - resetEncaps(); - other.resetEncaps(); + resetEncapsulation(); + other.resetEncapsulation(); std::swap(_startSeq, other._startSeq); std::swap(_minSeqSize, other._minSeqSize); -} -void -IceInternal::BasicStream::resetEncaps() -{ - while(_currentReadEncaps && _currentReadEncaps != &_preAllocatedReadEncaps) - { - ReadEncaps* oldEncaps = _currentReadEncaps; - _currentReadEncaps = _currentReadEncaps->previous; - delete oldEncaps; - } - - while(_currentWriteEncaps && _currentWriteEncaps != &_preAllocatedWriteEncaps) - { - WriteEncaps* oldEncaps = _currentWriteEncaps; - _currentWriteEncaps = _currentWriteEncaps->previous; - delete oldEncaps; - } - - _preAllocatedReadEncaps.reset(); - _preAllocatedWriteEncaps.reset(); + std::swap(_stringConverter, other._stringConverter); + std::swap(_wstringConverter, other._wstringConverter); + std::swap(_valueFactoryManager, other._valueFactoryManager); + std::swap(_logger, other._logger); + std::swap(_compactIdResolver, other._compactIdResolver); } void -IceInternal::BasicStream::startWriteEncaps() +Ice::InputStream::resetEncapsulation() { - // - // If no encoding version is specified, use the current write - // encapsulation encoding version if there's a current write - // encapsulation, otherwise, use the stream encoding version. - // - - if(_currentWriteEncaps) - { - startWriteEncaps(_currentWriteEncaps->encoding, _currentWriteEncaps->format); - } - else - { - startWriteEncaps(_encoding, Ice::DefaultFormat); - } -} - -void -IceInternal::BasicStream::endWriteEncapsChecked() -{ - if(!_currentWriteEncaps) + while(_currentEncaps && _currentEncaps != &_preAllocatedEncaps) { - throw EncapsulationException(__FILE__, __LINE__, "not in an encapsulation"); + Encaps* oldEncaps = _currentEncaps; + _currentEncaps = _currentEncaps->previous; + delete oldEncaps; } - endWriteEncaps(); -} -void -IceInternal::BasicStream::endReadEncapsChecked() -{ - if(!_currentReadEncaps) - { - throw EncapsulationException(__FILE__, __LINE__, "not in an encapsulation"); - } - endReadEncaps(); + _preAllocatedEncaps.reset(); } Int -IceInternal::BasicStream::getReadEncapsSize() +Ice::InputStream::getEncapsSize() { - assert(_currentReadEncaps); - return _currentReadEncaps->sz - static_cast<Int>(sizeof(Int)) - 2; + assert(_currentEncaps); + return _currentEncaps->sz - static_cast<Int>(sizeof(Int)) - 2; } EncodingVersion -IceInternal::BasicStream::skipEncaps() +Ice::InputStream::skipEncapsulation() { Int sz; read(sz); @@ -274,13 +342,13 @@ IceInternal::BasicStream::skipEncaps() } void -IceInternal::BasicStream::readPendingObjects() +Ice::InputStream::readPendingObjects() { - if(_currentReadEncaps && _currentReadEncaps->decoder) + if(_currentEncaps && _currentEncaps->decoder) { - _currentReadEncaps->decoder->readPendingObjects(); + _currentEncaps->decoder->readPendingObjects(); } - else if(getReadEncoding() == Ice::Encoding_1_0) + else if(getEncoding() == Ice::Encoding_1_0) { // // If using the 1.0 encoding and no objects were read, we @@ -295,30 +363,8 @@ IceInternal::BasicStream::readPendingObjects() } } -void -IceInternal::BasicStream::writePendingObjects() -{ - if(_currentWriteEncaps && _currentWriteEncaps->encoder) - { - _currentWriteEncaps->encoder->writePendingObjects(); - } - else if(getWriteEncoding() == Ice::Encoding_1_0) - { - // - // If using the 1.0 encoding and no objects were written, we - // still write an empty sequence for pending objects if - // requested (i.e.: if this is called). - // - // This is required by the 1.0 encoding, even if no objects - // are written we do marshal an empty sequence if marshaled - // data types use classes. - // - writeSize(0); - } -} - Int -IceInternal::BasicStream::readAndCheckSeqSize(int minSize) +Ice::InputStream::readAndCheckSeqSize(int minSize) { Int sz = readSize(); @@ -368,18 +414,7 @@ IceInternal::BasicStream::readAndCheckSeqSize(int minSize) } void -IceInternal::BasicStream::writeBlob(const vector<Byte>& v) -{ - if(!v.empty()) - { - Container::size_type pos = b.size(); - resize(pos + v.size()); - memcpy(&b[pos], &v[0], v.size()); - } -} - -void -IceInternal::BasicStream::readBlob(vector<Byte>& v, Int sz) +Ice::InputStream::readBlob(vector<Byte>& v, Int sz) { if(sz > 0) { @@ -397,20 +432,7 @@ IceInternal::BasicStream::readBlob(vector<Byte>& v, Int sz) } void -IceInternal::BasicStream::write(const Byte* begin, const Byte* end) -{ - Int sz = static_cast<Int>(end - begin); - writeSize(sz); - if(sz > 0) - { - Container::size_type pos = b.size(); - resize(pos + sz); - memcpy(&b[pos], begin, sz); - } -} - -void -IceInternal::BasicStream::read(std::vector<Ice::Byte>& v) +Ice::InputStream::read(std::vector<Ice::Byte>& v) { std::pair<const Ice::Byte*, const Ice::Byte*> p; read(p); @@ -426,7 +448,7 @@ IceInternal::BasicStream::read(std::vector<Ice::Byte>& v) } void -IceInternal::BasicStream::read(pair<const Byte*, const Byte*>& v) +Ice::InputStream::read(pair<const Byte*, const Byte*>& v) { Int sz = readAndCheckSeqSize(1); if(sz > 0) @@ -442,59 +464,7 @@ IceInternal::BasicStream::read(pair<const Byte*, const Byte*>& v) } void -IceInternal::BasicStream::write(const vector<bool>& v) -{ - Int sz = static_cast<Int>(v.size()); - writeSize(sz); - if(sz > 0) - { - Container::size_type pos = b.size(); - resize(pos + sz); - copy(v.begin(), v.end(), b.begin() + pos); - } -} - -namespace -{ - -template<size_t boolSize> -struct BasicStreamWriteBoolHelper -{ - static void write(const bool* begin, BasicStream::Container::size_type pos, BasicStream::Container& b, Int sz) - { - for(int idx = 0; idx < sz; ++idx) - { - b[pos + idx] = static_cast<Byte>(*(begin + idx)); - } - } -}; - -template<> -struct BasicStreamWriteBoolHelper<1> -{ - static void write(const bool* begin, BasicStream::Container::size_type pos, BasicStream::Container& b, Int sz) - { - memcpy(&b[pos], begin, sz); - } -}; - -} - -void -IceInternal::BasicStream::write(const bool* begin, const bool* end) -{ - Int sz = static_cast<Int>(end - begin); - writeSize(sz); - if(sz > 0) - { - Container::size_type pos = b.size(); - resize(pos + sz); - BasicStreamWriteBoolHelper<sizeof(bool)>::write(begin, pos, b, sz); - } -} - -void -IceInternal::BasicStream::read(vector<bool>& v) +Ice::InputStream::read(vector<bool>& v) { Int sz = readAndCheckSeqSize(1); if(sz > 0) @@ -513,9 +483,9 @@ namespace { template<size_t boolSize> -struct BasicStreamReadBoolHelper +struct ReadBoolHelper { - static bool* read(pair<const bool*, const bool*>& v, Int sz, BasicStream::Container::iterator& i) + static bool* read(pair<const bool*, const bool*>& v, Int sz, InputStream::Container::iterator& i) { bool* array = new bool[sz]; for(int idx = 0; idx < sz; ++idx) @@ -529,9 +499,9 @@ struct BasicStreamReadBoolHelper }; template<> -struct BasicStreamReadBoolHelper<1> +struct ReadBoolHelper<1> { - static bool* read(pair<const bool*, const bool*>& v, Int sz, BasicStream::Container::iterator& i) + static bool* read(pair<const bool*, const bool*>& v, Int sz, InputStream::Container::iterator& i) { v.first = reinterpret_cast<bool*>(i); v.second = reinterpret_cast<bool*>(i) + sz; @@ -542,12 +512,12 @@ struct BasicStreamReadBoolHelper<1> } void -IceInternal::BasicStream::read(pair<const bool*, const bool*>& v, IceUtil::ScopedArray<bool>& result) +Ice::InputStream::read(pair<const bool*, const bool*>& v, IceUtil::ScopedArray<bool>& result) { Int sz = readAndCheckSeqSize(1); if(sz > 0) { - result.reset(BasicStreamReadBoolHelper<sizeof(bool)>::read(v, sz, i)); + result.reset(ReadBoolHelper<sizeof(bool)>::read(v, sz, i)); i += sz; } else @@ -558,48 +528,7 @@ IceInternal::BasicStream::read(pair<const bool*, const bool*>& v, IceUtil::Scope } void -IceInternal::BasicStream::write(Short v) -{ - Container::size_type pos = b.size(); - resize(pos + sizeof(Short)); - Byte* dest = &b[pos]; -#ifdef ICE_BIG_ENDIAN - const Byte* src = reinterpret_cast<const Byte*>(&v) + sizeof(Short) - 1; - *dest++ = *src--; - *dest = *src; -#else - const Byte* src = reinterpret_cast<const Byte*>(&v); - *dest++ = *src++; - *dest = *src; -#endif -} - -void -IceInternal::BasicStream::write(const Short* begin, const Short* end) -{ - Int sz = static_cast<Int>(end - begin); - writeSize(sz); - if(sz > 0) - { - Container::size_type pos = b.size(); - resize(pos + sz * sizeof(Short)); -#ifdef ICE_BIG_ENDIAN - const Byte* src = reinterpret_cast<const Byte*>(begin) + sizeof(Short) - 1; - Byte* dest = &(*(b.begin() + pos)); - for(int j = 0 ; j < sz ; ++j) - { - *dest++ = *src--; - *dest++ = *src--; - src += 2 * sizeof(Short); - } -#else - memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), sz * sizeof(Short)); -#endif - } -} - -void -IceInternal::BasicStream::read(Short& v) +Ice::InputStream::read(Short& v) { if(b.end() - i < static_cast<int>(sizeof(Short))) { @@ -619,7 +548,7 @@ IceInternal::BasicStream::read(Short& v) } void -IceInternal::BasicStream::read(vector<Short>& v) +Ice::InputStream::read(vector<Short>& v) { Int sz = readAndCheckSeqSize(static_cast<int>(sizeof(Short))); if(sz > 0) @@ -647,7 +576,7 @@ IceInternal::BasicStream::read(vector<Short>& v) } void -IceInternal::BasicStream::read(pair<const Short*, const Short*>& v, IceUtil::ScopedArray<Short>& result) +Ice::InputStream::read(pair<const Short*, const Short*>& v, IceUtil::ScopedArray<Short>& result) { Int sz = readAndCheckSeqSize(static_cast<int>(sizeof(Short))); if(sz > 0) @@ -685,33 +614,7 @@ IceInternal::BasicStream::read(pair<const Short*, const Short*>& v, IceUtil::Sco } void -IceInternal::BasicStream::write(const Int* begin, const Int* end) -{ - Int sz = static_cast<Int>(end - begin); - writeSize(sz); - if(sz > 0) - { - Container::size_type pos = b.size(); - resize(pos + sz * sizeof(Int)); -#ifdef ICE_BIG_ENDIAN - const Byte* src = reinterpret_cast<const Byte*>(begin) + sizeof(Int) - 1; - Byte* dest = &(*(b.begin() + pos)); - for(int j = 0 ; j < sz ; ++j) - { - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - src += 2 * sizeof(Int); - } -#else - memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), sz * sizeof(Int)); -#endif - } -} - -void -IceInternal::BasicStream::read(vector<Int>& v) +Ice::InputStream::read(vector<Int>& v) { Int sz = readAndCheckSeqSize(static_cast<int>(sizeof(Int))); if(sz > 0) @@ -741,7 +644,7 @@ IceInternal::BasicStream::read(vector<Int>& v) } void -IceInternal::BasicStream::read(pair<const Int*, const Int*>& v, ::IceUtil::ScopedArray<Int>& result) +Ice::InputStream::read(pair<const Int*, const Int*>& v, ::IceUtil::ScopedArray<Int>& result) { Int sz = readAndCheckSeqSize(static_cast<int>(sizeof(Int))); if(sz > 0) @@ -781,66 +684,7 @@ IceInternal::BasicStream::read(pair<const Int*, const Int*>& v, ::IceUtil::Scope } void -IceInternal::BasicStream::write(Long v) -{ - Container::size_type pos = b.size(); - resize(pos + sizeof(Long)); - Byte* dest = &b[pos]; -#ifdef ICE_BIG_ENDIAN - const Byte* src = reinterpret_cast<const Byte*>(&v) + sizeof(Long) - 1; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest = *src; -#else - const Byte* src = reinterpret_cast<const Byte*>(&v); - *dest++ = *src++; - *dest++ = *src++; - *dest++ = *src++; - *dest++ = *src++; - *dest++ = *src++; - *dest++ = *src++; - *dest++ = *src++; - *dest = *src; -#endif -} - -void -IceInternal::BasicStream::write(const Long* begin, const Long* end) -{ - Int sz = static_cast<Int>(end - begin); - writeSize(sz); - if(sz > 0) - { - Container::size_type pos = b.size(); - resize(pos + sz * sizeof(Long)); -#ifdef ICE_BIG_ENDIAN - const Byte* src = reinterpret_cast<const Byte*>(begin) + sizeof(Long) - 1; - Byte* dest = &(*(b.begin() + pos)); - for(int j = 0 ; j < sz ; ++j) - { - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - src += 2 * sizeof(Long); - } -#else - memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), sz * sizeof(Long)); -#endif - } -} - -void -IceInternal::BasicStream::read(Long& v) +Ice::InputStream::read(Long& v) { if(b.end() - i < static_cast<int>(sizeof(Long))) { @@ -872,7 +716,7 @@ IceInternal::BasicStream::read(Long& v) } void -IceInternal::BasicStream::read(vector<Long>& v) +Ice::InputStream::read(vector<Long>& v) { Int sz = readAndCheckSeqSize(static_cast<int>(sizeof(Long))); if(sz > 0) @@ -906,7 +750,7 @@ IceInternal::BasicStream::read(vector<Long>& v) } void -IceInternal::BasicStream::read(pair<const Long*, const Long*>& v, IceUtil::ScopedArray<Long>& result) +Ice::InputStream::read(pair<const Long*, const Long*>& v, IceUtil::ScopedArray<Long>& result) { Int sz = readAndCheckSeqSize(static_cast<int>(sizeof(Long))); if(sz > 0) @@ -950,54 +794,7 @@ IceInternal::BasicStream::read(pair<const Long*, const Long*>& v, IceUtil::Scope } void -IceInternal::BasicStream::write(Float v) -{ - Container::size_type pos = b.size(); - resize(pos + sizeof(Float)); - Byte* dest = &b[pos]; -#ifdef ICE_BIG_ENDIAN - const Byte* src = reinterpret_cast<const Byte*>(&v) + sizeof(Float) - 1; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest = *src; -#else - const Byte* src = reinterpret_cast<const Byte*>(&v); - *dest++ = *src++; - *dest++ = *src++; - *dest++ = *src++; - *dest = *src; -#endif -} - -void -IceInternal::BasicStream::write(const Float* begin, const Float* end) -{ - Int sz = static_cast<Int>(end - begin); - writeSize(sz); - if(sz > 0) - { - Container::size_type pos = b.size(); - resize(pos + sz * sizeof(Float)); -#ifdef ICE_BIG_ENDIAN - const Byte* src = reinterpret_cast<const Byte*>(begin) + sizeof(Float) - 1; - Byte* dest = &(*(b.begin() + pos)); - for(int j = 0 ; j < sz ; ++j) - { - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - src += 2 * sizeof(Float); - } -#else - memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), sz * sizeof(Float)); -#endif - } -} - -void -IceInternal::BasicStream::read(Float& v) +Ice::InputStream::read(Float& v) { if(b.end() - i < static_cast<int>(sizeof(Float))) { @@ -1021,7 +818,7 @@ IceInternal::BasicStream::read(Float& v) } void -IceInternal::BasicStream::read(vector<Float>& v) +Ice::InputStream::read(vector<Float>& v) { Int sz = readAndCheckSeqSize(static_cast<int>(sizeof(Float))); if(sz > 0) @@ -1051,7 +848,7 @@ IceInternal::BasicStream::read(vector<Float>& v) } void -IceInternal::BasicStream::read(pair<const Float*, const Float*>& v, IceUtil::ScopedArray<Float>& result) +Ice::InputStream::read(pair<const Float*, const Float*>& v, IceUtil::ScopedArray<Float>& result) { Int sz = readAndCheckSeqSize(static_cast<int>(sizeof(Float))); if(sz > 0) @@ -1091,92 +888,7 @@ IceInternal::BasicStream::read(pair<const Float*, const Float*>& v, IceUtil::Sco } void -IceInternal::BasicStream::write(Double v) -{ - Container::size_type pos = b.size(); - resize(pos + sizeof(Double)); - Byte* dest = &b[pos]; -#ifdef ICE_BIG_ENDIAN - const Byte* src = reinterpret_cast<const Byte*>(&v) + sizeof(Double) - 1; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest = *src; -#else - const Byte* src = reinterpret_cast<const Byte*>(&v); -# if defined(ICE_LITTLEBYTE_BIGWORD) - dest[4] = *src++; - dest[5] = *src++; - dest[6] = *src++; - dest[7] = *src++; - dest[0] = *src++; - dest[1] = *src++; - dest[2] = *src++; - dest[3] = *src; -# else - *dest++ = *src++; - *dest++ = *src++; - *dest++ = *src++; - *dest++ = *src++; - *dest++ = *src++; - *dest++ = *src++; - *dest++ = *src++; - *dest = *src; -# endif -#endif -} - -void -IceInternal::BasicStream::write(const Double* begin, const Double* end) -{ - Int sz = static_cast<Int>(end - begin); - writeSize(sz); - if(sz > 0) - { - Container::size_type pos = b.size(); - resize(pos + sz * sizeof(Double)); -#ifdef ICE_BIG_ENDIAN - const Byte* src = reinterpret_cast<const Byte*>(begin) + sizeof(Double) - 1; - Byte* dest = &(*(b.begin() + pos)); - for(int j = 0 ; j < sz ; ++j) - { - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - *dest++ = *src--; - src += 2 * sizeof(Double); - } -#elif defined(ICE_LITTLEBYTE_BIGWORD) - const Byte* src = reinterpret_cast<const Byte*>(begin); - Byte* dest = &(*(b.begin() + pos)); - for(int j = 0 ; j < sz ; ++j) - { - dest[4] = *src++; - dest[5] = *src++; - dest[6] = *src++; - dest[7] = *src++; - dest[0] = *src++; - dest[1] = *src++; - dest[2] = *src++; - dest[3] = *src++; - dest += sizeof(Double); - } -#else - memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), sz * sizeof(Double)); -#endif - } -} - -void -IceInternal::BasicStream::read(Double& v) +Ice::InputStream::read(Double& v) { if(b.end() - i < static_cast<int>(sizeof(Double))) { @@ -1219,7 +931,7 @@ IceInternal::BasicStream::read(Double& v) } void -IceInternal::BasicStream::read(vector<Double>& v) +Ice::InputStream::read(vector<Double>& v) { Int sz = readAndCheckSeqSize(static_cast<int>(sizeof(Double))); if(sz > 0) @@ -1268,7 +980,7 @@ IceInternal::BasicStream::read(vector<Double>& v) } void -IceInternal::BasicStream::read(pair<const Double*, const Double*>& v, IceUtil::ScopedArray<Double>& result) +Ice::InputStream::read(pair<const Double*, const Double*>& v, IceUtil::ScopedArray<Double>& result) { Int sz = readAndCheckSeqSize(static_cast<int>(sizeof(Double))); if(sz > 0) @@ -1327,101 +1039,14 @@ IceInternal::BasicStream::read(pair<const Double*, const Double*>& v, IceUtil::S } } -// -// NOTE: This member function is intentionally omitted in order to -// cause a link error if it is used. This is for efficiency reasons: -// writing a const char * requires a traversal of the string to get -// the string length first, which takes O(n) time, whereas getting the -// string length from a std::string takes constant time. -// -/* -void -IceInternal::BasicStream::write(const char*) -{ -} -*/ - -void -IceInternal::BasicStream::writeConverted(const char* vdata, size_t vsize) -{ - // - // What is the size of the resulting UTF-8 encoded string? - // Impossible to tell, so we guess. If we don't guess correctly, - // we'll have to fix the mistake afterwards - // - try - { - Int guessedSize = static_cast<Int>(vsize); - writeSize(guessedSize); // writeSize() only writes the size; it does not reserve any buffer space. - - size_t firstIndex = b.size(); - StreamUTF8BufferI buffer(*this); - - Byte* lastByte = _stringConverter->toUTF8(vdata, vdata + vsize, buffer); - if(lastByte != b.end()) - { - resize(lastByte - b.begin()); - } - size_t lastIndex = b.size(); - - Int actualSize = static_cast<Int>(lastIndex - firstIndex); - - // - // Check against the guess - // - if(guessedSize != actualSize) - { - if(guessedSize <= 254 && actualSize > 254) - { - // - // Move the UTF-8 sequence 4 bytes further - // Use memmove instead of memcpy since the source and destination typically overlap. - // - resize(b.size() + 4); - memmove(b.begin() + firstIndex + 4, b.begin() + firstIndex, actualSize); - } - else if(guessedSize > 254 && actualSize <= 254) - { - // - // Move the UTF-8 sequence 4 bytes back - // - memmove(b.begin() + firstIndex - 4, b.begin() + firstIndex, actualSize); - resize(b.size() - 4); - } - - if(guessedSize <= 254) - { - rewriteSize(actualSize, b.begin() + firstIndex - 1); - } - else - { - rewriteSize(actualSize, b.begin() + firstIndex - 1 - 4); - } - } - } - catch(const IceUtil::IllegalConversionException& ex) - { - throw StringConversionException(__FILE__, __LINE__, ex.reason()); - } -} - void -IceInternal::BasicStream::write(const string* begin, const string* end, bool convert) +Ice::InputStream::readConverted(string& v, int sz) { - Int sz = static_cast<Int>(end - begin); - writeSize(sz); - if(sz > 0) + if(!_stringConverter) { - for(int i = 0; i < sz; ++i) - { - write(begin[i], convert); - } + throw MarshalException(__FILE__, __LINE__, "no string converter provided"); } -} -void -IceInternal::BasicStream::readConverted(string& v, int sz) -{ try { _stringConverter->fromUTF8(i, i + sz, v); @@ -1433,7 +1058,7 @@ IceInternal::BasicStream::readConverted(string& v, int sz) } void -IceInternal::BasicStream::read(vector<string>& v, bool convert) +Ice::InputStream::read(vector<string>& v, bool convert) { Int sz = readAndCheckSeqSize(1); if(sz > 0) @@ -1451,92 +1076,13 @@ IceInternal::BasicStream::read(vector<string>& v, bool convert) } void -IceInternal::BasicStream::write(const wstring& v) +Ice::InputStream::read(wstring& v) { - if(v.empty()) + if(!_wstringConverter) { - writeSize(0); - return; + throw MarshalException(__FILE__, __LINE__, "no wstring converter provided"); } - // - // What is the size of the resulting UTF-8 encoded string? - // Impossible to tell, so we guess. If we don't guess correctly, - // we'll have to fix the mistake afterwards - // - try - { - Int guessedSize = static_cast<Int>(v.size()); - writeSize(guessedSize); // writeSize() only writes the size; it does not reserve any buffer space. - - size_t firstIndex = b.size(); - StreamUTF8BufferI buffer(*this); - - Byte* lastByte = _wstringConverter->toUTF8(v.data(), v.data() + v.size(), buffer); - if(lastByte != b.end()) - { - resize(lastByte - b.begin()); - } - size_t lastIndex = b.size(); - - Int actualSize = static_cast<Int>(lastIndex - firstIndex); - - // - // Check against the guess - // - if(guessedSize != actualSize) - { - if(guessedSize <= 254 && actualSize > 254) - { - // - // Move the UTF-8 sequence 4 bytes further - // Use memmove instead of memcpy since the source and destination typically overlap. - // - resize(b.size() + 4); - memmove(b.begin() + firstIndex + 4, b.begin() + firstIndex, actualSize); - } - else if(guessedSize > 254 && actualSize <= 254) - { - // - // Move the UTF-8 sequence 4 bytes back - // - memmove(b.begin() + firstIndex - 4, b.begin() + firstIndex, actualSize); - resize(b.size() - 4); - } - - if(guessedSize <= 254) - { - rewriteSize(actualSize, b.begin() + firstIndex - 1); - } - else - { - rewriteSize(actualSize, b.begin() + firstIndex - 1 - 4); - } - } - } - catch(const IceUtil::IllegalConversionException& ex) - { - throw StringConversionException(__FILE__, __LINE__, ex.reason()); - } -} - -void -IceInternal::BasicStream::write(const wstring* begin, const wstring* end) -{ - Int sz = static_cast<Int>(end - begin); - writeSize(sz); - if(sz > 0) - { - for(int i = 0; i < sz; ++i) - { - write(begin[i]); - } - } -} - -void -IceInternal::BasicStream::read(wstring& v) -{ Int sz = readSize(); if(sz > 0) { @@ -1562,7 +1108,7 @@ IceInternal::BasicStream::read(wstring& v) } void -IceInternal::BasicStream::read(vector<wstring>& v) +Ice::InputStream::read(vector<wstring>& v) { Int sz = readAndCheckSeqSize(1); if(sz > 0) @@ -1579,34 +1125,34 @@ IceInternal::BasicStream::read(vector<wstring>& v) } } -void -#ifdef ICE_CPP11_MAPPING -IceInternal::BasicStream::writeProxy(const shared_ptr<ObjectPrx>& v) -#else -IceInternal::BasicStream::write(const ObjectPrx& v) -#endif -{ - _instance->proxyFactory()->proxyToStream(v, this); -} - #ifdef ICE_CPP11_MAPPING shared_ptr<ObjectPrx> -IceInternal::BasicStream::readProxy() +Ice::InputStream::readProxy() { + if(!_instance) + { + throw MarshalException(__FILE__, __LINE__, "cannot unmarshal a proxy without a communicator"); + } + return _instance->proxyFactory()->streamToProxy(this); } #else void -IceInternal::BasicStream::read(ObjectPrx& v) +Ice::InputStream::read(ObjectPrx& v) { + if(!_instance) + { + throw MarshalException(__FILE__, __LINE__, "cannot unmarshal a proxy without a communicator"); + } + v = _instance->proxyFactory()->streamToProxy(this); } #endif Int -IceInternal::BasicStream::readEnum(Int maxValue) +Ice::InputStream::readEnum(Int maxValue) { - if(getReadEncoding() == Encoding_1_0) + if(getEncoding() == Encoding_1_0) { if(maxValue < 127) { @@ -1634,60 +1180,23 @@ IceInternal::BasicStream::readEnum(Int maxValue) } void -IceInternal::BasicStream::writeEnum(Int v, Int maxValue) +Ice::InputStream::throwException(const UserExceptionFactoryPtr& factory) { - if(getWriteEncoding() == Encoding_1_0) - { - if(maxValue < 127) - { - write(static_cast<Byte>(v)); - } - else if(maxValue < 32767) - { - write(static_cast<Short>(v)); - } - else - { - write(v); - } - } - else - { - writeSize(v); - } -} - -void -IceInternal::BasicStream::writeException(const UserException& e) -{ - initWriteEncaps(); - _currentWriteEncaps->encoder->write(e); -} - -void -IceInternal::BasicStream::throwException(const UserExceptionFactoryPtr& factory) -{ - initReadEncaps(); - _currentReadEncaps->decoder->throwException(factory); -} - -void -IceInternal::BasicStream::sliceObjects(bool doSlice) -{ - _sliceObjects = doSlice; + initEncaps(); + _currentEncaps->decoder->throwException(factory); } bool -IceInternal::BasicStream::readOptImpl(Int readTag, OptionalFormat expectedFormat) +Ice::InputStream::readOptImpl(Int readTag, OptionalFormat expectedFormat) { - if(getReadEncoding() == Encoding_1_0) + if(getEncoding() == Encoding_1_0) { return false; // Optional members aren't supported with the 1.0 encoding. } while(true) { - if(i >= b.begin() + _currentReadEncaps->start + _currentReadEncaps->sz) + if(i >= b.begin() + _currentEncaps->start + _currentEncaps->sz) { return false; // End of encapsulation also indicates end of optionals. } @@ -1730,31 +1239,8 @@ IceInternal::BasicStream::readOptImpl(Int readTag, OptionalFormat expectedFormat return true; // Keep the compiler happy. } -bool -IceInternal::BasicStream::writeOptImpl(Int tag, OptionalFormat type) -{ - if(getWriteEncoding() == Encoding_1_0) - { - return false; // Optional members aren't supported with the 1.0 encoding. - } - - Byte v = static_cast<Byte>(type); - if(tag < 30) - { - v |= static_cast<Byte>(tag << 3); - write(v); - } - else - { - v |= 0xF0; // tag = 30 - write(v); - writeSize(tag); - } - return true; -} - void -IceInternal::BasicStream::skipOpt(OptionalFormat type) +Ice::InputStream::skipOpt(OptionalFormat type) { switch(type) { @@ -1804,14 +1290,14 @@ IceInternal::BasicStream::skipOpt(OptionalFormat type) } void -BasicStream::skipOpts() +Ice::InputStream::skipOpts() { // // Skip remaining un-read optional members. // while(true) { - if(i >= b.begin() + _currentReadEncaps->start + _currentReadEncaps->sz) + if(i >= b.begin() + _currentEncaps->start + _currentEncaps->sz) { return; // End of encapsulation also indicates end of optionals. } @@ -1833,74 +1319,197 @@ BasicStream::skipOpts() } void -IceInternal::BasicStream::throwUnmarshalOutOfBoundsException(const char* file, int line) +Ice::InputStream::throwUnmarshalOutOfBoundsException(const char* file, int line) { throw UnmarshalOutOfBoundsException(file, line); } void -IceInternal::BasicStream::throwEncapsulationException(const char* file, int line) +Ice::InputStream::throwEncapsulationException(const char* file, int line) { throw EncapsulationException(file, line); } -void -IceInternal::BasicStream::initReadEncaps() +string +Ice::InputStream::resolveCompactId(int id) const { - if(!_currentReadEncaps) // Lazy initialization. + string type; + +#ifdef ICE_CPP11_MAPPING + function<string (int)> resolver = compactIdResolver(); +#else + CompactIdResolverPtr resolver = compactIdResolver(); +#endif + + if(resolver) { - _currentReadEncaps = &_preAllocatedReadEncaps; - _currentReadEncaps->sz = static_cast<Ice::Int>(b.size()); + try + { +#ifdef ICE_CPP11_MAPPING + type = resolver(id); +#else + type = resolver->resolve(id); +#endif + } + catch(const LocalException&) + { + throw; + } + catch(const std::exception& ex) + { + ostringstream ostr; + ostr << "exception in CompactIdResolver for ID " << id; + string msg = ostr.str(); + string what = ex.what(); + if(!what.empty()) + { + msg += ":\n" + what; + } + throw MarshalException(__FILE__, __LINE__, msg); + } + catch(...) + { + ostringstream ostr; + ostr << "unknown exception in CompactIdResolver for ID " << id; + throw MarshalException(__FILE__, __LINE__, ostr.str()); + } } - if(!_currentReadEncaps->decoder) // Lazy initialization. + return type; +} + +void +Ice::InputStream::postUnmarshal(const ValuePtr& v) const +{ + try { - ValueFactoryManagerPtr factoryManager = _instance->servantFactoryManager(); - if(_currentReadEncaps->encoding == Encoding_1_0) +#ifndef ICE_CPP11_MAPPING + if(_collectObjects) { - _currentReadEncaps->decoder = new EncapsDecoder10(this, _currentReadEncaps, _sliceObjects, factoryManager); + v->ice_collectable(true); } - else +#endif + v->ice_postUnmarshal(); + } + catch(const std::exception& ex) + { + if(logger()) { - _currentReadEncaps->decoder = new EncapsDecoder11(this, _currentReadEncaps, _sliceObjects, factoryManager); + Warning out(logger()); + out << "std::exception raised by ice_postUnmarshal:\n" << ex; + } + } + catch(...) + { + if(logger()) + { + Warning out(logger()); + out << "unknown exception raised by ice_postUnmarshal"; } } } void -IceInternal::BasicStream::initWriteEncaps() +Ice::InputStream::traceSkipSlice(const string& typeId, SliceType sliceType) const { - if(!_currentWriteEncaps) // Lazy initialization. + if(_traceSlicing && logger()) { - _currentWriteEncaps = &_preAllocatedWriteEncaps; - _currentWriteEncaps->start = b.size(); + traceSlicing(sliceType == ExceptionSlice ? "exception" : "object", typeId, "Slicing", logger()); } +} - if(_currentWriteEncaps->format == Ice::DefaultFormat) +ValueFactoryManagerPtr +Ice::InputStream::valueFactoryManager() const +{ + if(_valueFactoryManager) + { + return _valueFactoryManager; + } + else if(_instance) { - _currentWriteEncaps->format = _instance->defaultsAndOverrides()->defaultFormat; + return _instance->initializationData().valueFactoryManager; } - if(!_currentWriteEncaps->encoder) // Lazy initialization. + return 0; +} + +LoggerPtr +Ice::InputStream::logger() const +{ + if(_logger) + { + return _logger; + } + else if(_instance) { - if(_currentWriteEncaps->encoding == Encoding_1_0) + return _instance->initializationData().logger; + } + + return 0; +} + +#ifdef ICE_CPP11_MAPPING +function<string (int)> +Ice::InputStream::compactIdResolver() const +{ + if(_compactIdResolver) + { + return _compactIdResolver; + } + else if(_instance) + { + return _instance->initializationData().compactIdResolver; + } + + return nullptr; +} +#else +CompactIdResolverPtr +Ice::InputStream::compactIdResolver() const +{ + if(_compactIdResolver) + { + return _compactIdResolver; + } + else if(_instance) + { + return _instance->initializationData().compactIdResolver; + } + + return 0; +} +#endif + +void +Ice::InputStream::initEncaps() +{ + if(!_currentEncaps) // Lazy initialization. + { + _currentEncaps = &_preAllocatedEncaps; + _currentEncaps->sz = static_cast<Ice::Int>(b.size()); + } + + if(!_currentEncaps->decoder) // Lazy initialization. + { + ValueFactoryManagerPtr vfm = valueFactoryManager(); + if(_currentEncaps->encoding == Encoding_1_0) { - _currentWriteEncaps->encoder = new EncapsEncoder10(this, _currentWriteEncaps); + _currentEncaps->decoder = new EncapsDecoder10(this, _currentEncaps, _sliceObjects, vfm); } else { - _currentWriteEncaps->encoder = new EncapsEncoder11(this, _currentWriteEncaps); + _currentEncaps->decoder = new EncapsDecoder11(this, _currentEncaps, _sliceObjects, vfm); } } } string -IceInternal::BasicStream::EncapsDecoder::readTypeId(bool isIndex) +Ice::InputStream::EncapsDecoder::readTypeId(bool isIndex) { if(isIndex) { Int index = _stream->readSize(); - TypeIdReadMap::const_iterator k = _typeIdMap.find(index); + TypeIdMap::const_iterator k = _typeIdMap.find(index); if(k == _typeIdMap.end()) { throw UnmarshalOutOfBoundsException(__FILE__, __LINE__); @@ -1917,7 +1526,7 @@ IceInternal::BasicStream::EncapsDecoder::readTypeId(bool isIndex) } Ice::ValuePtr -IceInternal::BasicStream::EncapsDecoder::newInstance(const string& typeId) +Ice::InputStream::EncapsDecoder::newInstance(const string& typeId) { Ice::ValuePtr v; @@ -1925,25 +1534,32 @@ IceInternal::BasicStream::EncapsDecoder::newInstance(const string& typeId) // Try to find a factory registered for the specific type. // #ifdef ICE_CPP11_MAPPING - function<ValuePtr (const string&)> userFactory = _servantFactoryManager->find(typeId); - if(userFactory) + function<ValuePtr (const string&)> userFactory; + if(_valueFactoryManager) { - v = userFactory(typeId); + userFactory = _valueFactoryManager->find(typeId); + if(userFactory) + { + v = userFactory(typeId); + } } #else - ValueFactoryPtr userFactory = _servantFactoryManager->find(typeId); - if(userFactory) + ValueFactoryPtr userFactory; + if(_valueFactoryManager) { - v = userFactory->create(typeId); + userFactory = _valueFactoryManager->find(typeId); + if(userFactory) + { + v = userFactory->create(typeId); + } } #endif // - // If that fails, invoke the default factory if one has been - // registered. + // If that fails, invoke the default factory if one has been registered. // - if(!v) + if(!v && _valueFactoryManager) { - userFactory = _servantFactoryManager->find(""); + userFactory = _valueFactoryManager->find(""); if(userFactory) { #ifdef ICE_CPP11_MAPPING @@ -1980,7 +1596,7 @@ IceInternal::BasicStream::EncapsDecoder::newInstance(const string& typeId) } void -IceInternal::BasicStream::EncapsDecoder::addPatchEntry(Int index, PatchFunc patchFunc, void* patchAddr) +Ice::InputStream::EncapsDecoder::addPatchEntry(Int index, PatchFunc patchFunc, void* patchAddr) { assert(index > 0); @@ -2021,7 +1637,7 @@ IceInternal::BasicStream::EncapsDecoder::addPatchEntry(Int index, PatchFunc patc } void -IceInternal::BasicStream::EncapsDecoder::unmarshal(Int index, const Ice::ValuePtr& v) +Ice::InputStream::EncapsDecoder::unmarshal(Int index, const Ice::ValuePtr& v) { // // Add the object to the map of un-marshalled objects, this must @@ -2059,26 +1675,7 @@ IceInternal::BasicStream::EncapsDecoder::unmarshal(Int index, const Ice::ValuePt if(_objectList.empty() && _patchMap.empty()) { - try - { -#ifndef ICE_CPP11_MAPPING - if(_stream->instance()->collectObjects()) - { - v->ice_collectable(true); - } -#endif - v->ice_postUnmarshal(); - } - catch(const std::exception& ex) - { - Warning out(_stream->instance()->initializationData().logger); - out << "std::exception raised by ice_postUnmarshal:\n" << ex; - } - catch(...) - { - Warning out(_stream->instance()->initializationData().logger); - out << "unknown exception raised by ice_postUnmarshal"; - } + _stream->postUnmarshal(v); } else { @@ -2094,26 +1691,7 @@ IceInternal::BasicStream::EncapsDecoder::unmarshal(Int index, const Ice::ValuePt // for(ObjectList::iterator p = _objectList.begin(); p != _objectList.end(); ++p) { - try - { -#ifndef ICE_CPP11_MAPPING - if(_stream->instance()->collectObjects()) - { - (*p)->ice_collectable(true); - } -#endif - (*p)->ice_postUnmarshal(); - } - catch(const std::exception& ex) - { - Warning out(_stream->instance()->initializationData().logger); - out << "std::exception raised by ice_postUnmarshal:\n" << ex; - } - catch(...) - { - Warning out(_stream->instance()->initializationData().logger); - out << "unknown exception raised by ice_postUnmarshal"; - } + _stream->postUnmarshal(*p); } _objectList.clear(); } @@ -2121,7 +1699,7 @@ IceInternal::BasicStream::EncapsDecoder::unmarshal(Int index, const Ice::ValuePt } void -IceInternal::BasicStream::EncapsDecoder10::read(PatchFunc patchFunc, void* patchAddr) +Ice::InputStream::EncapsDecoder10::read(PatchFunc patchFunc, void* patchAddr) { assert(patchFunc && patchAddr); @@ -2152,7 +1730,7 @@ IceInternal::BasicStream::EncapsDecoder10::read(PatchFunc patchFunc, void* patch } void -IceInternal::BasicStream::EncapsDecoder10::throwException(const UserExceptionFactoryPtr& factory) +Ice::InputStream::EncapsDecoder10::throwException(const UserExceptionFactoryPtr& factory) { assert(_sliceType == NoSlice); @@ -2238,9 +1816,9 @@ IceInternal::BasicStream::EncapsDecoder10::throwException(const UserExceptionFac void #ifndef NDEBUG -IceInternal::BasicStream::EncapsDecoder10::startInstance(SliceType sliceType) +Ice::InputStream::EncapsDecoder10::startInstance(SliceType sliceType) #else -IceInternal::BasicStream::EncapsDecoder10::startInstance(SliceType) +Ice::InputStream::EncapsDecoder10::startInstance(SliceType) #endif { assert(_sliceType == sliceType); @@ -2248,7 +1826,7 @@ IceInternal::BasicStream::EncapsDecoder10::startInstance(SliceType) } SlicedDataPtr -IceInternal::BasicStream::EncapsDecoder10::endInstance(bool) +Ice::InputStream::EncapsDecoder10::endInstance(bool) { // // Read the Ice::Object slice. @@ -2268,7 +1846,7 @@ IceInternal::BasicStream::EncapsDecoder10::endInstance(bool) } const std::string& -IceInternal::BasicStream::EncapsDecoder10::startSlice() +Ice::InputStream::EncapsDecoder10::startSlice() { // // If first slice, don't read the header, it was already read in @@ -2306,31 +1884,20 @@ IceInternal::BasicStream::EncapsDecoder10::startSlice() } void -IceInternal::BasicStream::EncapsDecoder10::endSlice() +Ice::InputStream::EncapsDecoder10::endSlice() { } void -IceInternal::BasicStream::EncapsDecoder10::skipSlice() +Ice::InputStream::EncapsDecoder10::skipSlice() { - if(_stream->instance()->traceLevels()->slicing > 0) - { - const Ice::LoggerPtr& logger = _stream->instance()->initializationData().logger; - if(_sliceType == ExceptionSlice) - { - traceSlicing("exception", _typeId, _stream->instance()->traceLevels()->slicingCat, logger); - } - else - { - traceSlicing("object", _typeId, _stream->instance()->traceLevels()->slicingCat, logger); - } - } + _stream->traceSkipSlice(_typeId, _sliceType); assert(_sliceSize >= 4); _stream->skip(_sliceSize - sizeof(Int)); } void -IceInternal::BasicStream::EncapsDecoder10::readPendingObjects() +Ice::InputStream::EncapsDecoder10::readPendingObjects() { Int num; do @@ -2354,7 +1921,7 @@ IceInternal::BasicStream::EncapsDecoder10::readPendingObjects() } void -IceInternal::BasicStream::EncapsDecoder10::readInstance() +Ice::InputStream::EncapsDecoder10::readInstance() { Int index; _stream->read(index); @@ -2417,7 +1984,7 @@ IceInternal::BasicStream::EncapsDecoder10::readInstance() } void -IceInternal::BasicStream::EncapsDecoder11::read(PatchFunc patchFunc, void* patchAddr) +Ice::InputStream::EncapsDecoder11::read(PatchFunc patchFunc, void* patchAddr) { Int index = _stream->readSize(); if(index < 0) @@ -2465,7 +2032,7 @@ IceInternal::BasicStream::EncapsDecoder11::read(PatchFunc patchFunc, void* patch } void -IceInternal::BasicStream::EncapsDecoder11::throwException(const UserExceptionFactoryPtr& factory) +Ice::InputStream::EncapsDecoder11::throwException(const UserExceptionFactoryPtr& factory) { assert(!_current); @@ -2536,9 +2103,9 @@ IceInternal::BasicStream::EncapsDecoder11::throwException(const UserExceptionFac void #ifndef NDEBUG -IceInternal::BasicStream::EncapsDecoder11::startInstance(SliceType sliceType) +Ice::InputStream::EncapsDecoder11::startInstance(SliceType sliceType) #else -IceInternal::BasicStream::EncapsDecoder11::startInstance(SliceType) +Ice::InputStream::EncapsDecoder11::startInstance(SliceType) #endif { assert(_current->sliceType == sliceType); @@ -2546,7 +2113,7 @@ IceInternal::BasicStream::EncapsDecoder11::startInstance(SliceType) } SlicedDataPtr -IceInternal::BasicStream::EncapsDecoder11::endInstance(bool preserve) +Ice::InputStream::EncapsDecoder11::endInstance(bool preserve) { SlicedDataPtr slicedData; if(preserve) @@ -2560,7 +2127,7 @@ IceInternal::BasicStream::EncapsDecoder11::endInstance(bool preserve) } const std::string& -IceInternal::BasicStream::EncapsDecoder11::startSlice() +Ice::InputStream::EncapsDecoder11::startSlice() { // // If first slice, don't read the header, it was already read in @@ -2623,7 +2190,7 @@ IceInternal::BasicStream::EncapsDecoder11::startSlice() } void -IceInternal::BasicStream::EncapsDecoder11::endSlice() +Ice::InputStream::EncapsDecoder11::endSlice() { if(_current->sliceFlags & FLAG_HAS_OPTIONAL_MEMBERS) { @@ -2673,20 +2240,9 @@ IceInternal::BasicStream::EncapsDecoder11::endSlice() } void -IceInternal::BasicStream::EncapsDecoder11::skipSlice() +Ice::InputStream::EncapsDecoder11::skipSlice() { - if(_stream->instance()->traceLevels()->slicing > 0) - { - const Ice::LoggerPtr& logger = _stream->instance()->initializationData().logger; - if(_current->sliceType == ExceptionSlice) - { - traceSlicing("exception", _current->typeId, _stream->instance()->traceLevels()->slicingCat, logger); - } - else - { - traceSlicing("object", _current->typeId, _stream->instance()->traceLevels()->slicingCat, logger); - } - } + _stream->traceSkipSlice(_current->typeId, _current->sliceType); Container::iterator start = _stream->i; @@ -2700,9 +2256,9 @@ IceInternal::BasicStream::EncapsDecoder11::skipSlice() if(_current->sliceType == ObjectSlice) { throw NoValueFactoryException(__FILE__, __LINE__, - "no value factory found and compact format prevents " - "slicing (the sender should use the sliced format instead)", - _current->typeId); + "no value factory found and compact format prevents " + "slicing (the sender should use the sliced format instead)", + _current->typeId); } else { @@ -2762,7 +2318,7 @@ IceInternal::BasicStream::EncapsDecoder11::skipSlice() } bool -IceInternal::BasicStream::EncapsDecoder11::readOpt(Ice::Int readTag, Ice::OptionalFormat expectedFormat) +Ice::InputStream::EncapsDecoder11::readOpt(Ice::Int readTag, Ice::OptionalFormat expectedFormat) { if(!_current) { @@ -2776,7 +2332,7 @@ IceInternal::BasicStream::EncapsDecoder11::readOpt(Ice::Int readTag, Ice::Option } Int -IceInternal::BasicStream::EncapsDecoder11::readInstance(Int index, PatchFunc patchFunc, void* patchAddr) +Ice::InputStream::EncapsDecoder11::readInstance(Int index, PatchFunc patchFunc, void* patchAddr) { assert(index > 0); @@ -2804,11 +2360,6 @@ IceInternal::BasicStream::EncapsDecoder11::readInstance(Int index, PatchFunc pat startSlice(); const string mostDerivedId = _current->typeId; Ice::ValuePtr v; -#ifdef ICE_CPP11_MAPPING - function<string (int)> compactIdResolver = _stream->instance()->initializationData().compactIdResolver; -#else - const CompactIdResolverPtr& compactIdResolver = _stream->instance()->initializationData().compactIdResolver; -#endif while(true) { if(_current->compactId >= 0) @@ -2816,40 +2367,7 @@ IceInternal::BasicStream::EncapsDecoder11::readInstance(Int index, PatchFunc pat // // Translate a compact (numeric) type ID into a string type ID. // - _current->typeId.clear(); - if(compactIdResolver) - { - try - { -#ifdef ICE_CPP11_MAPPING - _current->typeId = compactIdResolver(_current->compactId); -#else - _current->typeId = compactIdResolver->resolve(_current->compactId); -#endif - } - catch(const LocalException&) - { - throw; - } - catch(const std::exception& ex) - { - ostringstream ostr; - ostr << "exception in CompactIdResolver for ID " << _current->compactId; - string msg = ostr.str(); - string what = ex.what(); - if(!what.empty()) - { - msg += ":\n" + what; - } - throw MarshalException(__FILE__, __LINE__, msg); - } - catch(...) - { - ostringstream ostr; - ostr << "unknown exception in CompactIdResolver for ID " << _current->compactId; - throw MarshalException(__FILE__, __LINE__, ostr.str()); - } - } + _current->typeId = _stream->resolveCompactId(_current->compactId); if(_current->typeId.empty()) { _current->typeId = IceInternal::factoryTable->getTypeId(_current->compactId); @@ -2875,7 +2393,7 @@ IceInternal::BasicStream::EncapsDecoder11::readInstance(Int index, PatchFunc pat if(!_sliceObjects) { throw NoValueFactoryException(__FILE__, __LINE__, "no value factory found and object slicing is disabled", - _current->typeId); + _current->typeId); } // @@ -2927,7 +2445,7 @@ IceInternal::BasicStream::EncapsDecoder11::readInstance(Int index, PatchFunc pat } SlicedDataPtr -IceInternal::BasicStream::EncapsDecoder11::readSlicedData() +Ice::InputStream::EncapsDecoder11::readSlicedData() { if(_current->slices.empty()) // No preserved slices. { @@ -2962,480 +2480,3 @@ IceInternal::BasicStream::EncapsDecoder11::readSlicedData() } return ICE_MAKE_SHARED(SlicedData, _current->slices); } - -Int -IceInternal::BasicStream::EncapsEncoder::registerTypeId(const string& typeId) -{ - TypeIdWriteMap::const_iterator p = _typeIdMap.find(typeId); - if(p != _typeIdMap.end()) - { - return p->second; - } - else - { - _typeIdMap.insert(make_pair(typeId, ++_typeIdIndex)); - return -1; - } -} - -void -IceInternal::BasicStream::EncapsEncoder10::write(const ValuePtr& v) -{ - // - // Object references are encoded as a negative integer in 1.0. - // - if(v) - { - _stream->write(-registerObject(v)); - } - else - { - _stream->write(0); - } -} - -void -IceInternal::BasicStream::EncapsEncoder10::write(const UserException& v) -{ - // - // User exception with the 1.0 encoding start with a boolean - // flag that indicates whether or not the exception uses - // classes. - // - // This allows reading the pending objects even if some part of - // the exception was sliced. - // - bool usesClasses = v.__usesClasses(); - _stream->write(usesClasses); - v.__write(_stream); - if(usesClasses) - { - writePendingObjects(); - } -} - -void -IceInternal::BasicStream::EncapsEncoder10::startInstance(SliceType sliceType, const SlicedDataPtr&) -{ - _sliceType = sliceType; -} - -void -IceInternal::BasicStream::EncapsEncoder10::endInstance() -{ - if(_sliceType == ObjectSlice) - { - // - // Write the Object slice. - // - startSlice(Object::ice_staticId(), -1, true); - _stream->writeSize(0); // For compatibility with the old AFM. - endSlice(); - } - _sliceType = NoSlice; -} - -void -IceInternal::BasicStream::EncapsEncoder10::startSlice(const string& typeId, int, bool /*last*/) -{ - // - // For object slices, encode a boolean to indicate how the type ID - // is encoded and the type ID either as a string or index. For - // exception slices, always encode the type ID as a string. - // - if(_sliceType == ObjectSlice) - { - Int index = registerTypeId(typeId); - if(index < 0) - { - _stream->write(false); - _stream->write(typeId, false); - } - else - { - _stream->write(true); - _stream->writeSize(index); - } - } - else - { - _stream->write(typeId, false); - } - - _stream->write(Int(0)); // Placeholder for the slice length. - - _writeSlice = _stream->b.size(); -} - -void -IceInternal::BasicStream::EncapsEncoder10::endSlice() -{ - // - // Write the slice length. - // - Int sz = static_cast<Int>(_stream->b.size() - _writeSlice + sizeof(Int)); - Byte* dest = &(*(_stream->b.begin() + _writeSlice - sizeof(Int))); - _stream->write(sz, dest); -} - -void -IceInternal::BasicStream::EncapsEncoder10::writePendingObjects() -{ - while(!_toBeMarshaledMap.empty()) - { - // - // Consider the to be marshalled objects as marshalled now, - // this is necessary to avoid adding again the "to be - // marshalled objects" into _toBeMarshaledMap while writing - // objects. - // - _marshaledMap.insert(_toBeMarshaledMap.begin(), _toBeMarshaledMap.end()); - - PtrToIndexMap savedMap; - savedMap.swap(_toBeMarshaledMap); - _stream->writeSize(static_cast<Int>(savedMap.size())); - for(PtrToIndexMap::iterator p = savedMap.begin(); p != savedMap.end(); ++p) - { - // - // Ask the instance to marshal itself. Any new class - // instances that are triggered by the classes marshaled - // are added to toBeMarshaledMap. - // - _stream->write(p->second); - - try - { - p->first->ice_preMarshal(); - } - catch(const std::exception& ex) - { - Warning out(_stream->instance()->initializationData().logger); - out << "std::exception raised by ice_preMarshal:\n" << ex; - } - catch(...) - { - Warning out(_stream->instance()->initializationData().logger); - out << "unknown exception raised by ice_preMarshal"; - } - - p->first->__write(_stream); - } - } - _stream->writeSize(0); // Zero marker indicates end of sequence of sequences of instances. -} - -Int -IceInternal::BasicStream::EncapsEncoder10::registerObject(const ValuePtr& v) -{ - assert(v); - - // - // Look for this instance in the to-be-marshaled map. - // - PtrToIndexMap::const_iterator p = _toBeMarshaledMap.find(v); - if(p != _toBeMarshaledMap.end()) - { - return p->second; - } - - // - // Didn't find it, try the marshaled map next. - // - PtrToIndexMap::const_iterator q = _marshaledMap.find(v); - if(q != _marshaledMap.end()) - { - return q->second; - } - - // - // We haven't seen this instance previously, create a new - // index, and insert it into the to-be-marshaled map. - // - _toBeMarshaledMap.insert(make_pair(v, ++_objectIdIndex)); - return _objectIdIndex; -} - -void -IceInternal::BasicStream::EncapsEncoder11::write(const ValuePtr& v) -{ - if(!v) - { - _stream->writeSize(0); // Nil reference. - } - else if(_current && _encaps->format == SlicedFormat) - { - // - // If writting an object within a slice and using the sliced - // format, write an index from the object indirection - // table. The indirect object table is encoded at the end of - // each slice and is always read (even if the Slice is - // unknown). - // - PtrToIndexMap::const_iterator p = _current->indirectionMap.find(v); - if(p == _current->indirectionMap.end()) - { - _current->indirectionTable.push_back(v); - Int idx = static_cast<Int>(_current->indirectionTable.size()); // Position + 1 (0 is reserved for nil) - _current->indirectionMap.insert(make_pair(v, idx)); - _stream->writeSize(idx); - } - else - { - _stream->writeSize(p->second); - } - } - else - { - writeInstance(v); // Write the instance or a reference if already marshaled. - } -} - -void -IceInternal::BasicStream::EncapsEncoder11::write(const UserException& v) -{ - v.__write(_stream); -} - -void -IceInternal::BasicStream::EncapsEncoder11::startInstance(SliceType sliceType, const SlicedDataPtr& data) -{ - if(!_current) - { - _current = &_preAllocatedInstanceData; - } - else - { - _current = _current->next ? _current->next : new InstanceData(_current); - } - _current->sliceType = sliceType; - _current->firstSlice = true; - - if(data) - { - writeSlicedData(data); - } -} - -void -IceInternal::BasicStream::EncapsEncoder11::endInstance() -{ - _current = _current->previous; -} - -void -IceInternal::BasicStream::EncapsEncoder11::startSlice(const string& typeId, int compactId, bool last) -{ - assert(_current->indirectionTable.empty() && _current->indirectionMap.empty()); - - _current->sliceFlagsPos = _stream->b.size(); - - _current->sliceFlags = 0; - if(_encaps->format == SlicedFormat) - { - _current->sliceFlags |= FLAG_HAS_SLICE_SIZE; // Encode the slice size if using the sliced format. - } - if(last) - { - _current->sliceFlags |= FLAG_IS_LAST_SLICE; // This is the last slice. - } - - _stream->write(Byte(0)); // Placeholder for the slice flags - - // - // For object slices, encode the flag and the type ID either as a - // string or index. For exception slices, always encode the type - // ID a string. - // - if(_current->sliceType == ObjectSlice) - { - // - // Encode the type ID (only in the first slice for the compact - // encoding). - // - if(_encaps->format == SlicedFormat || _current->firstSlice) - { - if(compactId >= 0) - { - _current->sliceFlags |= FLAG_HAS_TYPE_ID_COMPACT; - _stream->writeSize(compactId); - } - else - { - Int index = registerTypeId(typeId); - if(index < 0) - { - _current->sliceFlags |= FLAG_HAS_TYPE_ID_STRING; - _stream->write(typeId, false); - } - else - { - _current->sliceFlags |= FLAG_HAS_TYPE_ID_INDEX; - _stream->writeSize(index); - } - } - } - } - else - { - _stream->write(typeId, false); - } - - if(_current->sliceFlags & FLAG_HAS_SLICE_SIZE) - { - _stream->write(Int(0)); // Placeholder for the slice length. - } - - _current->writeSlice = _stream->b.size(); - _current->firstSlice = false; -} - -void -IceInternal::BasicStream::EncapsEncoder11::endSlice() -{ - // - // Write the optional member end marker if some optional members - // were encoded. Note that the optional members are encoded before - // the indirection table and are included in the slice size. - // - if(_current->sliceFlags & FLAG_HAS_OPTIONAL_MEMBERS) - { - _stream->write(OPTIONAL_END_MARKER); - } - - // - // Write the slice length if necessary. - // - if(_current->sliceFlags & FLAG_HAS_SLICE_SIZE) - { - Int sz = static_cast<Int>(_stream->b.size() - _current->writeSlice + sizeof(Int)); - Byte* dest = &(*(_stream->b.begin() + _current->writeSlice - sizeof(Int))); - _stream->write(sz, dest); - } - - // - // Only write the indirection table if it contains entries. - // - if(!_current->indirectionTable.empty()) - { - assert(_encaps->format == SlicedFormat); - _current->sliceFlags |= FLAG_HAS_INDIRECTION_TABLE; - - // - // Write the indirection object table. - // - _stream->writeSize(static_cast<Int>(_current->indirectionTable.size())); - ObjectList::const_iterator p; - for(p = _current->indirectionTable.begin(); p != _current->indirectionTable.end(); ++p) - { - writeInstance(*p); - } - _current->indirectionTable.clear(); - _current->indirectionMap.clear(); - } - - // - // Finally, update the slice flags. - // - Byte* dest = &(*(_stream->b.begin() + _current->sliceFlagsPos)); - *dest = _current->sliceFlags; -} - -bool -IceInternal::BasicStream::EncapsEncoder11::writeOpt(Ice::Int tag, Ice::OptionalFormat format) -{ - if(!_current) - { - return _stream->writeOptImpl(tag, format); - } - else - { - if(_stream->writeOptImpl(tag, format)) - { - _current->sliceFlags |= FLAG_HAS_OPTIONAL_MEMBERS; - return true; - } - else - { - return false; - } - } -} - -void -IceInternal::BasicStream::EncapsEncoder11::writeSlicedData(const SlicedDataPtr& slicedData) -{ - assert(slicedData); - - // - // We only remarshal preserved slices if we are using the sliced - // format. Otherwise, we ignore the preserved slices, which - // essentially "slices" the object into the most-derived type - // known by the sender. - // - if(_encaps->format != SlicedFormat) - { - return; - } - - for(SliceInfoSeq::const_iterator p = slicedData->slices.begin(); p != slicedData->slices.end(); ++p) - { - startSlice((*p)->typeId, (*p)->compactId, (*p)->isLastSlice); - - // - // Write the bytes associated with this slice. - // - _stream->writeBlob((*p)->bytes); - - if((*p)->hasOptionalMembers) - { - _current->sliceFlags |= FLAG_HAS_OPTIONAL_MEMBERS; - } - - // - // Make sure to also re-write the object indirection table. - // - _current->indirectionTable = (*p)->objects; - - endSlice(); - } -} - -void -IceInternal::BasicStream::EncapsEncoder11::writeInstance(const ValuePtr& v) -{ - assert(v); - - // - // If the instance was already marshaled, just write it's ID. - // - PtrToIndexMap::const_iterator q = _marshaledMap.find(v); - if(q != _marshaledMap.end()) - { - _stream->writeSize(q->second); - return; - } - - // - // We haven't seen this instance previously, create a new ID, - // insert it into the marshaled map, and write the instance. - // - _marshaledMap.insert(make_pair(v, ++_objectIdIndex)); - - try - { - v->ice_preMarshal(); - } - catch(const std::exception& ex) - { - Warning out(_stream->instance()->initializationData().logger); - out << "std::exception raised by ice_preMarshal:\n" << ex; - } - catch(...) - { - Warning out(_stream->instance()->initializationData().logger); - out << "unknown exception raised by ice_preMarshal"; - } - - _stream->writeSize(1); // Object instance marker. - v->__write(_stream); -} diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp index bcc79091555..308559e8823 100644 --- a/cpp/src/Ice/Instance.cpp +++ b/cpp/src/Ice/Instance.cpp @@ -18,7 +18,7 @@ #include <Ice/ProxyFactory.h> #include <Ice/ThreadPool.h> #include <Ice/ConnectionFactory.h> -#include <Ice/ValueFactoryManager.h> +#include <Ice/ValueFactoryManagerI.h> #include <Ice/LocalException.h> #include <Ice/ObjectAdapterFactory.h> #include <Ice/Exception.h> @@ -42,7 +42,9 @@ #include <Ice/LoggerAdminI.h> #include <Ice/RegisterPluginsInit.h> #include <Ice/ObserverHelper.h> +#include <Ice/Functional.h> +#include <IceUtil/DisableWarnings.h> #include <IceUtil/StringUtil.h> #include <IceUtil/UUID.h> #include <IceUtil/Mutex.h> @@ -396,20 +398,6 @@ IceInternal::Instance::outgoingConnectionFactory() const return _outgoingConnectionFactory; } -ValueFactoryManagerPtr -IceInternal::Instance::servantFactoryManager() const -{ - Lock sync(*this); - - if(_state == StateDestroyed) - { - throw CommunicatorDestroyedException(__FILE__, __LINE__); - } - - assert(_servantFactoryManager); - return _servantFactoryManager; -} - ObjectAdapterFactoryPtr IceInternal::Instance::objectAdapterFactory() const { @@ -1358,9 +1346,14 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi _pluginManager = ICE_MAKE_SHARED(PluginManagerI, communicator, _dynamicLibraryList); - _outgoingConnectionFactory = new OutgoingConnectionFactory(communicator, this); + if(!_initData.valueFactoryManager) + { + _initData.valueFactoryManager = ICE_MAKE_SHARED(ValueFactoryManagerI); + } + + _objectFactoryMapHint = _objectFactoryMap.end(); - _servantFactoryManager = new ValueFactoryManager(); + _outgoingConnectionFactory = new OutgoingConnectionFactory(communicator, this); _objectAdapterFactory = ICE_MAKE_SHARED(ObjectAdapterFactory, this, communicator); @@ -1395,7 +1388,6 @@ IceInternal::Instance::~Instance() assert(!_proxyFactory); assert(!_outgoingConnectionFactory); - assert(!_servantFactoryManager); assert(!_objectAdapterFactory); assert(!_clientThreadPool); assert(!_serverThreadPool); @@ -1781,10 +1773,9 @@ IceInternal::Instance::destroy() } #endif - if(_servantFactoryManager) - { - _servantFactoryManager->destroy(); - } + for_each(_objectFactoryMap.begin(), _objectFactoryMap.end(), + Ice::secondVoidMemFun<const string, ObjectFactory>(&ObjectFactory::destroy)); + _objectFactoryMap.clear(); if(_routerManager) { @@ -1835,7 +1826,6 @@ IceInternal::Instance::destroy() _endpointHostResolver = 0; _timer = 0; - _servantFactoryManager = 0; _referenceFactory = 0; _requestHandlerFactory = 0; _proxyFactory = 0; @@ -1948,6 +1938,82 @@ IceInternal::Instance::setRcvBufSizeWarn(Short type, int size) _setBufSizeWarn[type] = info; } +void +IceInternal::Instance::addObjectFactory(const Ice::ObjectFactoryPtr& factory, const string& id) +{ + Lock sync(*this); + + // + // Create a ValueFactory wrapper around the given ObjectFactory and register the wrapper + // with the value factory manager. This may raise AlreadyRegisteredException. + // +#ifdef ICE_CPP11_MAPPING + _initData.valueFactoryManager->add([factory](const string& id) + { + return factory->create(id); + }, + id); +#else + class ValueFactoryWrapper: public Ice::ValueFactory + { + public: + + ValueFactoryWrapper(const Ice::ObjectFactoryPtr& factory) : _objectFactory(factory) + { + } + + Ice::ValuePtr create(const std::string& id) + { + return _objectFactory->create(id); + } + + private: + + Ice::ObjectFactoryPtr _objectFactory; + }; + + _initData.valueFactoryManager->add(new ValueFactoryWrapper(factory), id); +#endif + + // + // Also record the object factory in our own map. + // + _objectFactoryMapHint = _objectFactoryMap.insert(_objectFactoryMapHint, + pair<const string, Ice::ObjectFactoryPtr>(id, factory)); +} + +Ice::ObjectFactoryPtr +IceInternal::Instance::findObjectFactory(const string& id) const +{ + Lock sync(*this); + + ObjectFactoryMap& objectfactoryMap = const_cast<ObjectFactoryMap&>(_objectFactoryMap); + + ObjectFactoryMap::iterator p = objectfactoryMap.end(); + if(_objectFactoryMapHint != objectfactoryMap.end()) + { + if(_objectFactoryMapHint->first == id) + { + p = _objectFactoryMapHint; + } + } + + if(p == objectfactoryMap.end()) + { + p = objectfactoryMap.find(id); + } + + if(p != objectfactoryMap.end()) + { + _objectFactoryMapHint = p; + return p->second; + } + else + { + return ICE_NULLPTR; + } +} + IceInternal::ProcessI::ProcessI(const CommunicatorPtr& communicator) : _communicator(communicator) { diff --git a/cpp/src/Ice/Instance.h b/cpp/src/Ice/Instance.h index c91e58de7f2..f93befb897d 100644 --- a/cpp/src/Ice/Instance.h +++ b/cpp/src/Ice/Instance.h @@ -28,7 +28,7 @@ #include <Ice/ThreadPoolF.h> #include <Ice/ConnectionFactoryF.h> #include <Ice/ACM.h> -#include <Ice/ValueFactoryManagerF.h> +#include <Ice/ObjectFactory.h> #include <Ice/ObjectAdapterFactoryF.h> #include <Ice/EndpointFactoryManagerF.h> #include <Ice/IPEndpointIF.h> @@ -95,7 +95,6 @@ public: RequestHandlerFactoryPtr requestHandlerFactory() const; ProxyFactoryPtr proxyFactory() const; OutgoingConnectionFactoryPtr outgoingConnectionFactory() const; - ValueFactoryManagerPtr servantFactoryManager() const; ObjectAdapterFactoryPtr objectAdapterFactory() const; ProtocolSupport protocolSupport() const; bool preferIPv6() const; @@ -145,6 +144,11 @@ public: void setSndBufSizeWarn(Ice::Short type, int size); void setRcvBufSizeWarn(Ice::Short type, int size); + void addObjectFactory(const Ice::ObjectFactoryPtr&, const std::string&); + Ice::ObjectFactoryPtr findObjectFactory(const std::string&) const; + + typedef std::map<std::string, Ice::ObjectFactoryPtr> ObjectFactoryMap; + private: Instance(const Ice::CommunicatorPtr&, const Ice::InitializationData&); @@ -183,7 +187,6 @@ private: RequestHandlerFactoryPtr _requestHandlerFactory; ProxyFactoryPtr _proxyFactory; OutgoingConnectionFactoryPtr _outgoingConnectionFactory; - ValueFactoryManagerPtr _servantFactoryManager; ObjectAdapterFactoryPtr _objectAdapterFactory; ProtocolSupport _protocolSupport; bool _preferIPv6; @@ -207,6 +210,8 @@ private: IceInternal::MetricsAdminIPtr _metricsAdmin; std::map<Ice::Short, BufSizeWarnInfo> _setBufSizeWarn; IceUtil::Mutex _setBufSizeWarnMutex; + ObjectFactoryMap _objectFactoryMap; + mutable ObjectFactoryMap::iterator _objectFactoryMapHint; }; class ProcessI : public Ice::Process diff --git a/cpp/src/Ice/Makefile b/cpp/src/Ice/Makefile index 3f23056288a..abee06fd923 100644 --- a/cpp/src/Ice/Makefile +++ b/cpp/src/Ice/Makefile @@ -59,7 +59,6 @@ OBJS = Acceptor.o \ Application.o \ AsyncResult.o \ Base64.o \ - BasicStream.o \ BatchRequestQueue.o \ Buffer.o \ CollocatedRequestHandler.o \ @@ -85,6 +84,7 @@ OBJS = Acceptor.o \ Incoming.o \ IncomingAsync.o \ Initialize.o \ + InputStream.o \ Instance.o \ InstrumentationI.o \ IPEndpointI.o \ @@ -104,6 +104,7 @@ OBJS = Acceptor.o \ OpaqueEndpointI.o \ Outgoing.o \ OutgoingAsync.o \ + OutputStream.o \ PluginManagerI.o \ PropertiesAdminI.o \ PropertiesI.o \ @@ -125,8 +126,6 @@ OBJS = Acceptor.o \ ServantManager.o \ SliceChecksums.o \ SlicedData.o \ - Stream.o \ - StreamI.o \ StreamSocket.o \ TcpAcceptor.o \ TcpConnector.o \ @@ -140,7 +139,7 @@ OBJS = Acceptor.o \ UdpEndpointI.o \ UdpTransceiver.o \ Value.o \ - ValueFactoryManager.o \ + ValueFactoryManagerI.o \ WSAcceptor.o \ WSConnector.o \ WSEndpoint.o \ diff --git a/cpp/src/Ice/Makefile.mak b/cpp/src/Ice/Makefile.mak index 4cefc074bd5..987ddf14620 100644 --- a/cpp/src/Ice/Makefile.mak +++ b/cpp/src/Ice/Makefile.mak @@ -61,7 +61,6 @@ OBJS = .\Acceptor.obj \ .\Application.obj \ .\AsyncResult.obj \ .\Base64.obj \ - .\BasicStream.obj \ .\BatchRequestQueue.obj \ .\Buffer.obj \ .\CollocatedRequestHandler.obj \ @@ -87,6 +86,7 @@ OBJS = .\Acceptor.obj \ .\Incoming.obj \ .\IncomingAsync.obj \ .\Initialize.obj \ + .\InputStream.obj \ .\Instance.obj \ .\InstrumentationI.obj \ .\IPEndpointI.obj \ @@ -106,6 +106,7 @@ OBJS = .\Acceptor.obj \ .\OpaqueEndpointI.obj \ .\Outgoing.obj \ .\OutgoingAsync.obj \ + .\OutputStream.obj \ .\PluginManagerI.obj \ .\PropertiesAdminI.obj \ .\PropertiesI.obj \ @@ -128,8 +129,6 @@ OBJS = .\Acceptor.obj \ .\Service.obj \ .\SliceChecksums.obj \ .\SlicedData.obj \ - .\Stream.obj \ - .\StreamI.obj \ .\StreamSocket.obj \ .\TcpAcceptor.obj \ .\TcpConnector.obj \ @@ -143,7 +142,7 @@ OBJS = .\Acceptor.obj \ .\UdpEndpointI.obj \ .\UdpTransceiver.obj \ .\Value.obj \ - .\ValueFactoryManager.obj \ + .\ValueFactoryManagerI.obj \ .\WSAcceptor.obj \ .\WSConnector.obj \ .\WSEndpoint.obj \ diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp index bc0e1df7843..881e1581806 100644 --- a/cpp/src/Ice/Object.cpp +++ b/cpp/src/Ice/Object.cpp @@ -12,7 +12,6 @@ #include <Ice/IncomingAsync.h> #include <Ice/IncomingRequest.h> #include <Ice/LocalException.h> -#include <Ice/Stream.h> #include <Ice/SlicedData.h> using namespace std; @@ -103,7 +102,7 @@ Ice::Object::ice_clone() const DispatchStatus Ice::Object::___ice_isA(Incoming& __inS, const Current& __current) { - BasicStream* __is = __inS.startReadParams(); + InputStream* __is = __inS.startReadParams(); string __id; __is->read(__id, false); __inS.endReadParams(); @@ -112,7 +111,7 @@ Ice::Object::___ice_isA(Incoming& __inS, const Current& __current) #else bool __ret = ice_isA(__id, __current); #endif - BasicStream* __os = __inS.__startWriteParams(DefaultFormat); + OutputStream* __os = __inS.__startWriteParams(DefaultFormat); __os->write(__ret); __inS.__endWriteParams(true); return DispatchOK; @@ -132,7 +131,7 @@ Ice::Object::___ice_ids(Incoming& __inS, const Current& __current) { __inS.readEmptyParams(); vector<string> __ret = ice_ids(__current); - BasicStream* __os = __inS.__startWriteParams(DefaultFormat); + OutputStream* __os = __inS.__startWriteParams(DefaultFormat); __os->write(&__ret[0], &__ret[0] + __ret.size(), false); __inS.__endWriteParams(true); return DispatchOK; @@ -143,7 +142,7 @@ Ice::Object::___ice_id(Incoming& __inS, const Current& __current) { __inS.readEmptyParams(); string __ret = ice_id(__current); - BasicStream* __os = __inS.__startWriteParams(DefaultFormat); + OutputStream* __os = __inS.__startWriteParams(DefaultFormat); __os->write(__ret, false); __inS.__endWriteParams(true); return DispatchOK; @@ -241,23 +240,7 @@ Ice::Object::ice_postUnmarshal() } void -Ice::Object::__write(IceInternal::BasicStream* os) const -{ - os->startWriteObject(0); - __writeImpl(os); - os->endWriteObject(); -} - -void -Ice::Object::__read(IceInternal::BasicStream* is) -{ - is->startReadObject(); - __readImpl(is); - is->endReadObject(false); -} - -void -Ice::Object::__write(const OutputStreamPtr& os) const +Ice::Object::__write(Ice::OutputStream* os) const { os->startObject(0); __writeImpl(os); @@ -265,25 +248,13 @@ Ice::Object::__write(const OutputStreamPtr& os) const } void -Ice::Object::__read(const InputStreamPtr& is) +Ice::Object::__read(Ice::InputStream* is) { - is->startObject(); + is->startObject(); __readImpl(is); is->endObject(false); } -void -Ice::Object::__writeImpl(const OutputStreamPtr&) const -{ - throw MarshalException(__FILE__, __LINE__, "class was not generated with stream support"); -} - -void -Ice::Object::__readImpl(const InputStreamPtr&) -{ - throw MarshalException(__FILE__, __LINE__, "class was not generated with stream support"); -} - Ice::Int Ice::Object::ice_operationAttributes(const string&) const { @@ -561,15 +532,3 @@ Ice::BlobjectArrayAsync::__dispatch(Incoming& in, const Current& current) #endif return DispatchAsync; } - -void -Ice::ice_writeObject(const OutputStreamPtr& out, const ValuePtr& p) -{ - out->write(p); -} - -void -Ice::ice_readObject(const InputStreamPtr& in, ValuePtr& p) -{ - in->read(p); -} diff --git a/cpp/src/Ice/OpaqueEndpointI.cpp b/cpp/src/Ice/OpaqueEndpointI.cpp index baa0de85135..93e701b2132 100644 --- a/cpp/src/Ice/OpaqueEndpointI.cpp +++ b/cpp/src/Ice/OpaqueEndpointI.cpp @@ -8,7 +8,8 @@ // ********************************************************************** #include <Ice/OpaqueEndpointI.h> -#include <Ice/BasicStream.h> +#include <Ice/OutputStream.h> +#include <Ice/InputStream.h> #include <Ice/Exception.h> #include <Ice/DefaultsAndOverrides.h> #include <Ice/Base64.h> @@ -46,10 +47,10 @@ IceInternal::OpaqueEndpointI::OpaqueEndpointI(vector<string>& args) : } } -IceInternal::OpaqueEndpointI::OpaqueEndpointI(Short type, BasicStream* s) : _type(type) +IceInternal::OpaqueEndpointI::OpaqueEndpointI(Short type, InputStream* s) : _type(type) { - _rawEncoding = s->getReadEncoding(); - Int sz = s->getReadEncapsSize(); + _rawEncoding = s->getEncoding(); + Int sz = s->getEncapsSize(); s->readBlob(const_cast<vector<Byte>&>(_rawBytes), sz); } @@ -97,11 +98,11 @@ OpaqueEndpointInfoI::OpaqueEndpointInfoI(Ice::Short type, const Ice::EncodingVer } void -IceInternal::OpaqueEndpointI::streamWrite(BasicStream* s) const +IceInternal::OpaqueEndpointI::streamWrite(OutputStream* s) const { - s->startWriteEncaps(_rawEncoding, DefaultFormat); + s->startEncapsulation(_rawEncoding, DefaultFormat); s->writeBlob(_rawBytes); - s->endWriteEncaps(); + s->endEncapsulation(); } Ice::EndpointInfoPtr diff --git a/cpp/src/Ice/OpaqueEndpointI.h b/cpp/src/Ice/OpaqueEndpointI.h index caa67476a8e..d5b55883bbc 100644 --- a/cpp/src/Ice/OpaqueEndpointI.h +++ b/cpp/src/Ice/OpaqueEndpointI.h @@ -21,9 +21,9 @@ class OpaqueEndpointI : public EndpointI, public Ice::EnableSharedFromThis<Opaqu public: OpaqueEndpointI(std::vector<std::string>&); - OpaqueEndpointI(Ice::Short, BasicStream*); + OpaqueEndpointI(Ice::Short, Ice::InputStream*); - virtual void streamWrite(BasicStream*) const; + virtual void streamWrite(Ice::OutputStream*) const; virtual Ice::EndpointInfoPtr getInfo() const; virtual Ice::Short type() const; virtual const std::string& protocol() const; diff --git a/cpp/src/Ice/Outgoing.cpp b/cpp/src/Ice/Outgoing.cpp index ca04e352075..acd1a5e829e 100644 --- a/cpp/src/Ice/Outgoing.cpp +++ b/cpp/src/Ice/Outgoing.cpp @@ -91,7 +91,7 @@ ProxyOutgoingBase::completed(const Ice::Exception& ex) } void -ProxyOutgoingBase::completed(BasicStream& is) +ProxyOutgoingBase::completed(InputStream&) { assert(false); // Must be overriden } @@ -406,7 +406,7 @@ Outgoing::abort(const LocalException& ex) } void -Outgoing::completed(BasicStream& is) +Outgoing::completed(InputStream& is) { Monitor<Mutex>::Lock sync(_monitor); @@ -580,12 +580,12 @@ Outgoing::throwUserException() { try { - _is.startReadEncaps(); + _is.startEncapsulation(); _is.throwException(); } catch(const Ice::UserException&) { - _is.endReadEncaps(); + _is.endEncapsulation(); throw; } } @@ -687,7 +687,7 @@ ConnectionFlushBatch::completed(const Ice::Exception& ex) } void -ConnectionFlushBatch::completed(BasicStream& is) +ConnectionFlushBatch::completed(InputStream&) { assert(false); } diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp index 5c60223e335..5c06c76a3fe 100644 --- a/cpp/src/Ice/OutgoingAsync.cpp +++ b/cpp/src/Ice/OutgoingAsync.cpp @@ -48,7 +48,7 @@ OutgoingAsyncBase::completed() return false; } -BasicStream* +InputStream* OutgoingAsyncBase::getIs() { return 0; // Must be overriden by request that can handle responses @@ -1107,7 +1107,7 @@ OnewayClosureCallback::invoke( const shared_ptr<Ice::ObjectPrx>& __proxy, Ice::OperationMode __mode, Ice::FormatType __format, - function<void (BasicStream*)> __marshal, + function<void (OutputStream*)> __marshal, function<void ()> __response, function<void (exception_ptr)> __exception, function<void (bool)> __sent, @@ -1148,7 +1148,7 @@ TwowayClosureCallback::TwowayClosureCallback( const string& name, const shared_ptr<Ice::ObjectPrx>& proxy, bool readEmptyParams, - function<void (BasicStream*)> read, + function<void (InputStream*)> read, function<void (const UserException&)> userException, function<void (exception_ptr)> exception, function<void (bool)> sent) : @@ -1230,9 +1230,9 @@ TwowayClosureCallback::invoke( const shared_ptr<Ice::ObjectPrx>& __proxy, OperationMode __mode, FormatType __format, - function<void (BasicStream*)> __write, + function<void (OutputStream*)> __write, bool __readEmptyParams, - function<void (BasicStream*)> __read, + function<void (InputStream*)> __read, function<void (const UserException&)> __userException, function<void (exception_ptr)> __exception, function<void (bool)> __sent, diff --git a/cpp/src/Ice/OutputStream.cpp b/cpp/src/Ice/OutputStream.cpp new file mode 100644 index 00000000000..1f784ad3675 --- /dev/null +++ b/cpp/src/Ice/OutputStream.cpp @@ -0,0 +1,1375 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + +#include <IceUtil/DisableWarnings.h> +#include <Ice/OutputStream.h> +#include <Ice/DefaultsAndOverrides.h> +#include <Ice/Instance.h> +#include <Ice/Object.h> +#include <Ice/Proxy.h> +#include <Ice/ProxyFactory.h> +#include <Ice/ValueFactory.h> +#include <Ice/LocalException.h> +#include <Ice/Protocol.h> +#include <Ice/TraceUtil.h> +#include <Ice/LoggerUtil.h> +#include <Ice/SlicedData.h> +#include <IceUtil/StringConverter.h> +#include <iterator> + +using namespace std; +using namespace Ice; +using namespace IceInternal; + +namespace +{ + +class StreamUTF8BufferI : public IceUtil::UTF8Buffer +{ +public: + + StreamUTF8BufferI(OutputStream& stream) : + _stream(stream) + { + } + + Ice::Byte* getMoreBytes(size_t howMany, Ice::Byte* firstUnused) + { + assert(howMany > 0); + + if(firstUnused != 0) + { + // + // Return unused bytes + // + _stream.resize(firstUnused - _stream.b.begin()); + } + + // + // Index of first unused byte + // + Buffer::Container::size_type pos = _stream.b.size(); + + // + // Since resize may reallocate the buffer, when firstUnused != 0, the + // return value can be != firstUnused + // + _stream.resize(pos + howMany); + + return &_stream.b[pos]; + } + +private: + + OutputStream& _stream; +}; + +} + +Ice::OutputStream::OutputStream() : + _instance(0), + _closure(0), + _encoding(currentEncoding), + _format(CompactFormat), + _currentEncaps(0) +{ + // + // Initialize the encoding member of our pre-allocated encapsulation, in case + // this stream is used without an explicit encapsulation. + // + _preAllocatedEncaps.encoding = _encoding; +} + +Ice::OutputStream::OutputStream(const CommunicatorPtr& communicator) : + _closure(0), + _currentEncaps(0) +{ + initialize(communicator); +} + +Ice::OutputStream::OutputStream(const CommunicatorPtr& communicator, const EncodingVersion& encoding) : + _closure(0), + _currentEncaps(0) +{ + initialize(communicator, encoding); +} + +Ice::OutputStream::OutputStream(Instance* instance, const EncodingVersion& encoding) : + _closure(0), + _currentEncaps(0) +{ + initialize(instance, encoding); +} + +void +Ice::OutputStream::initialize(const CommunicatorPtr& communicator) +{ + assert(communicator); + InstancePtr instance = getInstance(communicator); + initialize(instance.get(), instance->defaultsAndOverrides()->defaultEncoding); +} + +void +Ice::OutputStream::initialize(const CommunicatorPtr& communicator, const EncodingVersion& encoding) +{ + assert(communicator); + InstancePtr instance = getInstance(communicator); + initialize(instance.get(), encoding); +} + +void +Ice::OutputStream::initialize(Instance* instance, const EncodingVersion& encoding) +{ + assert(instance); + + _instance = instance; + _encoding = encoding; + + _stringConverter = _instance->getStringConverter(); + _wstringConverter = _instance->getWstringConverter(); + + _format = _instance->defaultsAndOverrides()->defaultFormat; + + // + // Initialize the encoding member of our pre-allocated encapsulation, in case + // this stream is used without an explicit encapsulation. + // + _preAllocatedEncaps.encoding = encoding; +} + +void +Ice::OutputStream::clear() +{ + while(_currentEncaps && _currentEncaps != &_preAllocatedEncaps) + { + Encaps* oldEncaps = _currentEncaps; + _currentEncaps = _currentEncaps->previous; + delete oldEncaps; + } +} + +void +Ice::OutputStream::setStringConverters(const IceUtil::StringConverterPtr& sc, const IceUtil::WstringConverterPtr& wsc) +{ + _stringConverter = sc; + _wstringConverter = wsc; +} + +void +Ice::OutputStream::setFormat(FormatType fmt) +{ + _format = fmt; +} + +void* +Ice::OutputStream::getClosure() const +{ + return _closure; +} + +void* +Ice::OutputStream::setClosure(void* p) +{ + void* prev = _closure; + _closure = p; + return prev; +} + +void +Ice::OutputStream::swap(OutputStream& other) +{ + assert(_instance == other._instance); + + swapBuffer(other); + + std::swap(_closure, other._closure); + + // + // Swap is never called for streams that have encapsulations being written. However, + // encapsulations might still be set in case marshalling failed. We just + // reset the encapsulations if there are still some set. + // + resetEncapsulation(); + other.resetEncapsulation(); +} + +void +Ice::OutputStream::resetEncapsulation() +{ + while(_currentEncaps && _currentEncaps != &_preAllocatedEncaps) + { + Encaps* oldEncaps = _currentEncaps; + _currentEncaps = _currentEncaps->previous; + delete oldEncaps; + } + + _preAllocatedEncaps.reset(); +} + +void +Ice::OutputStream::startEncapsulation() +{ + // + // If no encoding version is specified, use the current write + // encapsulation encoding version if there's a current write + // encapsulation, otherwise, use the stream encoding version. + // + + if(_currentEncaps) + { + startEncapsulation(_currentEncaps->encoding, _currentEncaps->format); + } + else + { + startEncapsulation(_encoding, Ice::DefaultFormat); + } +} + +void +Ice::OutputStream::writePendingObjects() +{ + if(_currentEncaps && _currentEncaps->encoder) + { + _currentEncaps->encoder->writePendingObjects(); + } + else if(getEncoding() == Ice::Encoding_1_0) + { + // + // If using the 1.0 encoding and no objects were written, we + // still write an empty sequence for pending objects if + // requested (i.e.: if this is called). + // + // This is required by the 1.0 encoding, even if no objects + // are written we do marshal an empty sequence if marshaled + // data types use classes. + // + writeSize(0); + } +} + +void +Ice::OutputStream::writeBlob(const vector<Byte>& v) +{ + if(!v.empty()) + { + Container::size_type pos = b.size(); + resize(pos + v.size()); + memcpy(&b[pos], &v[0], v.size()); + } +} + +void +Ice::OutputStream::write(const Byte* begin, const Byte* end) +{ + Int sz = static_cast<Int>(end - begin); + writeSize(sz); + if(sz > 0) + { + Container::size_type pos = b.size(); + resize(pos + sz); + memcpy(&b[pos], begin, sz); + } +} + +void +Ice::OutputStream::write(const vector<bool>& v) +{ + Int sz = static_cast<Int>(v.size()); + writeSize(sz); + if(sz > 0) + { + Container::size_type pos = b.size(); + resize(pos + sz); + copy(v.begin(), v.end(), b.begin() + pos); + } +} + +namespace +{ + +template<size_t boolSize> +struct WriteBoolHelper +{ + static void write(const bool* begin, OutputStream::Container::size_type pos, OutputStream::Container& b, Int sz) + { + for(int idx = 0; idx < sz; ++idx) + { + b[pos + idx] = static_cast<Byte>(*(begin + idx)); + } + } +}; + +template<> +struct WriteBoolHelper<1> +{ + static void write(const bool* begin, OutputStream::Container::size_type pos, OutputStream::Container& b, Int sz) + { + memcpy(&b[pos], begin, sz); + } +}; + +} + +void +Ice::OutputStream::write(const bool* begin, const bool* end) +{ + Int sz = static_cast<Int>(end - begin); + writeSize(sz); + if(sz > 0) + { + Container::size_type pos = b.size(); + resize(pos + sz); + WriteBoolHelper<sizeof(bool)>::write(begin, pos, b, sz); + } +} + +void +Ice::OutputStream::write(Short v) +{ + Container::size_type pos = b.size(); + resize(pos + sizeof(Short)); + Byte* dest = &b[pos]; +#ifdef ICE_BIG_ENDIAN + const Byte* src = reinterpret_cast<const Byte*>(&v) + sizeof(Short) - 1; + *dest++ = *src--; + *dest = *src; +#else + const Byte* src = reinterpret_cast<const Byte*>(&v); + *dest++ = *src++; + *dest = *src; +#endif +} + +void +Ice::OutputStream::write(const Short* begin, const Short* end) +{ + Int sz = static_cast<Int>(end - begin); + writeSize(sz); + if(sz > 0) + { + Container::size_type pos = b.size(); + resize(pos + sz * sizeof(Short)); +#ifdef ICE_BIG_ENDIAN + const Byte* src = reinterpret_cast<const Byte*>(begin) + sizeof(Short) - 1; + Byte* dest = &(*(b.begin() + pos)); + for(int j = 0 ; j < sz ; ++j) + { + *dest++ = *src--; + *dest++ = *src--; + src += 2 * sizeof(Short); + } +#else + memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), sz * sizeof(Short)); +#endif + } +} + +void +Ice::OutputStream::write(const Int* begin, const Int* end) +{ + Int sz = static_cast<Int>(end - begin); + writeSize(sz); + if(sz > 0) + { + Container::size_type pos = b.size(); + resize(pos + sz * sizeof(Int)); +#ifdef ICE_BIG_ENDIAN + const Byte* src = reinterpret_cast<const Byte*>(begin) + sizeof(Int) - 1; + Byte* dest = &(*(b.begin() + pos)); + for(int j = 0 ; j < sz ; ++j) + { + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + src += 2 * sizeof(Int); + } +#else + memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), sz * sizeof(Int)); +#endif + } +} + +void +Ice::OutputStream::write(Long v) +{ + Container::size_type pos = b.size(); + resize(pos + sizeof(Long)); + Byte* dest = &b[pos]; +#ifdef ICE_BIG_ENDIAN + const Byte* src = reinterpret_cast<const Byte*>(&v) + sizeof(Long) - 1; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest = *src; +#else + const Byte* src = reinterpret_cast<const Byte*>(&v); + *dest++ = *src++; + *dest++ = *src++; + *dest++ = *src++; + *dest++ = *src++; + *dest++ = *src++; + *dest++ = *src++; + *dest++ = *src++; + *dest = *src; +#endif +} + +void +Ice::OutputStream::write(const Long* begin, const Long* end) +{ + Int sz = static_cast<Int>(end - begin); + writeSize(sz); + if(sz > 0) + { + Container::size_type pos = b.size(); + resize(pos + sz * sizeof(Long)); +#ifdef ICE_BIG_ENDIAN + const Byte* src = reinterpret_cast<const Byte*>(begin) + sizeof(Long) - 1; + Byte* dest = &(*(b.begin() + pos)); + for(int j = 0 ; j < sz ; ++j) + { + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + src += 2 * sizeof(Long); + } +#else + memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), sz * sizeof(Long)); +#endif + } +} + +void +Ice::OutputStream::write(Float v) +{ + Container::size_type pos = b.size(); + resize(pos + sizeof(Float)); + Byte* dest = &b[pos]; +#ifdef ICE_BIG_ENDIAN + const Byte* src = reinterpret_cast<const Byte*>(&v) + sizeof(Float) - 1; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest = *src; +#else + const Byte* src = reinterpret_cast<const Byte*>(&v); + *dest++ = *src++; + *dest++ = *src++; + *dest++ = *src++; + *dest = *src; +#endif +} + +void +Ice::OutputStream::write(const Float* begin, const Float* end) +{ + Int sz = static_cast<Int>(end - begin); + writeSize(sz); + if(sz > 0) + { + Container::size_type pos = b.size(); + resize(pos + sz * sizeof(Float)); +#ifdef ICE_BIG_ENDIAN + const Byte* src = reinterpret_cast<const Byte*>(begin) + sizeof(Float) - 1; + Byte* dest = &(*(b.begin() + pos)); + for(int j = 0 ; j < sz ; ++j) + { + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + src += 2 * sizeof(Float); + } +#else + memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), sz * sizeof(Float)); +#endif + } +} + +void +Ice::OutputStream::write(Double v) +{ + Container::size_type pos = b.size(); + resize(pos + sizeof(Double)); + Byte* dest = &b[pos]; +#ifdef ICE_BIG_ENDIAN + const Byte* src = reinterpret_cast<const Byte*>(&v) + sizeof(Double) - 1; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest = *src; +#else + const Byte* src = reinterpret_cast<const Byte*>(&v); +# if defined(ICE_LITTLEBYTE_BIGWORD) + dest[4] = *src++; + dest[5] = *src++; + dest[6] = *src++; + dest[7] = *src++; + dest[0] = *src++; + dest[1] = *src++; + dest[2] = *src++; + dest[3] = *src; +# else + *dest++ = *src++; + *dest++ = *src++; + *dest++ = *src++; + *dest++ = *src++; + *dest++ = *src++; + *dest++ = *src++; + *dest++ = *src++; + *dest = *src; +# endif +#endif +} + +void +Ice::OutputStream::write(const Double* begin, const Double* end) +{ + Int sz = static_cast<Int>(end - begin); + writeSize(sz); + if(sz > 0) + { + Container::size_type pos = b.size(); + resize(pos + sz * sizeof(Double)); +#ifdef ICE_BIG_ENDIAN + const Byte* src = reinterpret_cast<const Byte*>(begin) + sizeof(Double) - 1; + Byte* dest = &(*(b.begin() + pos)); + for(int j = 0 ; j < sz ; ++j) + { + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + *dest++ = *src--; + src += 2 * sizeof(Double); + } +#elif defined(ICE_LITTLEBYTE_BIGWORD) + const Byte* src = reinterpret_cast<const Byte*>(begin); + Byte* dest = &(*(b.begin() + pos)); + for(int j = 0 ; j < sz ; ++j) + { + dest[4] = *src++; + dest[5] = *src++; + dest[6] = *src++; + dest[7] = *src++; + dest[0] = *src++; + dest[1] = *src++; + dest[2] = *src++; + dest[3] = *src++; + dest += sizeof(Double); + } +#else + memcpy(&b[pos], reinterpret_cast<const Byte*>(begin), sz * sizeof(Double)); +#endif + } +} + +// +// NOTE: This member function is intentionally omitted in order to +// cause a link error if it is used. This is for efficiency reasons: +// writing a const char * requires a traversal of the string to get +// the string length first, which takes O(n) time, whereas getting the +// string length from a std::string takes constant time. +// +/* +void +Ice::OutputStream::write(const char*) +{ +} +*/ + +void +Ice::OutputStream::writeConverted(const char* vdata, size_t vsize) +{ + if(!_stringConverter) + { + throw MarshalException(__FILE__, __LINE__, "no string converter provided"); + } + + // + // What is the size of the resulting UTF-8 encoded string? + // Impossible to tell, so we guess. If we don't guess correctly, + // we'll have to fix the mistake afterwards + // + try + { + Int guessedSize = static_cast<Int>(vsize); + writeSize(guessedSize); // writeSize() only writes the size; it does not reserve any buffer space. + + size_t firstIndex = b.size(); + StreamUTF8BufferI buffer(*this); + + Byte* lastByte = _stringConverter->toUTF8(vdata, vdata + vsize, buffer); + if(lastByte != b.end()) + { + resize(lastByte - b.begin()); + } + size_t lastIndex = b.size(); + + Int actualSize = static_cast<Int>(lastIndex - firstIndex); + + // + // Check against the guess + // + if(guessedSize != actualSize) + { + if(guessedSize <= 254 && actualSize > 254) + { + // + // Move the UTF-8 sequence 4 bytes further + // Use memmove instead of memcpy since the source and destination typically overlap. + // + resize(b.size() + 4); + memmove(b.begin() + firstIndex + 4, b.begin() + firstIndex, actualSize); + } + else if(guessedSize > 254 && actualSize <= 254) + { + // + // Move the UTF-8 sequence 4 bytes back + // + memmove(b.begin() + firstIndex - 4, b.begin() + firstIndex, actualSize); + resize(b.size() - 4); + } + + if(guessedSize <= 254) + { + rewriteSize(actualSize, b.begin() + firstIndex - 1); + } + else + { + rewriteSize(actualSize, b.begin() + firstIndex - 1 - 4); + } + } + } + catch(const IceUtil::IllegalConversionException& ex) + { + throw StringConversionException(__FILE__, __LINE__, ex.reason()); + } +} + +void +Ice::OutputStream::write(const string* begin, const string* end, bool convert) +{ + Int sz = static_cast<Int>(end - begin); + writeSize(sz); + if(sz > 0) + { + for(int i = 0; i < sz; ++i) + { + write(begin[i], convert); + } + } +} + +void +Ice::OutputStream::write(const wstring& v) +{ + if(v.empty()) + { + writeSize(0); + return; + } + + if(!_wstringConverter) + { + throw MarshalException(__FILE__, __LINE__, "no wstring converter provided"); + } + + // + // What is the size of the resulting UTF-8 encoded string? + // Impossible to tell, so we guess. If we don't guess correctly, + // we'll have to fix the mistake afterwards + // + try + { + Int guessedSize = static_cast<Int>(v.size()); + writeSize(guessedSize); // writeSize() only writes the size; it does not reserve any buffer space. + + size_t firstIndex = b.size(); + StreamUTF8BufferI buffer(*this); + + Byte* lastByte = _wstringConverter->toUTF8(v.data(), v.data() + v.size(), buffer); + if(lastByte != b.end()) + { + resize(lastByte - b.begin()); + } + size_t lastIndex = b.size(); + + Int actualSize = static_cast<Int>(lastIndex - firstIndex); + + // + // Check against the guess + // + if(guessedSize != actualSize) + { + if(guessedSize <= 254 && actualSize > 254) + { + // + // Move the UTF-8 sequence 4 bytes further + // Use memmove instead of memcpy since the source and destination typically overlap. + // + resize(b.size() + 4); + memmove(b.begin() + firstIndex + 4, b.begin() + firstIndex, actualSize); + } + else if(guessedSize > 254 && actualSize <= 254) + { + // + // Move the UTF-8 sequence 4 bytes back + // + memmove(b.begin() + firstIndex - 4, b.begin() + firstIndex, actualSize); + resize(b.size() - 4); + } + + if(guessedSize <= 254) + { + rewriteSize(actualSize, b.begin() + firstIndex - 1); + } + else + { + rewriteSize(actualSize, b.begin() + firstIndex - 1 - 4); + } + } + } + catch(const IceUtil::IllegalConversionException& ex) + { + throw StringConversionException(__FILE__, __LINE__, ex.reason()); + } +} + +void +Ice::OutputStream::write(const wstring* begin, const wstring* end) +{ + Int sz = static_cast<Int>(end - begin); + writeSize(sz); + if(sz > 0) + { + for(int i = 0; i < sz; ++i) + { + write(begin[i]); + } + } +} + +void +#ifdef ICE_CPP11_MAPPING +Ice::OutputStream::writeProxy(const shared_ptr<ObjectPrx>& v) +#else +Ice::OutputStream::write(const ObjectPrx& v) +#endif +{ + if(v) + { + v->__write(*this); + } + else + { + Identity ident; + write(ident); + } +} + +void +Ice::OutputStream::writeEnum(Int v, Int maxValue) +{ + if(getEncoding() == Encoding_1_0) + { + if(maxValue < 127) + { + write(static_cast<Byte>(v)); + } + else if(maxValue < 32767) + { + write(static_cast<Short>(v)); + } + else + { + write(v); + } + } + else + { + writeSize(v); + } +} + +void +Ice::OutputStream::writeException(const UserException& e) +{ + initEncaps(); + _currentEncaps->encoder->write(e); +} + +bool +Ice::OutputStream::writeOptImpl(Int tag, OptionalFormat type) +{ + if(getEncoding() == Encoding_1_0) + { + return false; // Optional members aren't supported with the 1.0 encoding. + } + + Byte v = static_cast<Byte>(type); + if(tag < 30) + { + v |= static_cast<Byte>(tag << 3); + write(v); + } + else + { + v |= 0xF0; // tag = 30 + write(v); + writeSize(tag); + } + return true; +} + +void +Ice::OutputStream::finished(vector<Byte>& bytes) +{ + vector<Byte>(b.begin(), b.end()).swap(bytes); +} + +pair<const Byte*, const Byte*> +Ice::OutputStream::finished() +{ + if(b.empty()) + { + return pair<const Byte*, const Byte*>(reinterpret_cast<Ice::Byte*>(0), reinterpret_cast<Ice::Byte*>(0)); + } + else + { + return pair<const Byte*, const Byte*>(&b[0], &b[0] + b.size()); + } +} + +void +Ice::OutputStream::throwEncapsulationException(const char* file, int line) +{ + throw EncapsulationException(file, line); +} + +void +Ice::OutputStream::initEncaps() +{ + if(!_currentEncaps) // Lazy initialization. + { + _currentEncaps = &_preAllocatedEncaps; + _currentEncaps->start = b.size(); + } + + if(_currentEncaps->format == Ice::DefaultFormat) + { + _currentEncaps->format = _format; + } + + if(!_currentEncaps->encoder) // Lazy initialization. + { + if(_currentEncaps->encoding == Encoding_1_0) + { + _currentEncaps->encoder = new EncapsEncoder10(this, _currentEncaps); + } + else + { + _currentEncaps->encoder = new EncapsEncoder11(this, _currentEncaps); + } + } +} + +Int +Ice::OutputStream::EncapsEncoder::registerTypeId(const string& typeId) +{ + TypeIdMap::const_iterator p = _typeIdMap.find(typeId); + if(p != _typeIdMap.end()) + { + return p->second; + } + else + { + _typeIdMap.insert(make_pair(typeId, ++_typeIdIndex)); + return -1; + } +} + +void +Ice::OutputStream::EncapsEncoder10::write(const ValuePtr& v) +{ + // + // Object references are encoded as a negative integer in 1.0. + // + if(v) + { + _stream->write(-registerObject(v)); + } + else + { + _stream->write(0); + } +} + +void +Ice::OutputStream::EncapsEncoder10::write(const UserException& v) +{ + // + // User exception with the 1.0 encoding start with a boolean + // flag that indicates whether or not the exception uses + // classes. + // + // This allows reading the pending objects even if some part of + // the exception was sliced. + // + bool usesClasses = v.__usesClasses(); + _stream->write(usesClasses); + v.__write(_stream); + if(usesClasses) + { + writePendingObjects(); + } +} + +void +Ice::OutputStream::EncapsEncoder10::startInstance(SliceType sliceType, const SlicedDataPtr&) +{ + _sliceType = sliceType; +} + +void +Ice::OutputStream::EncapsEncoder10::endInstance() +{ + if(_sliceType == ObjectSlice) + { + // + // Write the Object slice. + // + startSlice(Object::ice_staticId(), -1, true); + _stream->writeSize(0); // For compatibility with the old AFM. + endSlice(); + } + _sliceType = NoSlice; +} + +void +Ice::OutputStream::EncapsEncoder10::startSlice(const string& typeId, int, bool /*last*/) +{ + // + // For object slices, encode a boolean to indicate how the type ID + // is encoded and the type ID either as a string or index. For + // exception slices, always encode the type ID as a string. + // + if(_sliceType == ObjectSlice) + { + Int index = registerTypeId(typeId); + if(index < 0) + { + _stream->write(false); + _stream->write(typeId, false); + } + else + { + _stream->write(true); + _stream->writeSize(index); + } + } + else + { + _stream->write(typeId, false); + } + + _stream->write(Int(0)); // Placeholder for the slice length. + + _writeSlice = _stream->b.size(); +} + +void +Ice::OutputStream::EncapsEncoder10::endSlice() +{ + // + // Write the slice length. + // + Int sz = static_cast<Int>(_stream->b.size() - _writeSlice + sizeof(Int)); + Byte* dest = &(*(_stream->b.begin() + _writeSlice - sizeof(Int))); + _stream->write(sz, dest); +} + +void +Ice::OutputStream::EncapsEncoder10::writePendingObjects() +{ + while(!_toBeMarshaledMap.empty()) + { + // + // Consider the to be marshalled objects as marshalled now, + // this is necessary to avoid adding again the "to be + // marshalled objects" into _toBeMarshaledMap while writing + // objects. + // + _marshaledMap.insert(_toBeMarshaledMap.begin(), _toBeMarshaledMap.end()); + + PtrToIndexMap savedMap; + savedMap.swap(_toBeMarshaledMap); + _stream->writeSize(static_cast<Int>(savedMap.size())); + for(PtrToIndexMap::iterator p = savedMap.begin(); p != savedMap.end(); ++p) + { + // + // Ask the instance to marshal itself. Any new class + // instances that are triggered by the classes marshaled + // are added to toBeMarshaledMap. + // + _stream->write(p->second); + + try + { + p->first->ice_preMarshal(); + } + catch(const std::exception& ex) + { + Warning out(_stream->instance()->initializationData().logger); + out << "std::exception raised by ice_preMarshal:\n" << ex; + } + catch(...) + { + Warning out(_stream->instance()->initializationData().logger); + out << "unknown exception raised by ice_preMarshal"; + } + + p->first->__write(_stream); + } + } + _stream->writeSize(0); // Zero marker indicates end of sequence of sequences of instances. +} + +Int +Ice::OutputStream::EncapsEncoder10::registerObject(const ValuePtr& v) +{ + assert(v); + + // + // Look for this instance in the to-be-marshaled map. + // + PtrToIndexMap::const_iterator p = _toBeMarshaledMap.find(v); + if(p != _toBeMarshaledMap.end()) + { + return p->second; + } + + // + // Didn't find it, try the marshaled map next. + // + PtrToIndexMap::const_iterator q = _marshaledMap.find(v); + if(q != _marshaledMap.end()) + { + return q->second; + } + + // + // We haven't seen this instance previously, create a new + // index, and insert it into the to-be-marshaled map. + // + _toBeMarshaledMap.insert(make_pair(v, ++_objectIdIndex)); + return _objectIdIndex; +} + +void +Ice::OutputStream::EncapsEncoder11::write(const ValuePtr& v) +{ + if(!v) + { + _stream->writeSize(0); // Nil reference. + } + else if(_current && _encaps->format == SlicedFormat) + { + // + // If writting an object within a slice and using the sliced + // format, write an index from the object indirection + // table. The indirect object table is encoded at the end of + // each slice and is always read (even if the Slice is + // unknown). + // + PtrToIndexMap::const_iterator p = _current->indirectionMap.find(v); + if(p == _current->indirectionMap.end()) + { + _current->indirectionTable.push_back(v); + Int idx = static_cast<Int>(_current->indirectionTable.size()); // Position + 1 (0 is reserved for nil) + _current->indirectionMap.insert(make_pair(v, idx)); + _stream->writeSize(idx); + } + else + { + _stream->writeSize(p->second); + } + } + else + { + writeInstance(v); // Write the instance or a reference if already marshaled. + } +} + +void +Ice::OutputStream::EncapsEncoder11::write(const UserException& v) +{ + v.__write(_stream); +} + +void +Ice::OutputStream::EncapsEncoder11::startInstance(SliceType sliceType, const SlicedDataPtr& data) +{ + if(!_current) + { + _current = &_preAllocatedInstanceData; + } + else + { + _current = _current->next ? _current->next : new InstanceData(_current); + } + _current->sliceType = sliceType; + _current->firstSlice = true; + + if(data) + { + writeSlicedData(data); + } +} + +void +Ice::OutputStream::EncapsEncoder11::endInstance() +{ + _current = _current->previous; +} + +void +Ice::OutputStream::EncapsEncoder11::startSlice(const string& typeId, int compactId, bool last) +{ + assert(_current->indirectionTable.empty() && _current->indirectionMap.empty()); + + _current->sliceFlagsPos = _stream->b.size(); + + _current->sliceFlags = 0; + if(_encaps->format == SlicedFormat) + { + _current->sliceFlags |= FLAG_HAS_SLICE_SIZE; // Encode the slice size if using the sliced format. + } + if(last) + { + _current->sliceFlags |= FLAG_IS_LAST_SLICE; // This is the last slice. + } + + _stream->write(Byte(0)); // Placeholder for the slice flags + + // + // For object slices, encode the flag and the type ID either as a + // string or index. For exception slices, always encode the type + // ID a string. + // + if(_current->sliceType == ObjectSlice) + { + // + // Encode the type ID (only in the first slice for the compact + // encoding). + // + if(_encaps->format == SlicedFormat || _current->firstSlice) + { + if(compactId >= 0) + { + _current->sliceFlags |= FLAG_HAS_TYPE_ID_COMPACT; + _stream->writeSize(compactId); + } + else + { + Int index = registerTypeId(typeId); + if(index < 0) + { + _current->sliceFlags |= FLAG_HAS_TYPE_ID_STRING; + _stream->write(typeId, false); + } + else + { + _current->sliceFlags |= FLAG_HAS_TYPE_ID_INDEX; + _stream->writeSize(index); + } + } + } + } + else + { + _stream->write(typeId, false); + } + + if(_current->sliceFlags & FLAG_HAS_SLICE_SIZE) + { + _stream->write(Int(0)); // Placeholder for the slice length. + } + + _current->writeSlice = _stream->b.size(); + _current->firstSlice = false; +} + +void +Ice::OutputStream::EncapsEncoder11::endSlice() +{ + // + // Write the optional member end marker if some optional members + // were encoded. Note that the optional members are encoded before + // the indirection table and are included in the slice size. + // + if(_current->sliceFlags & FLAG_HAS_OPTIONAL_MEMBERS) + { + _stream->write(OPTIONAL_END_MARKER); + } + + // + // Write the slice length if necessary. + // + if(_current->sliceFlags & FLAG_HAS_SLICE_SIZE) + { + Int sz = static_cast<Int>(_stream->b.size() - _current->writeSlice + sizeof(Int)); + Byte* dest = &(*(_stream->b.begin() + _current->writeSlice - sizeof(Int))); + _stream->write(sz, dest); + } + + // + // Only write the indirection table if it contains entries. + // + if(!_current->indirectionTable.empty()) + { + assert(_encaps->format == SlicedFormat); + _current->sliceFlags |= FLAG_HAS_INDIRECTION_TABLE; + + // + // Write the indirection object table. + // + _stream->writeSize(static_cast<Int>(_current->indirectionTable.size())); + ObjectList::const_iterator p; + for(p = _current->indirectionTable.begin(); p != _current->indirectionTable.end(); ++p) + { + writeInstance(*p); + } + _current->indirectionTable.clear(); + _current->indirectionMap.clear(); + } + + // + // Finally, update the slice flags. + // + Byte* dest = &(*(_stream->b.begin() + _current->sliceFlagsPos)); + *dest = _current->sliceFlags; +} + +bool +Ice::OutputStream::EncapsEncoder11::writeOpt(Ice::Int tag, Ice::OptionalFormat format) +{ + if(!_current) + { + return _stream->writeOptImpl(tag, format); + } + else + { + if(_stream->writeOptImpl(tag, format)) + { + _current->sliceFlags |= FLAG_HAS_OPTIONAL_MEMBERS; + return true; + } + else + { + return false; + } + } +} + +void +Ice::OutputStream::EncapsEncoder11::writeSlicedData(const SlicedDataPtr& slicedData) +{ + assert(slicedData); + + // + // We only remarshal preserved slices if we are using the sliced + // format. Otherwise, we ignore the preserved slices, which + // essentially "slices" the object into the most-derived type + // known by the sender. + // + if(_encaps->format != SlicedFormat) + { + return; + } + + for(SliceInfoSeq::const_iterator p = slicedData->slices.begin(); p != slicedData->slices.end(); ++p) + { + startSlice((*p)->typeId, (*p)->compactId, (*p)->isLastSlice); + + // + // Write the bytes associated with this slice. + // + _stream->writeBlob((*p)->bytes); + + if((*p)->hasOptionalMembers) + { + _current->sliceFlags |= FLAG_HAS_OPTIONAL_MEMBERS; + } + + // + // Make sure to also re-write the object indirection table. + // + _current->indirectionTable = (*p)->objects; + + endSlice(); + } +} + +void +Ice::OutputStream::EncapsEncoder11::writeInstance(const ValuePtr& v) +{ + assert(v); + + // + // If the instance was already marshaled, just write it's ID. + // + PtrToIndexMap::const_iterator q = _marshaledMap.find(v); + if(q != _marshaledMap.end()) + { + _stream->writeSize(q->second); + return; + } + + // + // We haven't seen this instance previously, create a new ID, + // insert it into the marshaled map, and write the instance. + // + _marshaledMap.insert(make_pair(v, ++_objectIdIndex)); + + try + { + v->ice_preMarshal(); + } + catch(const std::exception& ex) + { + Warning out(_stream->instance()->initializationData().logger); + out << "std::exception raised by ice_preMarshal:\n" << ex; + } + catch(...) + { + Warning out(_stream->instance()->initializationData().logger); + out << "unknown exception raised by ice_preMarshal"; + } + + _stream->writeSize(1); // Object instance marker. + v->__write(_stream); +} diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp index 9b7602394d6..3a5c15d7cc9 100644 --- a/cpp/src/Ice/Proxy.cpp +++ b/cpp/src/Ice/Proxy.cpp @@ -19,10 +19,10 @@ #include <Ice/Instance.h> #include <Ice/RouterInfo.h> #include <Ice/LocatorInfo.h> -#include <Ice/BasicStream.h> +#include <Ice/OutputStream.h> +#include <Ice/InputStream.h> #include <Ice/LocalException.h> #include <Ice/ConnectionI.h> // To convert from ConnectionIPtr to ConnectionPtr in ice_getConnection(). -#include <Ice/Stream.h> #include <Ice/ImplicitContextI.h> using namespace std; @@ -92,16 +92,16 @@ Ice::ObjectPrx::ice_isA_async(const string& typeId, const ::Ice::Context& context) { return TwowayClosureCallback::invoke(ice_isA_name, shared_from_this(), OperationMode::Nonmutating, DefaultFormat, - [&typeId](IceInternal::BasicStream* os) + [&typeId](Ice::OutputStream* os) { os->write(typeId); }, false, - [response](IceInternal::BasicStream* is) + [response](Ice::InputStream* is) { bool ret; is->read(ret); - is->endReadEncaps(); + is->endEncapsulation(); if(response) { response(ret); @@ -192,11 +192,11 @@ Ice::ObjectPrx::ice_id_async(function<void (string)> response, { return TwowayClosureCallback::invoke( ice_id_name, shared_from_this(), OperationMode::Nonmutating, DefaultFormat, nullptr, false, - [response](IceInternal::BasicStream* is) + [response](Ice::InputStream* is) { string ret; is->read(ret); - is->endReadEncaps(); + is->endEncapsulation(); if(response) { response(move(ret)); @@ -231,11 +231,11 @@ Ice::ObjectPrx::ice_ids_async(function<void (vector<string>)> response, { return TwowayClosureCallback::invoke( ice_ids_name, shared_from_this(), OperationMode::Nonmutating, DefaultFormat, nullptr, false, - [response](IceInternal::BasicStream* is) + [response](Ice::InputStream* is) { vector<string> ret; is->read(ret); - is->endReadEncaps(); + is->endEncapsulation(); if(response) { response(move(ret)); @@ -832,7 +832,7 @@ IceProxy::Ice::Object::ice_isA(const string& typeId, const Context& context) Outgoing __og(this, ice_isA_name, ::Ice::Nonmutating, context); try { - BasicStream* __os = __og.startWriteParams(DefaultFormat); + OutputStream* __os = __og.startWriteParams(DefaultFormat); __os->write(typeId, false); __og.endWriteParams(); } @@ -852,7 +852,7 @@ IceProxy::Ice::Object::ice_isA(const string& typeId, const Context& context) } } bool __ret; - BasicStream* __is = __og.startReadParams(); + InputStream* __is = __og.startReadParams(); __is->read(__ret); __og.endReadParams(); return __ret; @@ -869,7 +869,7 @@ IceProxy::Ice::Object::__begin_ice_isA(const string& typeId, try { __result->prepare(ice_isA_name, Nonmutating, ctx); - IceInternal::BasicStream* __os = __result->startWriteParams(DefaultFormat); + ::Ice::OutputStream* __os = __result->startWriteParams(DefaultFormat); __os->write(typeId); __result->endWriteParams(); __result->invoke(); @@ -898,7 +898,7 @@ IceProxy::Ice::Object::end_ice_isA(const AsyncResultPtr& __result) } } bool __ret; - IceInternal::BasicStream* __is = __result->__startReadParams(); + ::Ice::InputStream* __is = __result->__startReadParams(); __is->read(__ret); __result->__endReadParams(); return __ret; @@ -970,7 +970,7 @@ IceProxy::Ice::Object::ice_ids(const Context& context) } } vector<string> __ret; - BasicStream* __is = __og.startReadParams(); + InputStream* __is = __og.startReadParams(); __is->read(__ret, false); __og.endReadParams(); return __ret; @@ -994,7 +994,7 @@ IceProxy::Ice::Object::ice_id(const Context& context) } } string __ret; - BasicStream* __is = __og.startReadParams(); + InputStream* __is = __og.startReadParams(); __is->read(__ret, false); __og.endReadParams(); return __ret; @@ -1037,7 +1037,7 @@ IceProxy::Ice::Object::end_ice_ids(const AsyncResultPtr& __result) } } vector<string> __ret; - IceInternal::BasicStream* __is = __result->__startReadParams(); + ::Ice::InputStream* __is = __result->__startReadParams(); __is->read(__ret); __result->__endReadParams(); return __ret; @@ -1080,7 +1080,7 @@ IceProxy::Ice::Object::end_ice_id(const AsyncResultPtr& __result) } } string __ret; - IceInternal::BasicStream* __is = __result->__startReadParams(); + ::Ice::InputStream* __is = __result->__startReadParams(); __is->read(__ret); __result->__endReadParams(); return __ret; @@ -1344,18 +1344,6 @@ IceProxy::Ice::Object::__checkTwowayOnly(const string& name) const } } -void -Ice::ice_writeObjectPrx(const OutputStreamPtr& out, const ObjectPrxPtr& v) -{ - out->write(v); -} - -void -Ice::ice_readObjectPrx(const InputStreamPtr& in, ObjectPrxPtr& v) -{ - in->read(v); -} - #endif #ifdef ICE_CPP11_MAPPING @@ -2120,6 +2108,13 @@ ICE_OBJECT_PRX::__hash() const return _reference->hash(); } +void +ICE_OBJECT_PRX::__write(OutputStream& os) const +{ + os.write(__reference()->getIdentity()); + __reference()->streamWrite(&os); +} + bool Ice::proxyIdentityLess(const ObjectPrxPtr& lhs, const ObjectPrxPtr& rhs) { diff --git a/cpp/src/Ice/ProxyFactory.cpp b/cpp/src/Ice/ProxyFactory.cpp index 0b69caf3d82..dd15ae5b21d 100644 --- a/cpp/src/Ice/ProxyFactory.cpp +++ b/cpp/src/Ice/ProxyFactory.cpp @@ -15,7 +15,8 @@ #include <Ice/ReferenceFactory.h> #include <Ice/LocatorInfo.h> #include <Ice/RouterInfo.h> -#include <Ice/BasicStream.h> +#include <Ice/OutputStream.h> +#include <Ice/InputStream.h> #include <Ice/Properties.h> #include <Ice/LoggerUtil.h> #include <Ice/TraceLevels.h> @@ -70,7 +71,7 @@ IceInternal::ProxyFactory::proxyToProperty(const ObjectPrxPtr& proxy, const stri } ObjectPrxPtr -IceInternal::ProxyFactory::streamToProxy(BasicStream* s) const +IceInternal::ProxyFactory::streamToProxy(InputStream* s) const { Identity ident; s->read(ident); @@ -79,21 +80,6 @@ IceInternal::ProxyFactory::streamToProxy(BasicStream* s) const return referenceToProxy(ref); } -void -IceInternal::ProxyFactory::proxyToStream(const ObjectPrxPtr& proxy, BasicStream* s) const -{ - if(proxy) - { - s->write(proxy->__reference()->getIdentity()); - proxy->__reference()->streamWrite(s); - } - else - { - Identity ident; - s->write(ident); - } -} - ObjectPrxPtr IceInternal::ProxyFactory::referenceToProxy(const ReferencePtr& ref) const { diff --git a/cpp/src/Ice/ProxyFactory.h b/cpp/src/Ice/ProxyFactory.h index 18a4ae83552..1478facc01b 100644 --- a/cpp/src/Ice/ProxyFactory.h +++ b/cpp/src/Ice/ProxyFactory.h @@ -20,10 +20,16 @@ #include <Ice/OutgoingAsyncF.h> #include <Ice/Properties.h> -namespace IceInternal +namespace Ice { -class BasicStream; +class OutputStream; +class InputStream; + +} + +namespace IceInternal +{ class ProxyFactory : public IceUtil::Shared { @@ -35,8 +41,7 @@ public: Ice::ObjectPrxPtr propertyToProxy(const std::string&) const; Ice::PropertyDict proxyToProperty(const Ice::ObjectPrxPtr&, const std::string&) const; - Ice::ObjectPrxPtr streamToProxy(BasicStream*) const; - void proxyToStream(const Ice::ObjectPrxPtr&, BasicStream*) const; + Ice::ObjectPrxPtr streamToProxy(Ice::InputStream*) const; Ice::ObjectPrxPtr referenceToProxy(const ReferencePtr&) const; diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp index f002b8356f6..ea872f3562a 100644 --- a/cpp/src/Ice/Reference.cpp +++ b/cpp/src/Ice/Reference.cpp @@ -13,7 +13,7 @@ #include <Ice/Instance.h> #include <Ice/EndpointI.h> #include <Ice/OpaqueEndpointI.h> -#include <Ice/BasicStream.h> +#include <Ice/OutputStream.h> #include <Ice/RouterInfo.h> #include <Ice/Router.h> #include <Ice/LocatorInfo.h> @@ -187,7 +187,7 @@ Reference::hash() const } void -IceInternal::Reference::streamWrite(BasicStream* s) const +IceInternal::Reference::streamWrite(OutputStream* s) const { // // Don't write the identity here. Operations calling streamWrite @@ -210,7 +210,7 @@ IceInternal::Reference::streamWrite(BasicStream* s) const s->write(_secure); - if(s->getWriteEncoding() != Ice::Encoding_1_0) + if(s->getEncoding() != Ice::Encoding_1_0) { s->write(_protocol); s->write(_encoding); @@ -731,7 +731,7 @@ IceInternal::FixedReference::isWellKnown() const } void -IceInternal::FixedReference::streamWrite(BasicStream*) const +IceInternal::FixedReference::streamWrite(OutputStream*) const { throw FixedProxyException(__FILE__, __LINE__); } @@ -1182,7 +1182,7 @@ IceInternal::RoutableReference::isWellKnown() const } void -IceInternal::RoutableReference::streamWrite(BasicStream* s) const +IceInternal::RoutableReference::streamWrite(OutputStream* s) const { Reference::streamWrite(s); diff --git a/cpp/src/Ice/Reference.h b/cpp/src/Ice/Reference.h index 23baff439b9..e17396eaa7d 100644 --- a/cpp/src/Ice/Reference.h +++ b/cpp/src/Ice/Reference.h @@ -27,10 +27,15 @@ #include <Ice/Protocol.h> #include <Ice/Properties.h> -namespace IceInternal +namespace Ice { -class BasicStream; +class OutputStream; + +} + +namespace IceInternal +{ class Reference : public IceUtil::Shared { @@ -120,7 +125,7 @@ public: // // Marshal the reference. // - virtual void streamWrite(BasicStream*) const; + virtual void streamWrite(Ice::OutputStream*) const; // // Convert the reference to its string form. @@ -207,7 +212,7 @@ public: virtual bool isIndirect() const; virtual bool isWellKnown() const; - virtual void streamWrite(BasicStream*) const; + virtual void streamWrite(Ice::OutputStream*) const; virtual std::string toString() const; virtual Ice::PropertyDict toProperty(const std::string&) const; @@ -265,7 +270,7 @@ public: virtual bool isIndirect() const; virtual bool isWellKnown() const; - virtual void streamWrite(BasicStream*) const; + virtual void streamWrite(Ice::OutputStream*) const; virtual std::string toString() const; virtual Ice::PropertyDict toProperty(const std::string&) const; diff --git a/cpp/src/Ice/ReferenceFactory.cpp b/cpp/src/Ice/ReferenceFactory.cpp index fd6a833311d..c2ee1ad2452 100644 --- a/cpp/src/Ice/ReferenceFactory.cpp +++ b/cpp/src/Ice/ReferenceFactory.cpp @@ -20,7 +20,7 @@ #include <Ice/LocatorInfo.h> #include <Ice/Locator.h> #include <Ice/LoggerUtil.h> -#include <Ice/BasicStream.h> +#include <Ice/InputStream.h> #include <Ice/Properties.h> #include <Ice/DefaultsAndOverrides.h> #include <Ice/PropertyNames.h> @@ -586,7 +586,7 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP } ReferencePtr -IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s) +IceInternal::ReferenceFactory::create(const Identity& ident, InputStream* s) { // // Don't read the identity here. Operations calling this @@ -626,7 +626,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s) Ice::ProtocolVersion protocol; Ice::EncodingVersion encoding; - if(s->getReadEncoding() != Ice::Encoding_1_0) + if(s->getEncoding() != Ice::Encoding_1_0) { s->read(protocol); s->read(encoding); diff --git a/cpp/src/Ice/ReferenceFactory.h b/cpp/src/Ice/ReferenceFactory.h index 12c396ee440..c143f833199 100644 --- a/cpp/src/Ice/ReferenceFactory.h +++ b/cpp/src/Ice/ReferenceFactory.h @@ -52,7 +52,7 @@ public: // // Create a reference by unmarshaling it from a stream. // - ReferencePtr create(const ::Ice::Identity&, BasicStream*); + ReferencePtr create(const ::Ice::Identity&, Ice::InputStream*); ReferenceFactoryPtr setDefaultRouter(const ::Ice::RouterPrxPtr&); ::Ice::RouterPrxPtr getDefaultRouter() const; diff --git a/cpp/src/Ice/RequestHandler.h b/cpp/src/Ice/RequestHandler.h index c5d43370141..5859f013d58 100644 --- a/cpp/src/Ice/RequestHandler.h +++ b/cpp/src/Ice/RequestHandler.h @@ -29,8 +29,6 @@ class LocalException; namespace IceInternal { -class BasicStream; - class OutgoingBase; class ProxyOutgoingBase; diff --git a/cpp/src/Ice/ResponseHandler.h b/cpp/src/Ice/ResponseHandler.h index 36b12b1d1fe..724f784fc59 100644 --- a/cpp/src/Ice/ResponseHandler.h +++ b/cpp/src/Ice/ResponseHandler.h @@ -18,16 +18,21 @@ #include <Ice/ResponseHandlerF.h> #include <Ice/VirtualShared.h> -namespace IceInternal +namespace Ice { -class BasicStream; +class OutputStream; + +} + +namespace IceInternal +{ class ResponseHandler : public virtual ICE_SHARED { public: - virtual void sendResponse(Ice::Int, BasicStream*, Ice::Byte, bool) = 0; + virtual void sendResponse(Ice::Int, Ice::OutputStream*, Ice::Byte, bool) = 0; virtual void sendNoResponse() = 0; virtual bool systemException(Ice::Int, const Ice::SystemException&, bool) = 0; virtual void invokeException(Ice::Int, const Ice::LocalException&, int, bool) = 0; diff --git a/cpp/src/Ice/SlicedData.cpp b/cpp/src/Ice/SlicedData.cpp index d2e9b89d388..ad39ff4b9c0 100644 --- a/cpp/src/Ice/SlicedData.cpp +++ b/cpp/src/Ice/SlicedData.cpp @@ -8,7 +8,8 @@ // ********************************************************************** #include <Ice/SlicedData.h> -#include <Ice/BasicStream.h> +#include <Ice/OutputStream.h> +#include <Ice/InputStream.h> using namespace std; using namespace Ice; @@ -71,15 +72,15 @@ Ice::UnknownSlicedObject::getSlicedData() const } void -Ice::UnknownSlicedObject::__write(IceInternal::BasicStream* __os) const +Ice::UnknownSlicedObject::__write(Ice::OutputStream* __os) const { - __os->startWriteObject(_slicedData); - __os->endWriteObject(); + __os->startObject(_slicedData); + __os->endObject(); } void -Ice::UnknownSlicedObject::__read(IceInternal::BasicStream* __is) +Ice::UnknownSlicedObject::__read(Ice::InputStream* __is) { - __is->startReadObject(); - _slicedData = __is->endReadObject(true); + __is->startObject(); + _slicedData = __is->endObject(true); } diff --git a/cpp/src/Ice/Stream.cpp b/cpp/src/Ice/Stream.cpp deleted file mode 100644 index 603644fd82a..00000000000 --- a/cpp/src/Ice/Stream.cpp +++ /dev/null @@ -1,53 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <Ice/Stream.h> - -using namespace std; -using namespace Ice; -using namespace IceInternal; - -IceUtil::Shared* Ice::upCast(InputStream* p) { return p; } -IceUtil::Shared* Ice::upCast(OutputStream* p) { return p; } - -void -Ice::UserExceptionReader::__writeImpl(::IceInternal::BasicStream*) const -{ - assert(false); // Should never be called. -} - -void -Ice::UserExceptionReader::__readImpl(::IceInternal::BasicStream*) -{ - assert(false); // Should never be called. -} - -bool -Ice::UserExceptionReader::__usesClasses() const -{ - return usesClasses(); -} - -void -Ice::UserExceptionWriter::__writeImpl(::IceInternal::BasicStream*) const -{ - assert(false); // Should never be called. -} - -void -Ice::UserExceptionWriter::__readImpl(::IceInternal::BasicStream*) -{ - assert(false); // Should never be called. -} - -bool -Ice::UserExceptionWriter::__usesClasses() const -{ - return usesClasses(); -} diff --git a/cpp/src/Ice/StreamI.cpp b/cpp/src/Ice/StreamI.cpp deleted file mode 100644 index a44f891972b..00000000000 --- a/cpp/src/Ice/StreamI.cpp +++ /dev/null @@ -1,832 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <Ice/StreamI.h> -#include <Ice/Instance.h> -#include <Ice/DefaultsAndOverrides.h> -#include <Ice/Initialize.h> -#include <Ice/LocalException.h> -#include <Ice/UserExceptionFactory.h> - -using namespace std; -using namespace Ice; -using namespace IceInternal; - -namespace -{ - -// -// This class implements the internal interface UserExceptionFactory and delegates to -// the user-supplied instance of UserExceptionReaderFactory. -// -class UserExceptionFactoryI : public IceInternal::UserExceptionFactory -{ -public: - - UserExceptionFactoryI(const UserExceptionReaderFactoryPtr& factory) : - _factory(factory) - { - } - - virtual void createAndThrow(const string& id) - { - _factory->createAndThrow(id); - } - -private: - - const UserExceptionReaderFactoryPtr _factory; -}; - -} - -// -// UserExceptionReader -// -UserExceptionReader::UserExceptionReader(const CommunicatorPtr& communicator) : - _communicator(communicator) -{ -} - -UserExceptionReader::~UserExceptionReader() throw() -{ -} - -void -UserExceptionReader::__write(BasicStream*) const -{ - assert(false); -} - -void -UserExceptionReader::__read(BasicStream* is) -{ - InputStreamI* stream = reinterpret_cast<InputStreamI*>(is->closure()); - assert(stream); - read(stream); -} - -// -// InputStreamI -// -InputStreamI::InputStreamI(const CommunicatorPtr& communicator, const pair<const Byte*, const Byte*>& data, - bool copyData) : - _communicator(communicator), - _closure(0) -{ - Instance* instance = getInstance(communicator).get(); - initialize(instance, data, instance->defaultsAndOverrides()->defaultEncoding, copyData); -} - -InputStreamI::InputStreamI(const CommunicatorPtr& communicator, const pair<const Byte*, const Byte*>& data, - const EncodingVersion& v, bool copyData) : - _communicator(communicator), - _closure(0) -{ - initialize(getInstance(communicator).get(), data, v, copyData); -} - -InputStreamI::~InputStreamI() -{ - delete _is; -} - -CommunicatorPtr -InputStreamI::communicator() const -{ - return _communicator; -} - -void -InputStreamI::sliceObjects(bool b) -{ - _is->sliceObjects(b); -} - -Int -InputStreamI::readSize() -{ - return _is->readSize(); -} - -Int -InputStreamI::readAndCheckSeqSize(int minSize) -{ - return _is->readAndCheckSeqSize(minSize); -} - -ObjectPrxPtr -InputStreamI::readProxy() -{ - ObjectPrxPtr v; - _is->read(v); - return v; -} - -namespace -{ - -void -patchObject(void* addr, const ValuePtr& v) -{ - ReadObjectCallback* cb = static_cast<ReadObjectCallback*>(addr); - assert(cb); - cb->invoke(v); -} - -} - -void -InputStreamI::readObject(const ReadObjectCallbackPtr& cb) -{ - _callbacks.push_back(cb); // Keep reference to callback. - _is->read(patchObject, cb.get()); -} - -void -InputStreamI::read(bool& v) -{ - _is->read(v); -} - -void -InputStreamI::read(Byte& v) -{ - _is->read(v); -} - -void -InputStreamI::read(Short& v) -{ - _is->read(v); -} - -void -InputStreamI::read(Int& v) -{ - _is->read(v); -} - -void -InputStreamI::read(Long& v) -{ - _is->read(v); -} - -void -InputStreamI::read(Float& v) -{ - _is->read(v); -} - -void -InputStreamI::read(Double& v) -{ - _is->read(v); -} - -void -InputStreamI::read(string& v, bool convert) -{ - _is->read(v, convert); -} - -void -InputStreamI::read(const char*& vdata, size_t& vsize) -{ - _is->read(vdata, vsize); -} - -void -InputStreamI::read(const char*& vdata, size_t& vsize, string& holder) -{ - _is->read(vdata, vsize, holder); -} - -void -InputStreamI::read(vector<string>& v, bool convert) -{ - _is->read(v, convert); -} - -void -InputStreamI::read(wstring& v) -{ - _is->read(v); -} - -void -InputStreamI::read(vector<bool>& v) -{ - _is->read(v); -} - -void -InputStreamI::read(pair<const bool*, const bool*>& p, ::IceUtil::ScopedArray<bool>& result) -{ - _is->read(p, result); -} - -void -InputStreamI::read(pair<const Byte*, const Byte*>& p) -{ - _is->read(p); -} -void -InputStreamI::read(pair<const Short*, const Short*>& p, ::IceUtil::ScopedArray<Short>& result) -{ - _is->read(p, result); -} - -void -InputStreamI::read(pair<const Int*, const Int*>& p, ::IceUtil::ScopedArray<Int>& result) -{ - _is->read(p, result); -} - -void -InputStreamI::read(pair<const Long*, const Long*>& p, ::IceUtil::ScopedArray<Long>& result) -{ - _is->read(p, result); -} - -void -InputStreamI::read(pair<const Float*, const Float*>& p, ::IceUtil::ScopedArray<Float>& result) -{ - _is->read(p, result); -} - -void -InputStreamI::read(pair<const Double*, const Double*>& p, ::IceUtil::ScopedArray<Double>& result) -{ - _is->read(p, result); -} - -bool -InputStreamI::readOptional(Int tag, OptionalFormat format) -{ - return _is->readOpt(tag, format); -} - -void -InputStreamI::throwException() -{ - _is->throwException(); -} - -void -InputStreamI::throwException(const UserExceptionReaderFactoryPtr& factory) -{ - UserExceptionFactoryPtr del = new UserExceptionFactoryI(factory); - _is->throwException(del); -} - -void -InputStreamI::startObject() -{ - _is->startReadObject(); -} - -SlicedDataPtr -InputStreamI::endObject(bool preserve) -{ - return _is->endReadObject(preserve); -} - -void -InputStreamI::startException() -{ - _is->startReadException(); -} - -SlicedDataPtr -InputStreamI::endException(bool preserve) -{ - return _is->endReadException(preserve); -} - -string -InputStreamI::startSlice() -{ - return _is->startReadSlice(); -} - -void -InputStreamI::endSlice() -{ - _is->endReadSlice(); -} - -void -InputStreamI::skipSlice() -{ - _is->skipSlice(); -} - -EncodingVersion -InputStreamI::startEncapsulation() -{ - return _is->startReadEncaps(); -} - -void -InputStreamI::endEncapsulation() -{ - _is->endReadEncapsChecked(); -} - -EncodingVersion -InputStreamI::skipEncapsulation() -{ - return _is->skipEncaps(); -} - -EncodingVersion -InputStreamI::getEncoding() const -{ - return _is->getReadEncoding(); -} - -void -InputStreamI::readPendingObjects() -{ - _is->readPendingObjects(); -} - -InputStream::size_type -InputStreamI::pos() -{ - return _is->i - _is->b.begin(); -} - -void -InputStreamI::rewind() -{ - _is->clear(); - _is->i = _is->b.begin(); -} - -void -InputStreamI::skip(Int sz) -{ - _is->skip(sz); -} - -void -InputStreamI::skipSize() -{ - _is->skipSize(); -} - -void -InputStreamI::closure(void* p) -{ - _closure = p; -} - -void* -InputStreamI::closure() const -{ - return _closure; -} - -void -InputStreamI::initialize(Instance* instance, const pair<const Byte*, const Byte*>& buf, const EncodingVersion& v, - bool copyData) -{ - if(copyData) - { - _is = new BasicStream(instance, v); - _is->writeBlob(buf.first, buf.second - buf.first); - _is->i = _is->b.begin(); - } - else - { - _is = new BasicStream(instance, v, buf.first, buf.second); - } - _is->closure(this); -} - -// -// OutputStreamI -// -OutputStreamI::OutputStreamI(const CommunicatorPtr& communicator) : - _communicator(communicator), _own(true) -{ - Instance* instance = getInstance(communicator).get(); - _os = new BasicStream(instance, instance->defaultsAndOverrides()->defaultEncoding); - _os->closure(this); -} - -OutputStreamI::OutputStreamI(const CommunicatorPtr& communicator, const EncodingVersion& v) : - _communicator(communicator), _own(true) -{ - Instance* instance = getInstance(communicator).get(); - _os = new BasicStream(instance, v); - _os->closure(this); -} - -OutputStreamI::OutputStreamI(const CommunicatorPtr& communicator, BasicStream* os) : - _communicator(communicator), _os(os), _own(false) -{ - assert(os); - _os->closure(this); -} - -OutputStreamI::~OutputStreamI() -{ - if(_own) - { - delete _os; - } -} - -CommunicatorPtr -OutputStreamI::communicator() const -{ - return _communicator; -} - -void -OutputStreamI::writeObject(const ValuePtr& v) -{ - _os->write(v); -} - -void -OutputStreamI::writeException(const UserException& v) -{ - _os->write(v); -} - -void -OutputStreamI::writeProxy(const ObjectPrxPtr& v) -{ - _os->write(v); -} - -void -OutputStreamI::writeSize(Int sz) -{ - if(sz < 0) - { - throw MarshalException(__FILE__, __LINE__); - } - - _os->writeSize(sz); -} - -void -OutputStreamI::write(bool v) -{ - _os->write(v); -} - -void -OutputStreamI::write(Byte v) -{ - _os->write(v); -} - -void -OutputStreamI::write(Short v) -{ - _os->write(v); -} - -void -OutputStreamI::write(Int v) -{ - _os->write(v); -} - -void -OutputStreamI::write(Long v) -{ - _os->write(v); -} - -void -OutputStreamI::write(Float v) -{ - _os->write(v); -} - -void -OutputStreamI::write(Double v) -{ - _os->write(v); -} - -void -OutputStreamI::write(const string& v, bool convert) -{ - _os->write(v, convert); -} - -void -OutputStreamI::write(const char* vdata, size_t vsize, bool convert) -{ - _os->write(vdata, vsize, convert); -} - -void -OutputStreamI::write(const char* v, bool convert) -{ - _os->write(v, strlen(v), convert); -} - -void -OutputStreamI::write(const vector<string>& v, bool convert) -{ - if(v.size() == 0) - { - _os->writeSize(0); - } - else - { - _os->write(&v[0], &v[0] + v.size(), convert); - } -} - -void -OutputStreamI::write(const wstring& v) -{ - _os->write(v); -} - -void -OutputStreamI::write(const vector<bool>& v) -{ - _os->write(v); -} - -void -OutputStreamI::write(const bool* begin, const bool* end) -{ - _os->write(begin, end); -} - -void -OutputStreamI::write(const Byte* begin, const Byte* end) -{ - _os->write(begin, end); -} - -void -OutputStreamI::write(const Short* begin, const Short* end) -{ - _os->write(begin, end); -} - -void -OutputStreamI::write(const Int* begin, const Int* end) -{ - _os->write(begin, end); -} - -void -OutputStreamI::write(const Long* begin, const Long* end) -{ - _os->write(begin, end); -} - -void -OutputStreamI::write(const Float* begin, const Float* end) -{ - _os->write(begin, end); -} - -void -OutputStreamI::write(const Double* begin, const Double* end) -{ - _os->write(begin, end); -} - -bool -OutputStreamI::writeOptional(Int tag, OptionalFormat format) -{ - return _os->writeOpt(tag, format); -} - -void -OutputStreamI::startObject(const SlicedDataPtr& slicedData) -{ - _os->startWriteObject(slicedData); -} - -void -OutputStreamI::endObject() -{ - _os->endWriteObject(); -} - -void -OutputStreamI::startException(const SlicedDataPtr& slicedData) -{ - _os->startWriteException(slicedData); -} - -void -OutputStreamI::endException() -{ - _os->endWriteException(); -} - -void -OutputStreamI::startSlice(const string& typeId, int compactId, bool lastSlice) -{ - _os->startWriteSlice(typeId, compactId, lastSlice); -} - -void -OutputStreamI::endSlice() -{ - _os->endWriteSlice(); -} - -void -OutputStreamI::startEncapsulation(const EncodingVersion& version, FormatType format) -{ - _os->startWriteEncaps(version, format); -} - -void -OutputStreamI::startEncapsulation() -{ - _os->startWriteEncaps(); -} - -void -OutputStreamI::endEncapsulation() -{ - _os->endWriteEncapsChecked(); -} - -EncodingVersion -OutputStreamI::getEncoding() const -{ - return _os->getWriteEncoding(); -} - -void -OutputStreamI::writePendingObjects() -{ - _os->writePendingObjects(); -} - -void -OutputStreamI::finished(vector<Byte>& bytes) -{ - vector<Byte>(_os->b.begin(), _os->b.end()).swap(bytes); -} - -pair<const Byte*, const Byte*> -OutputStreamI::finished() -{ - if(_os->b.empty()) - { - return pair<const Byte*, const Byte*>(reinterpret_cast<Ice::Byte*>(0), reinterpret_cast<Ice::Byte*>(0)); - } - else - { - return pair<const Byte*, const Byte*>(&_os->b[0], &_os->b[0] + _os->b.size()); - } -} - -void -OutputStreamI::reset(bool clearBuffer) -{ - _os->clear(); - - if(clearBuffer) - { - _os->b.clear(); - } - else - { - _os->b.reset(); - } - - _os->i = _os->b.begin(); -} - -OutputStream::size_type -OutputStreamI::pos() -{ - return _os->b.size(); -} - -void -OutputStreamI::rewrite(Int sz, size_type p) -{ - _os->rewrite(sz, p); -} - -OutputStream::size_type -OutputStreamI::startSize() -{ - return _os->startSize(); -} - -void -OutputStreamI::endSize(OutputStream::size_type pos) -{ - _os->endSize(pos); -} - -// -// ObjectReader -// -void -ObjectReader::__write(BasicStream*) const -{ - assert(false); -} - -void -ObjectReader::__read(BasicStream* is) -{ - InputStreamI* stream = reinterpret_cast<InputStreamI*>(is->closure()); - assert(stream); - read(stream); -} - -void -ObjectReader::__write(const OutputStreamPtr&) const -{ - assert(false); -} - -void -ObjectReader::__read(const InputStreamPtr&) -{ - assert(false); -} - -// -// ObjectWriter -// -void -ObjectWriter::__write(BasicStream* os) const -{ - OutputStreamI* stream = reinterpret_cast<OutputStreamI*>(os->closure()); - assert(stream); - write(stream); -} - -void -ObjectWriter::__read(BasicStream*) -{ - assert(false); -} - -void -ObjectWriter::__write(const OutputStreamPtr&) const -{ - assert(false); -} - -void -ObjectWriter::__read(const InputStreamPtr&) -{ - assert(false); -} - -// -// UserExceptionWriter -// -UserExceptionWriter::UserExceptionWriter(const CommunicatorPtr& communicator) : - _communicator(communicator) -{ -} - -UserExceptionWriter::~UserExceptionWriter() throw() -{ -} - -void -UserExceptionWriter::__write(BasicStream* os) const -{ - OutputStreamI* stream = reinterpret_cast<OutputStreamI*>(os->closure()); - if(!stream) - { - // - // Required for IcePy usage - // - stream = new OutputStreamI(_communicator, os); - } - write(stream); -} - -void -UserExceptionWriter::__read(BasicStream*) -{ - assert(false); -} diff --git a/cpp/src/Ice/StreamI.h b/cpp/src/Ice/StreamI.h deleted file mode 100644 index d2b8fad2c89..00000000000 --- a/cpp/src/Ice/StreamI.h +++ /dev/null @@ -1,198 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef ICE_STREAM_I_H -#define ICE_STREAM_I_H - -#include <Ice/Stream.h> - -namespace IceInternal -{ - -// Forward declaration. -class BasicStream; - -}; - -namespace Ice -{ - -// -// Implement InputStream as a wrapper around BasicStream. -// -class InputStreamI : public InputStream -{ -public: - - InputStreamI(const CommunicatorPtr&, const std::pair<const Byte*, const Byte*>&, bool); - InputStreamI(const CommunicatorPtr&, const std::pair<const Byte*, const Byte*>&, const EncodingVersion&, bool); - virtual ~InputStreamI(); - - virtual CommunicatorPtr communicator() const; - - virtual void sliceObjects(bool); - - virtual Int readSize(); - virtual Int readAndCheckSeqSize(int); - - virtual ObjectPrxPtr readProxy(); - virtual void readObject(const ReadObjectCallbackPtr&); - - virtual void throwException(); - virtual void throwException(const UserExceptionReaderFactoryPtr&); - - virtual void startObject(); - virtual SlicedDataPtr endObject(bool); - - virtual void startException(); - virtual SlicedDataPtr endException(bool); - - virtual std::string startSlice(); - virtual void endSlice(); - virtual void skipSlice(); - - virtual EncodingVersion startEncapsulation(); - virtual void endEncapsulation(); - virtual EncodingVersion skipEncapsulation(); - - virtual EncodingVersion getEncoding() const; - - virtual void readPendingObjects(); - - virtual size_type pos(); - virtual void rewind(); - - virtual void skip(Int); - virtual void skipSize(); - - virtual void read(bool&); - virtual void read(Byte&); - virtual void read(Short&); - virtual void read(Int&); - virtual void read(Long&); - virtual void read(Float&); - virtual void read(Double&); - virtual void read(std::string&, bool = true); - virtual void read(const char*&, size_t&); - virtual void read(const char*&, size_t&, std::string&); - virtual void read(std::vector<std::string>&, bool); - virtual void read(std::wstring&); - virtual void read(std::vector<bool>&); - virtual void read(std::pair<const bool*, const bool*>&, ::IceUtil::ScopedArray<bool>&); - virtual void read(std::pair<const Byte*, const Byte*>&); - virtual void read(std::pair<const Short*, const Short*>&, ::IceUtil::ScopedArray<Short>&); - virtual void read(std::pair<const Int*, const Int*>&, ::IceUtil::ScopedArray<Int>&); - virtual void read(std::pair<const Long*, const Long*>&, ::IceUtil::ScopedArray<Long>&); - virtual void read(std::pair<const Float*, const Float*>&, ::IceUtil::ScopedArray<Float>&); - virtual void read(std::pair<const Double*, const Double*>&, ::IceUtil::ScopedArray<Double>&); - -#ifdef __SUNPRO_CC - using InputStream::read; -#endif - - virtual bool readOptional(Int, OptionalFormat); - - virtual void closure(void*); - virtual void* closure() const; - -private: - - void initialize(IceInternal::Instance*, const std::pair<const Byte*, const Byte*>&, const EncodingVersion&, bool); - - const CommunicatorPtr _communicator; - IceInternal::BasicStream* _is; - std::vector< ReadObjectCallbackPtr > _callbacks; - void* _closure; -}; - -// -// Implement OutputStream as a wrapper around BasicStream. -// -class OutputStreamI : public OutputStream -{ -public: - - OutputStreamI(const CommunicatorPtr&); - OutputStreamI(const CommunicatorPtr&, const EncodingVersion&); - OutputStreamI(const CommunicatorPtr&, IceInternal::BasicStream*); - virtual ~OutputStreamI(); - - virtual CommunicatorPtr communicator() const; - - virtual void writeObject(const ValuePtr&); - virtual void writeException(const UserException&); - virtual void writeProxy(const ObjectPrxPtr&); - - virtual void writeSize(Int); - - virtual void write(bool); - virtual void write(Byte); - virtual void write(Short); - virtual void write(Int); - virtual void write(Long); - virtual void write(Float); - virtual void write(Double); - virtual void write(const std::string&, bool = true); - virtual void write(const char*, size_t, bool = true); - virtual void write(const std::vector<std::string>&, bool); - virtual void write(const char*, bool = true); - virtual void write(const std::wstring&); - virtual void write(const std::vector<bool>&); - virtual void write(const bool*, const bool*); - virtual void write(const Byte*, const Byte*); - virtual void write(const Short*, const Short*); - virtual void write(const Int*, const Int*); - virtual void write(const Long*, const Long*); - virtual void write(const Float*, const Float*); - virtual void write(const Double*, const Double*); - -#ifdef __SUNPRO_CC - using OutputStream::write; -#endif - - virtual bool writeOptional(Int, OptionalFormat); - - virtual void startObject(const SlicedDataPtr&); - virtual void endObject(); - - virtual void startException(const SlicedDataPtr&); - virtual void endException(); - - virtual void startSlice(const std::string&, int, bool); - virtual void endSlice(); - - virtual void startEncapsulation(const EncodingVersion&, FormatType); - virtual void startEncapsulation(); - virtual void endEncapsulation(); - - virtual EncodingVersion getEncoding() const; - - virtual void writePendingObjects(); - - virtual void finished(std::vector< Byte >&); - virtual std::pair<const Byte*, const Byte*> finished(); - - virtual void reset(bool); - - virtual size_type pos(); - virtual void rewrite(Int, size_type); - - virtual size_type startSize(); - virtual void endSize(size_type pos); - -private: - - const CommunicatorPtr _communicator; - IceInternal::BasicStream* _os; - const bool _own; -}; - -} - -#endif diff --git a/cpp/src/Ice/TcpEndpointI.cpp b/cpp/src/Ice/TcpEndpointI.cpp index b29f349d679..234ec967c81 100644 --- a/cpp/src/Ice/TcpEndpointI.cpp +++ b/cpp/src/Ice/TcpEndpointI.cpp @@ -12,7 +12,8 @@ #include <Ice/TcpAcceptor.h> #include <Ice/TcpConnector.h> #include <Ice/TcpTransceiver.h> -#include <Ice/BasicStream.h> +#include <Ice/OutputStream.h> +#include <Ice/InputStream.h> #include <Ice/LocalException.h> #include <Ice/ProtocolInstance.h> #include <Ice/HashUtil.h> @@ -52,7 +53,7 @@ IceInternal::TcpEndpointI::TcpEndpointI(const ProtocolInstancePtr& instance) : { } -IceInternal::TcpEndpointI::TcpEndpointI(const ProtocolInstancePtr& instance, BasicStream* s) : +IceInternal::TcpEndpointI::TcpEndpointI(const ProtocolInstancePtr& instance, InputStream* s) : IPEndpointI(instance, s), _timeout(-1), _compress(false) @@ -253,7 +254,7 @@ IceInternal::TcpEndpointI::operator<(const LocalObject& r) const } void -IceInternal::TcpEndpointI::streamWriteImpl(BasicStream* s) const +IceInternal::TcpEndpointI::streamWriteImpl(OutputStream* s) const { IPEndpointI::streamWriteImpl(s); s->write(_timeout); @@ -372,7 +373,7 @@ IceInternal::TcpEndpointFactory::create(vector<string>& args, bool oaEndpoint) c } EndpointIPtr -IceInternal::TcpEndpointFactory::read(BasicStream* s) const +IceInternal::TcpEndpointFactory::read(InputStream* s) const { return ICE_MAKE_SHARED(TcpEndpointI, _instance, s); } diff --git a/cpp/src/Ice/TcpEndpointI.h b/cpp/src/Ice/TcpEndpointI.h index 911b22c62fa..d2309860c94 100644 --- a/cpp/src/Ice/TcpEndpointI.h +++ b/cpp/src/Ice/TcpEndpointI.h @@ -26,7 +26,7 @@ public: TcpEndpointI(const ProtocolInstancePtr&, const std::string&, Ice::Int, const Address&, Ice::Int, const std::string&, bool); TcpEndpointI(const ProtocolInstancePtr&); - TcpEndpointI(const ProtocolInstancePtr&, BasicStream*); + TcpEndpointI(const ProtocolInstancePtr&, Ice::InputStream*); virtual Ice::EndpointInfoPtr getInfo() const; virtual Ice::EndpointInfoPtr getWSInfo(const std::string&) const; @@ -54,7 +54,7 @@ public: protected: - virtual void streamWriteImpl(BasicStream*) const; + virtual void streamWriteImpl(Ice::OutputStream*) const; virtual void hashInit(Ice::Int&) const; virtual void fillEndpointInfo(Ice::IPEndpointInfo*) const; virtual bool checkOption(const std::string&, const std::string&, const std::string&); @@ -81,7 +81,7 @@ public: virtual Ice::Short type() const; virtual std::string protocol() const; virtual EndpointIPtr create(std::vector<std::string>&, bool) const; - virtual EndpointIPtr read(BasicStream*) const; + virtual EndpointIPtr read(Ice::InputStream*) const; virtual void destroy(); virtual EndpointFactoryPtr clone(const ProtocolInstancePtr&) const; diff --git a/cpp/src/Ice/ThreadPool.h b/cpp/src/Ice/ThreadPool.h index 6469d48c7b7..56c1a008990 100644 --- a/cpp/src/Ice/ThreadPool.h +++ b/cpp/src/Ice/ThreadPool.h @@ -23,7 +23,7 @@ #include <Ice/PropertiesF.h> #include <Ice/EventHandler.h> #include <Ice/Selector.h> -#include <Ice/BasicStream.h> +#include <Ice/InputStream.h> #include <Ice/ObserverHelper.h> #include <set> @@ -176,7 +176,7 @@ public: ThreadPoolCurrent(const InstancePtr&, const ThreadPoolPtr&, const ThreadPool::EventHandlerThreadPtr&); SocketOperation operation; - BasicStream stream; // A per-thread stream to be used by event handlers for optimization. + Ice::InputStream stream; // A per-thread stream to be used by event handlers for optimization. bool ioCompleted() const { diff --git a/cpp/src/Ice/TraceUtil.cpp b/cpp/src/Ice/TraceUtil.cpp index 19f672b1459..312709fea1c 100644 --- a/cpp/src/Ice/TraceUtil.cpp +++ b/cpp/src/Ice/TraceUtil.cpp @@ -16,7 +16,8 @@ #include <Ice/Proxy.h> #include <Ice/TraceLevels.h> #include <Ice/Logger.h> -#include <Ice/BasicStream.h> +#include <Ice/OutputStream.h> +#include <Ice/InputStream.h> #include <Ice/Protocol.h> #include <Ice/ReplyStatus.h> #include <set> @@ -26,7 +27,7 @@ using namespace Ice; using namespace IceInternal; static void -printIdentityFacetOperation(ostream& s, BasicStream& stream) +printIdentityFacetOperation(ostream& s, InputStream& stream) { Identity identity; stream.read(identity); @@ -66,7 +67,7 @@ getMessageTypeAsString(Byte type) } static void -printRequestHeader(ostream& s, BasicStream& stream) +printRequestHeader(ostream& s, InputStream& stream) { printIdentityFacetOperation(s, stream); @@ -114,7 +115,7 @@ printRequestHeader(ostream& s, BasicStream& stream) } } - Ice::EncodingVersion v = stream.skipEncaps(); + Ice::EncodingVersion v = stream.skipEncapsulation(); if(v > Ice::Encoding_1_0) { s << "\nencoding = " << v; @@ -122,7 +123,7 @@ printRequestHeader(ostream& s, BasicStream& stream) } static Byte -printHeader(ostream& s, BasicStream& stream) +printHeader(ostream& s, InputStream& stream) { Byte magicNumber; stream.read(magicNumber); // Don't bother printing the magic number @@ -187,7 +188,7 @@ printHeader(ostream& s, BasicStream& stream) } static void -printRequest(ostream& s, BasicStream& stream) +printRequest(ostream& s, InputStream& stream) { Int requestId; stream.read(requestId); @@ -201,7 +202,7 @@ printRequest(ostream& s, BasicStream& stream) } static void -printBatchRequest(ostream& s, BasicStream& stream) +printBatchRequest(ostream& s, InputStream& stream) { int batchRequestNum; stream.read(batchRequestNum); @@ -215,7 +216,7 @@ printBatchRequest(ostream& s, BasicStream& stream) } static void -printReply(ostream& s, BasicStream& stream) +printReply(ostream& s, InputStream& stream) { Int requestId; stream.read(requestId); @@ -319,7 +320,7 @@ printReply(ostream& s, BasicStream& stream) if(replyStatus == replyOK || replyStatus == replyUserException) { - Ice::EncodingVersion v = stream.skipEncaps(); + Ice::EncodingVersion v = stream.skipEncapsulation(); if(v > Ice::Encoding_1_0) { s << "\nencoding = " << v; @@ -328,7 +329,7 @@ printReply(ostream& s, BasicStream& stream) } static Byte -printMessage(ostream& s, BasicStream& stream) +printMessage(ostream& s, InputStream& stream) { Byte type = printHeader(s, stream); @@ -408,29 +409,28 @@ IceInternal::traceSlicing(const char* kind, const string& typeId, const char* sl } void -IceInternal::traceSend(const BasicStream& str, const LoggerPtr& logger, const TraceLevelsPtr& tl) +IceInternal::traceSend(const OutputStream& str, const LoggerPtr& logger, const TraceLevelsPtr& tl) { if(tl->protocol >= 1) { - BasicStream& stream = const_cast<BasicStream&>(str); - BasicStream::Container::iterator p = stream.i; - stream.i = stream.b.begin(); + OutputStream& stream = const_cast<OutputStream&>(str); + InputStream is(stream.instance(), stream.getEncoding(), stream); + is.i = is.b.begin(); ostringstream s; - Byte type = printMessage(s, stream); + Byte type = printMessage(s, is); logger->trace(tl->protocolCat, "sending " + getMessageTypeAsString(type) + " " + s.str()); - stream.i = p; } } void -IceInternal::traceRecv(const BasicStream& str, const LoggerPtr& logger, const TraceLevelsPtr& tl) +IceInternal::traceRecv(const InputStream& str, const LoggerPtr& logger, const TraceLevelsPtr& tl) { if(tl->protocol >= 1) { - BasicStream& stream = const_cast<BasicStream&>(str); - BasicStream::Container::iterator p = stream.i; + InputStream& stream = const_cast<InputStream&>(str); + InputStream::Container::iterator p = stream.i; stream.i = stream.b.begin(); ostringstream s; @@ -442,12 +442,29 @@ IceInternal::traceRecv(const BasicStream& str, const LoggerPtr& logger, const Tr } void -IceInternal::trace(const char* heading, const BasicStream& str, const LoggerPtr& logger, const TraceLevelsPtr& tl) +IceInternal::trace(const char* heading, const OutputStream& str, const LoggerPtr& logger, const TraceLevelsPtr& tl) +{ + if(tl->protocol >= 1) + { + OutputStream& stream = const_cast<OutputStream&>(str); + InputStream is(stream.instance(), stream.getEncoding(), stream); + is.i = is.b.begin(); + + ostringstream s; + s << heading; + printMessage(s, is); + + logger->trace(tl->protocolCat, s.str()); + } +} + +void +IceInternal::trace(const char* heading, const InputStream& str, const LoggerPtr& logger, const TraceLevelsPtr& tl) { if(tl->protocol >= 1) { - BasicStream& stream = const_cast<BasicStream&>(str); - BasicStream::Container::iterator p = stream.i; + InputStream& stream = const_cast<InputStream&>(str); + InputStream::Container::iterator p = stream.i; stream.i = stream.b.begin(); ostringstream s; @@ -458,4 +475,3 @@ IceInternal::trace(const char* heading, const BasicStream& str, const LoggerPtr& stream.i = p; } } - diff --git a/cpp/src/Ice/TraceUtil.h b/cpp/src/Ice/TraceUtil.h index 04562dccf9f..8f9e84e4965 100644 --- a/cpp/src/Ice/TraceUtil.h +++ b/cpp/src/Ice/TraceUtil.h @@ -13,14 +13,21 @@ #include <Ice/LoggerF.h> #include <Ice/TraceLevelsF.h> -namespace IceInternal +namespace Ice { -class BasicStream; +class OutputStream; +class InputStream; + +} + +namespace IceInternal +{ -void traceSend(const BasicStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&); -void traceRecv(const BasicStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&); -void trace(const char*, const BasicStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&); +void traceSend(const ::Ice::OutputStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&); +void traceRecv(const ::Ice::InputStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&); +void trace(const char*, const ::Ice::OutputStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&); +void trace(const char*, const ::Ice::InputStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&); void traceSlicing(const char*, const ::std::string&, const char *, const ::Ice::LoggerPtr&); } diff --git a/cpp/src/Ice/UdpEndpointI.cpp b/cpp/src/Ice/UdpEndpointI.cpp index 4cf6d750b1e..6643bd35e2d 100644 --- a/cpp/src/Ice/UdpEndpointI.cpp +++ b/cpp/src/Ice/UdpEndpointI.cpp @@ -11,7 +11,8 @@ #include <Ice/Network.h> #include <Ice/UdpConnector.h> #include <Ice/UdpTransceiver.h> -#include <Ice/BasicStream.h> +#include <Ice/OutputStream.h> +#include <Ice/InputStream.h> #include <Ice/LocalException.h> #include <Ice/Protocol.h> #include <Ice/ProtocolInstance.h> @@ -56,13 +57,13 @@ IceInternal::UdpEndpointI::UdpEndpointI(const ProtocolInstancePtr& instance) : { } -IceInternal::UdpEndpointI::UdpEndpointI(const ProtocolInstancePtr& instance, BasicStream* s) : +IceInternal::UdpEndpointI::UdpEndpointI(const ProtocolInstancePtr& instance, InputStream* s) : IPEndpointI(instance, s), _mcastTtl(-1), _connect(false), _compress(false) { - if(s->getReadEncoding() == Ice::Encoding_1_0) + if(s->getEncoding() == Ice::Encoding_1_0) { Ice::Byte b; s->read(b); @@ -286,10 +287,10 @@ IceInternal::UdpEndpointI::operator<(const LocalObject& r) const } void -IceInternal::UdpEndpointI::streamWriteImpl(BasicStream* s) const +IceInternal::UdpEndpointI::streamWriteImpl(OutputStream* s) const { IPEndpointI::streamWriteImpl(s); - if(s->getWriteEncoding() == Ice::Encoding_1_0) + if(s->getEncoding() == Ice::Encoding_1_0) { s->write(Ice::Protocol_1_0); s->write(Ice::Encoding_1_0); @@ -450,7 +451,7 @@ IceInternal::UdpEndpointFactory::create(vector<string>& args, bool oaEndpoint) c } EndpointIPtr -IceInternal::UdpEndpointFactory::read(BasicStream* s) const +IceInternal::UdpEndpointFactory::read(InputStream* s) const { return ICE_MAKE_SHARED(UdpEndpointI, _instance, s); } diff --git a/cpp/src/Ice/UdpEndpointI.h b/cpp/src/Ice/UdpEndpointI.h index c29a9462b96..a3b0168c7bc 100644 --- a/cpp/src/Ice/UdpEndpointI.h +++ b/cpp/src/Ice/UdpEndpointI.h @@ -25,7 +25,7 @@ public: UdpEndpointI(const ProtocolInstancePtr&, const std::string&, Ice::Int, const Address&, const std::string&, Ice::Int, bool, const std::string&, bool); UdpEndpointI(const ProtocolInstancePtr&); - UdpEndpointI(const ProtocolInstancePtr&, BasicStream*); + UdpEndpointI(const ProtocolInstancePtr&, Ice::InputStream*); virtual Ice::EndpointInfoPtr getInfo() const; @@ -53,7 +53,7 @@ public: protected: - virtual void streamWriteImpl(BasicStream*) const; + virtual void streamWriteImpl(Ice::OutputStream*) const; virtual void hashInit(Ice::Int&) const; virtual void fillEndpointInfo(Ice::IPEndpointInfo*) const; virtual bool checkOption(const std::string&, const std::string&, const std::string&); @@ -82,7 +82,7 @@ public: virtual Ice::Short type() const; virtual std::string protocol() const; virtual EndpointIPtr create(std::vector<std::string>&, bool) const; - virtual EndpointIPtr read(BasicStream*) const; + virtual EndpointIPtr read(Ice::InputStream*) const; virtual void destroy(); virtual EndpointFactoryPtr clone(const ProtocolInstancePtr&) const; diff --git a/cpp/src/Ice/Value.cpp b/cpp/src/Ice/Value.cpp index 174a8a0857b..7e0b9e220da 100644 --- a/cpp/src/Ice/Value.cpp +++ b/cpp/src/Ice/Value.cpp @@ -8,8 +8,9 @@ // ********************************************************************** #include <Ice/Value.h> -#include <Ice/Stream.h> #include <Ice/LocalException.h> +#include <Ice/OutputStream.h> +#include <Ice/InputStream.h> #ifdef ICE_CPP11_MAPPING @@ -28,19 +29,19 @@ Ice::Value::ice_postUnmarshal() } void -Ice::Value::__write(IceInternal::BasicStream* os) const +Ice::Value::__write(Ice::OutputStream* os) const { - os->startWriteObject(0); + os->startObject(0); __writeImpl(os); - os->endWriteObject(); + os->endObject(); } void -Ice::Value::__read(IceInternal::BasicStream* is) +Ice::Value::__read(Ice::InputStream* is) { - is->startReadObject(); + is->startObject(); __readImpl(is); - is->endReadObject(false); + is->endObject(false); } namespace diff --git a/cpp/src/Ice/ValueFactoryManager.cpp b/cpp/src/Ice/ValueFactoryManager.cpp deleted file mode 100644 index a1f669cf4c1..00000000000 --- a/cpp/src/Ice/ValueFactoryManager.cpp +++ /dev/null @@ -1,179 +0,0 @@ - -// ********************************************************************** -// -// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#include <IceUtil/DisableWarnings.h> -#include <Ice/ValueFactoryManager.h> -#include <Ice/ValueFactory.h> -#include <Ice/ObjectFactory.h> -#include <Ice/Object.h> -#include <Ice/Functional.h> -#include <Ice/LocalException.h> - -using namespace std; -using namespace Ice; -using namespace IceInternal; - -IceUtil::Shared* IceInternal::upCast(ValueFactoryManager* p) { return p; } - -void -IceInternal::ValueFactoryManager::add(const ICE_VALUE_FACTORY& factory, const string& id) -{ - IceUtil::Mutex::Lock sync(*this); - - if((_factoryMapHint != _factoryMap.end() && _factoryMapHint->first == id) - || _factoryMap.find(id) != _factoryMap.end()) - { - AlreadyRegisteredException ex(__FILE__, __LINE__); - ex.kindOfObject = "value factory"; - ex.id = id; - throw ex; - } - - _factoryMapHint = _factoryMap.insert(_factoryMapHint, pair<const string, ICE_VALUE_FACTORY>(id, factory)); -} - -void -IceInternal::ValueFactoryManager::add(const Ice::ObjectFactoryPtr& factory, const string& id) -{ - IceUtil::Mutex::Lock sync(*this); - - // Check value factory map since an object factory is added to both object - // and value factory maps, but not vise versa - if((_factoryMapHint != _factoryMap.end() && _factoryMapHint->first == id) - || _factoryMap.find(id) != _factoryMap.end()) - { - AlreadyRegisteredException ex(__FILE__, __LINE__); - ex.kindOfObject = "value factory"; - ex.id = id; - throw ex; - } - -#ifdef ICE_CPP11_MAPPING - _factoryMapHint = _factoryMap.insert(_factoryMapHint, - pair<const string, ICE_VALUE_FACTORY>(id, - [factory](const string& id) - { - return factory->create(id); - } - )); -#else - - class ValueFactoryWrapper: public Ice::ValueFactory - { - public: - ValueFactoryWrapper(const Ice::ObjectFactoryPtr& factory) : _objectFactory(factory) - { - } - - Ice::ValuePtr create(const std::string& id) - { - return _objectFactory->create(id); - } - - private: - Ice::ObjectFactoryPtr _objectFactory; - }; - - _factoryMapHint = _factoryMap.insert(_factoryMapHint, - pair<const string, ICE_VALUE_FACTORY>(id, new ValueFactoryWrapper(factory))); -#endif - - _objectFactoryMapHint = _objectFactoryMap.insert(_objectFactoryMapHint, - pair<const string, Ice::ObjectFactoryPtr>(id, factory)); -} - -ICE_VALUE_FACTORY -IceInternal::ValueFactoryManager::find(const string& id) const -{ - IceUtil::Mutex::Lock sync(*this); - - FactoryMap& factoryMap = const_cast<FactoryMap&>(_factoryMap); - - FactoryMap::iterator p = factoryMap.end(); - if(_factoryMapHint != factoryMap.end()) - { - if(_factoryMapHint->first == id) - { - p = _factoryMapHint; - } - } - - if(p == factoryMap.end()) - { - p = factoryMap.find(id); - } - - if(p != factoryMap.end()) - { - _factoryMapHint = p; - return p->second; - } - else - { - return ICE_NULLPTR; - } -} - -Ice::ObjectFactoryPtr -IceInternal::ValueFactoryManager::findObjectFactory(const string& id) const -{ - IceUtil::Mutex::Lock sync(*this); - - ObjectFactoryMap& objectfactoryMap = const_cast<ObjectFactoryMap&>(_objectFactoryMap); - - ObjectFactoryMap::iterator p = objectfactoryMap.end(); - if(_objectFactoryMapHint != objectfactoryMap.end()) - { - if(_objectFactoryMapHint->first == id) - { - p = _objectFactoryMapHint; - } - } - - if(p == objectfactoryMap.end()) - { - p = objectfactoryMap.find(id); - } - - if(p != objectfactoryMap.end()) - { - _objectFactoryMapHint = p; - return p->second; - } - else - { - return ICE_NULLPTR; - } -} - -IceInternal::ValueFactoryManager::ValueFactoryManager() : - _factoryMapHint(_factoryMap.end()), - _objectFactoryMapHint(_objectFactoryMap.end()) -{ -} - -void -IceInternal::ValueFactoryManager::destroy() -{ - ObjectFactoryMap oldMap; - { - IceUtil::Mutex::Lock sync(*this); - _factoryMap.clear(); - _factoryMapHint = _factoryMap.end(); - oldMap.swap(_objectFactoryMap); - _objectFactoryMapHint = _objectFactoryMap.end(); - } - - // - // Destroy all outside lock - // - for_each(oldMap.begin(), oldMap.end(), - Ice::secondVoidMemFun<const string, Ice::ObjectFactory>(&Ice::ObjectFactory::destroy)); -} diff --git a/cpp/src/Ice/ValueFactoryManager.h b/cpp/src/Ice/ValueFactoryManager.h deleted file mode 100644 index 433e9ca3a14..00000000000 --- a/cpp/src/Ice/ValueFactoryManager.h +++ /dev/null @@ -1,48 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -#ifndef ICE_VALUE_FACTORY_MANAGER_H -#define ICE_VALUE_FACTORY_MANAGER_H - -#include <IceUtil/Shared.h> -#include <IceUtil/Mutex.h> -#include <Ice/ValueFactoryManagerF.h> -#include <Ice/ValueFactory.h> -#include <Ice/ObjectFactory.h> - -namespace IceInternal -{ - -class ValueFactoryManager : public ::IceUtil::Shared, public ::IceUtil::Mutex -{ -public: - - void add(const ICE_VALUE_FACTORY&, const std::string&); - void add(const Ice::ObjectFactoryPtr&, const std::string&); - ICE_VALUE_FACTORY find(const std::string&) const; - Ice::ObjectFactoryPtr findObjectFactory(const std::string&) const; - typedef std::map<std::string, ICE_VALUE_FACTORY> FactoryMap; - typedef std::map<std::string, Ice::ObjectFactoryPtr> ObjectFactoryMap; - -private: - - ValueFactoryManager(); - void destroy(); - friend class Instance; - - FactoryMap _factoryMap; - mutable FactoryMap::iterator _factoryMapHint; - - ObjectFactoryMap _objectFactoryMap; - mutable ObjectFactoryMap::iterator _objectFactoryMapHint; -}; - -} - -#endif diff --git a/cpp/src/Ice/ValueFactoryManagerI.cpp b/cpp/src/Ice/ValueFactoryManagerI.cpp new file mode 100644 index 00000000000..3f914041734 --- /dev/null +++ b/cpp/src/Ice/ValueFactoryManagerI.cpp @@ -0,0 +1,74 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + +#include <IceUtil/DisableWarnings.h> +#include <Ice/ValueFactoryManagerI.h> +#include <Ice/LocalException.h> + +using namespace std; +using namespace Ice; +using namespace IceInternal; + +void +#ifdef ICE_CPP11_MAPPING +IceInternal::ValueFactoryManagerI::add(function<Ice::ValuePtr (string)> factory, const string& id) +#else +IceInternal::ValueFactoryManagerI::add(const Ice::ValueFactoryPtr& factory, const string& id) +#endif +{ + IceUtil::Mutex::Lock sync(*this); + + if((_factoryMapHint != _factoryMap.end() && _factoryMapHint->first == id) + || _factoryMap.find(id) != _factoryMap.end()) + { + AlreadyRegisteredException ex(__FILE__, __LINE__); + ex.kindOfObject = "value factory"; + ex.id = id; + throw ex; + } + + _factoryMapHint = _factoryMap.insert(_factoryMapHint, pair<const string, ICE_VALUE_FACTORY>(id, factory)); +} + +ICE_VALUE_FACTORY +IceInternal::ValueFactoryManagerI::find(const string& id) const +{ + IceUtil::Mutex::Lock sync(*this); + + FactoryMap& factoryMap = const_cast<FactoryMap&>(_factoryMap); + + FactoryMap::iterator p = factoryMap.end(); + if(_factoryMapHint != factoryMap.end()) + { + if(_factoryMapHint->first == id) + { + p = _factoryMapHint; + } + } + + if(p == factoryMap.end()) + { + p = factoryMap.find(id); + } + + if(p != factoryMap.end()) + { + _factoryMapHint = p; + return p->second; + } + else + { + return ICE_NULLPTR; + } +} + +IceInternal::ValueFactoryManagerI::ValueFactoryManagerI() : + _factoryMapHint(_factoryMap.end()) +{ +} diff --git a/cpp/src/Ice/ValueFactoryManagerI.h b/cpp/src/Ice/ValueFactoryManagerI.h new file mode 100644 index 00000000000..bdddb42cb65 --- /dev/null +++ b/cpp/src/Ice/ValueFactoryManagerI.h @@ -0,0 +1,49 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved. +// +// This copy of Ice is licensed to you under the terms described in the +// ICE_LICENSE file included in this distribution. +// +// ********************************************************************** + +#ifndef ICE_VALUE_FACTORY_MANAGER_I_H +#define ICE_VALUE_FACTORY_MANAGER_I_H + +#include <Ice/ValueFactory.h> +#include <Ice/VirtualShared.h> +#include <IceUtil/Mutex.h> + +namespace IceInternal +{ + +class ValueFactoryManagerI; +ICE_DEFINE_PTR(ValueFactoryManagerIPtr, ValueFactoryManagerI); + +class ValueFactoryManagerI : public Ice::EnableSharedFromThis<ValueFactoryManagerI>, + public Ice::ValueFactoryManager, + public IceUtil::Mutex +{ +public: + + ValueFactoryManagerI(); + +#ifdef ICE_CPP11_MAPPING + virtual void add(std::function<std::shared_ptr<Ice::Value> (std::string)>, const std::string&); + virtual std::function<std::shared_ptr<Ice::Value> (const std::string&)> find(const std::string&) const; +#else + virtual void add(const Ice::ValueFactoryPtr&, const std::string&); + virtual Ice::ValueFactoryPtr find(const std::string&) const; +#endif + +private: + + typedef std::map<std::string, ICE_VALUE_FACTORY> FactoryMap; + + FactoryMap _factoryMap; + mutable FactoryMap::iterator _factoryMapHint; +}; + +} + +#endif diff --git a/cpp/src/Ice/WSEndpoint.cpp b/cpp/src/Ice/WSEndpoint.cpp index e54bb19c442..b4b8186a010 100644 --- a/cpp/src/Ice/WSEndpoint.cpp +++ b/cpp/src/Ice/WSEndpoint.cpp @@ -10,7 +10,8 @@ #include <Ice/WSEndpoint.h> #include <Ice/WSAcceptor.h> #include <Ice/WSConnector.h> -#include <Ice/BasicStream.h> +#include <Ice/OutputStream.h> +#include <Ice/InputStream.h> #include <Ice/LocalException.h> #include <Ice/IPEndpointI.h> #include <Ice/HashUtil.h> @@ -44,7 +45,7 @@ IceInternal::WSEndpoint::WSEndpoint(const ProtocolInstancePtr& inst, const Endpo } } -IceInternal::WSEndpoint::WSEndpoint(const ProtocolInstancePtr& instance, const EndpointIPtr& del, BasicStream* s) : +IceInternal::WSEndpoint::WSEndpoint(const ProtocolInstancePtr& instance, const EndpointIPtr& del, InputStream* s) : _instance(instance), _delegate(ICE_DYNAMIC_CAST(IPEndpointI, del)) { @@ -76,12 +77,12 @@ IceInternal::WSEndpoint::protocol() const } void -IceInternal::WSEndpoint::streamWrite(BasicStream* s) const +IceInternal::WSEndpoint::streamWrite(OutputStream* s) const { - s->startWriteEncaps(); + s->startEncapsulation(); _delegate->streamWriteImpl(s); s->write(_resource, false); - s->endWriteEncaps(); + s->endEncapsulation(); } Int @@ -409,7 +410,7 @@ IceInternal::WSEndpointFactory::create(vector<string>& args, bool oaEndpoint) co } EndpointIPtr -IceInternal::WSEndpointFactory::read(BasicStream* s) const +IceInternal::WSEndpointFactory::read(InputStream* s) const { return ICE_MAKE_SHARED(WSEndpoint, _instance, _delegate->read(s), s); } diff --git a/cpp/src/Ice/WSEndpoint.h b/cpp/src/Ice/WSEndpoint.h index c6bec0f1082..84becdf131c 100644 --- a/cpp/src/Ice/WSEndpoint.h +++ b/cpp/src/Ice/WSEndpoint.h @@ -37,12 +37,12 @@ public: WSEndpoint(const ProtocolInstancePtr&, const EndpointIPtr&, const std::string&); WSEndpoint(const ProtocolInstancePtr&, const EndpointIPtr&, std::vector<std::string>&); - WSEndpoint(const ProtocolInstancePtr&, const EndpointIPtr&, BasicStream*); + WSEndpoint(const ProtocolInstancePtr&, const EndpointIPtr&, Ice::InputStream*); virtual Ice::EndpointInfoPtr getInfo() const; virtual Ice::Short type() const; virtual const std::string& protocol() const; - virtual void streamWrite(BasicStream*) const; + virtual void streamWrite(Ice::OutputStream*) const; virtual Ice::Int timeout() const; virtual EndpointIPtr timeout(Ice::Int) const; @@ -97,7 +97,7 @@ public: virtual Ice::Short type() const; virtual std::string protocol() const; virtual EndpointIPtr create(std::vector<std::string>&, bool) const; - virtual EndpointIPtr read(BasicStream*) const; + virtual EndpointIPtr read(Ice::InputStream*) const; virtual void destroy(); virtual EndpointFactoryPtr clone(const ProtocolInstancePtr&) const; diff --git a/cpp/src/Ice/winrt/StreamEndpointI.cpp b/cpp/src/Ice/winrt/StreamEndpointI.cpp index bdd3dc0295d..f63434d08b7 100644 --- a/cpp/src/Ice/winrt/StreamEndpointI.cpp +++ b/cpp/src/Ice/winrt/StreamEndpointI.cpp @@ -13,7 +13,8 @@ #include <Ice/winrt/StreamTransceiver.h> #include <Ice/Network.h> -#include <Ice/BasicStream.h> +#include <Ice/OutputStream.h> +#include <Ice/InputStream.h> #include <Ice/LocalException.h> #include <Ice/ProtocolInstance.h> #include <Ice/DefaultsAndOverrides.h> @@ -61,7 +62,7 @@ IceInternal::StreamEndpointI::StreamEndpointI(const ProtocolInstancePtr& instanc { } -IceInternal::StreamEndpointI::StreamEndpointI(const ProtocolInstancePtr& instance, BasicStream* s) : +IceInternal::StreamEndpointI::StreamEndpointI(const ProtocolInstancePtr& instance, InputStream* s) : IPEndpointI(instance, s), _timeout(-1), _compress(false) @@ -291,7 +292,7 @@ IceInternal::StreamEndpointI::operator<(const LocalObject& r) const } void -IceInternal::StreamEndpointI::streamWriteImpl(BasicStream* s) const +IceInternal::StreamEndpointI::streamWriteImpl(OutputStream* s) const { IPEndpointI::streamWriteImpl(s); s->write(_timeout); @@ -422,7 +423,7 @@ IceInternal::StreamEndpointFactory::create(vector<string>& args, bool oaEndpoint } EndpointIPtr -IceInternal::StreamEndpointFactory::read(BasicStream* s) const +IceInternal::StreamEndpointFactory::read(InputStream* s) const { return new StreamEndpointI(_instance, s); } diff --git a/cpp/src/Ice/winrt/StreamEndpointI.h b/cpp/src/Ice/winrt/StreamEndpointI.h index a275081964e..70f2c16e5dd 100644 --- a/cpp/src/Ice/winrt/StreamEndpointI.h +++ b/cpp/src/Ice/winrt/StreamEndpointI.h @@ -26,7 +26,7 @@ public: StreamEndpointI(const ProtocolInstancePtr&, const std::string&, Ice::Int, Ice::Int, const std::string&, bool); StreamEndpointI(const ProtocolInstancePtr&); - StreamEndpointI(const ProtocolInstancePtr&, BasicStream*); + StreamEndpointI(const ProtocolInstancePtr&, Ice::InputStream*); virtual Ice::EndpointInfoPtr getInfo() const; virtual Ice::EndpointInfoPtr getWSInfo(const std::string&) const; @@ -52,7 +52,7 @@ public: protected: - virtual void streamWriteImpl(BasicStream*) const; + virtual void streamWriteImpl(Ice::OutputStream*) const; virtual void hashInit(Ice::Int&) const; virtual void initWithOptions(std::vector<std::string>&, bool); virtual void fillEndpointInfo(Ice::IPEndpointInfo*) const; @@ -80,7 +80,7 @@ public: virtual Ice::Short type() const; virtual std::string protocol() const; virtual EndpointIPtr create(std::vector<std::string>&, bool) const; - virtual EndpointIPtr read(BasicStream*) const; + virtual EndpointIPtr read(Ice::InputStream*) const; virtual void destroy(); virtual EndpointFactoryPtr clone(const ProtocolInstancePtr&) const; |