diff options
Diffstat (limited to 'cpp/src')
30 files changed, 296 insertions, 22 deletions
diff --git a/cpp/src/Freeze/.depend.mak b/cpp/src/Freeze/.depend.mak index dec23d3d38a..dec23d3d38a 100644..100755 --- a/cpp/src/Freeze/.depend.mak +++ b/cpp/src/Freeze/.depend.mak diff --git a/cpp/src/FreezeScript/.depend.mak b/cpp/src/FreezeScript/.depend.mak index 3dca6f13fdb..3dca6f13fdb 100644..100755 --- a/cpp/src/FreezeScript/.depend.mak +++ b/cpp/src/FreezeScript/.depend.mak diff --git a/cpp/src/Glacier2/.depend.mak b/cpp/src/Glacier2/.depend.mak index 6646f6442a0..6646f6442a0 100644..100755 --- a/cpp/src/Glacier2/.depend.mak +++ b/cpp/src/Glacier2/.depend.mak diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/.depend.mak b/cpp/src/Glacier2CryptPermissionsVerifier/.depend.mak index 0ae430afb41..0ae430afb41 100644..100755 --- a/cpp/src/Glacier2CryptPermissionsVerifier/.depend.mak +++ b/cpp/src/Glacier2CryptPermissionsVerifier/.depend.mak diff --git a/cpp/src/Glacier2Lib/.depend.mak b/cpp/src/Glacier2Lib/.depend.mak index 01270f7560b..01270f7560b 100644..100755 --- a/cpp/src/Glacier2Lib/.depend.mak +++ b/cpp/src/Glacier2Lib/.depend.mak diff --git a/cpp/src/Ice/.depend.mak b/cpp/src/Ice/.depend.mak index 4d39100a7a7..751a423addb 100644..100755 --- a/cpp/src/Ice/.depend.mak +++ b/cpp/src/Ice/.depend.mak @@ -1503,6 +1503,7 @@ ConnectRequestHandler.obj: \ "$(includedir)\Ice\BuiltinSequences.h" \ "RouterInfo.h" \ "ConnectionRequestHandler.h" \ + "RequestHandlerFactory.h" \ "Instance.h" \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceUtil\Timer.h" \ @@ -2851,6 +2852,7 @@ Instance.obj: \ "NetworkProxy.h" \ "EndpointFactoryManager.h" \ "EndpointFactoryF.h" \ + "RequestHandlerFactory.h" \ "RetryQueue.h" \ "$(includedir)\Ice\DynamicLibrary.h" \ "PluginManagerI.h" \ @@ -5241,20 +5243,14 @@ Proxy.obj: \ "$(includedir)\Ice\LoggerF.h" \ "$(includedir)\Ice\Outgoing.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ - "ConnectRequestHandler.h" \ - "RequestHandler.h" \ - "RouterInfo.h" \ - "CollocatedRequestHandler.h" \ - "ResponseHandler.h" \ - "$(includedir)\Ice\LocalException.h" \ - "TraceLevelsF.h" \ - "ConnectionRequestHandler.h" \ + "RequestHandlerFactory.h" \ "EndpointI.h" \ "TransceiverF.h" \ "ConnectorF.h" \ "AcceptorF.h" \ "Instance.h" \ "$(includedir)\Ice\InstrumentationF.h" \ + "TraceLevelsF.h" \ "DefaultsAndOverridesF.h" \ "EndpointFactoryManagerF.h" \ "IPEndpointIF.h" \ @@ -5268,7 +5264,9 @@ Proxy.obj: \ "$(includedir)\Ice\Plugin.h" \ "ImplicitContextI.h" \ "$(includedir)\Ice\ImplicitContext.h" \ + "$(includedir)\Ice\LocalException.h" \ "$(includedir)\Ice\Process.h" \ + "RouterInfo.h" \ "LocatorInfo.h" \ "ConnectionI.h" \ "..\..\src\IceUtil\StopWatch.h" \ @@ -5276,6 +5274,8 @@ Proxy.obj: \ "EventHandlerF.h" \ "Network.h" \ "ProtocolInstanceF.h" \ + "RequestHandler.h" \ + "ResponseHandler.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Stream.h" \ @@ -5760,6 +5760,124 @@ RequestHandler.obj: \ "$(includedir)\Ice\PropertiesAdmin.h" \ "$(includedir)\Ice\BuiltinSequences.h" \ +RequestHandlerFactory.obj: \ + RequestHandlerFactory.cpp \ + "RequestHandlerFactory.h" \ + "$(includedir)\IceUtil\Shared.h" \ + "$(includedir)\IceUtil\Config.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\RequestHandlerF.h" \ + "$(includedir)\Ice\Handle.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\Ice\Config.h" \ + "$(includedir)\Ice\ProxyF.h" \ + "$(includedir)\Ice\ProxyHandle.h" \ + "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\InstanceF.h" \ + "CollocatedRequestHandler.h" \ + "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "RequestHandler.h" \ + "$(includedir)\IceUtil\UniquePtr.h" \ + "$(includedir)\Ice\OutgoingAsyncF.h" \ + "$(includedir)\Ice\ConnectionIF.h" \ + "$(includedir)\Ice\LocalObject.h" \ + "$(includedir)\Ice\LocalObjectF.h" \ + "ResponseHandler.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\ObjectF.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)\IceUtil\Optional.h" \ + "$(includedir)\Ice\Identity.h" \ + "$(includedir)\IceUtil\UndefSysMacros.h" \ + "$(includedir)\Ice\Version.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\ResponseHandlerF.h" \ + "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\Object.h" \ + "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\Current.h" \ + "$(includedir)\Ice\ObjectAdapterF.h" \ + "$(includedir)\Ice\ConnectionF.h" \ + "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\Buffer.h" \ + "$(includedir)\Ice\Protocol.h" \ + "$(includedir)\Ice\SlicedDataF.h" \ + "$(includedir)\Ice\UserExceptionFactory.h" \ + "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\LoggerF.h" \ + "TraceLevelsF.h" \ + "ConnectRequestHandler.h" \ + "Reference.h" \ + "ReferenceFactoryF.h" \ + "EndpointIF.h" \ + "$(includedir)\Ice\RouterF.h" \ + "$(includedir)\Ice\Proxy.h" \ + "$(includedir)\Ice\ProxyFactoryF.h" \ + "$(includedir)\Ice\EndpointF.h" \ + "$(includedir)\Ice\EndpointTypes.h" \ + "$(includedir)\Ice\AsyncResult.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ + "$(includedir)\Ice\AsyncResultF.h" \ + "$(includedir)\Ice\ObserverHelper.h" \ + "$(includedir)\Ice\Instrumentation.h" \ + "$(includedir)\Ice\LocatorF.h" \ + "RouterInfoF.h" \ + "LocatorInfoF.h" \ + "SharedContext.h" \ + "$(includedir)\Ice\Properties.h" \ + "$(includedir)\Ice\GCObject.h" \ + "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Incoming.h" \ + "$(includedir)\Ice\ServantLocatorF.h" \ + "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\IncomingAsync.h" \ + "$(includedir)\Ice\PropertiesAdmin.h" \ + "RouterInfo.h" \ + "ObjectAdapterFactory.h" \ + "ObjectAdapterI.h" \ + "$(includedir)\IceUtil\RecMutex.h" \ + "$(includedir)\Ice\ObjectAdapter.h" \ + "$(includedir)\Ice\FacetMap.h" \ + "$(includedir)\Ice\Endpoint.h" \ + "$(includedir)\Ice\ObjectAdapterFactoryF.h" \ + "$(includedir)\Ice\ConnectionFactoryF.h" \ + "$(includedir)\Ice\ThreadPoolF.h" \ + "ACM.h" \ + "$(includedir)\IceUtil\Timer.h" \ + "$(includedir)\IceUtil\Thread.h" \ + "$(includedir)\Ice\ACMF.h" \ + "$(includedir)\Ice\Connection.h" \ + "$(includedir)\Ice\PropertiesF.h" \ + "Instance.h" \ + "$(includedir)\Ice\InstrumentationF.h" \ + "DefaultsAndOverridesF.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" \ + "ImplicitContextI.h" \ + "$(includedir)\Ice\ImplicitContext.h" \ + "$(includedir)\Ice\Process.h" \ + ResponseHandler.obj: \ ResponseHandler.cpp \ "ResponseHandler.h" \ diff --git a/cpp/src/IceBox/.depend.mak b/cpp/src/IceBox/.depend.mak index 21961a7b9b7..1de50ccf380 100644..100755 --- a/cpp/src/IceBox/.depend.mak +++ b/cpp/src/IceBox/.depend.mak @@ -387,3 +387,157 @@ Admin.obj: \ "$(includedir)\IceUtil\RecMutex.h" \ "$(includedir)\IceBox\IceBox.h" \ "$(includedir)\IceBox\Config.h" \ + +IceBox.obj: \ + IceBox.cpp \ + "$(includedir)\IceBox\IceBox.h" \ + "$(includedir)\Ice\ProxyF.h" \ + "$(includedir)\IceUtil\Shared.h" \ + "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Config.h" \ + "$(includedir)\Ice\ProxyHandle.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Exception.h" \ + "$(includedir)\Ice\ObjectF.h" \ + "$(includedir)\Ice\Handle.h" \ + "$(includedir)\Ice\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\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)\Ice\EndpointTypes.h" \ + "$(includedir)\Ice\ObjectAdapterF.h" \ + "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\AsyncResult.h" \ + "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\UniquePtr.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ + "$(includedir)\Ice\ConnectionF.h" \ + "$(includedir)\Ice\InstanceF.h" \ + "$(includedir)\Ice\AsyncResultF.h" \ + "$(includedir)\Ice\ObserverHelper.h" \ + "$(includedir)\Ice\Instrumentation.h" \ + "$(includedir)\Ice\Current.h" \ + "$(includedir)\Ice\Identity.h" \ + "$(includedir)\Ice\Version.h" \ + "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\Object.h" \ + "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\Buffer.h" \ + "$(includedir)\Ice\Protocol.h" \ + "$(includedir)\Ice\SlicedDataF.h" \ + "$(includedir)\Ice\UserExceptionFactory.h" \ + "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\GCObject.h" \ + "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Incoming.h" \ + "$(includedir)\Ice\ServantLocatorF.h" \ + "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\ResponseHandlerF.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultObjectFactory.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\PropertiesF.h" \ + "$(includedir)\Ice\SliceChecksumDict.h" \ + "$(includedir)\IceBox\Config.h" \ + "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\Outgoing.h" \ + "$(includedir)\Ice\OutgoingAsync.h" \ + "$(includedir)\IceUtil\Timer.h" \ + "$(includedir)\IceUtil\Thread.h" \ + "$(includedir)\Ice\OutgoingAsyncF.h" \ + "$(includedir)\Ice\SliceChecksums.h" \ + "$(includedir)\IceUtil\DisableWarnings.h" \ + +Exception.obj: \ + Exception.cpp \ + "$(includedir)\IceBox\IceBox.h" \ + "$(includedir)\Ice\ProxyF.h" \ + "$(includedir)\IceUtil\Shared.h" \ + "$(includedir)\IceUtil\Config.h" \ + "$(includedir)\Ice\Config.h" \ + "$(includedir)\Ice\ProxyHandle.h" \ + "$(includedir)\IceUtil\Handle.h" \ + "$(includedir)\IceUtil\Exception.h" \ + "$(includedir)\Ice\ObjectF.h" \ + "$(includedir)\Ice\Handle.h" \ + "$(includedir)\Ice\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\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)\Ice\EndpointTypes.h" \ + "$(includedir)\Ice\ObjectAdapterF.h" \ + "$(includedir)\Ice\ReferenceF.h" \ + "$(includedir)\Ice\AsyncResult.h" \ + "$(includedir)\IceUtil\Monitor.h" \ + "$(includedir)\IceUtil\Cond.h" \ + "$(includedir)\IceUtil\UniquePtr.h" \ + "$(includedir)\Ice\CommunicatorF.h" \ + "$(includedir)\Ice\ConnectionF.h" \ + "$(includedir)\Ice\InstanceF.h" \ + "$(includedir)\Ice\AsyncResultF.h" \ + "$(includedir)\Ice\ObserverHelper.h" \ + "$(includedir)\Ice\Instrumentation.h" \ + "$(includedir)\Ice\Current.h" \ + "$(includedir)\Ice\Identity.h" \ + "$(includedir)\Ice\Version.h" \ + "$(includedir)\Ice\BasicStream.h" \ + "$(includedir)\IceUtil\StringConverter.h" \ + "$(includedir)\Ice\Object.h" \ + "$(includedir)\Ice\IncomingAsyncF.h" \ + "$(includedir)\Ice\ObjectFactoryF.h" \ + "$(includedir)\Ice\ObjectFactoryManagerF.h" \ + "$(includedir)\Ice\Buffer.h" \ + "$(includedir)\Ice\Protocol.h" \ + "$(includedir)\Ice\SlicedDataF.h" \ + "$(includedir)\Ice\UserExceptionFactory.h" \ + "$(includedir)\Ice\FactoryTable.h" \ + "$(includedir)\Ice\GCObject.h" \ + "$(includedir)\IceUtil\MutexPtrLock.h" \ + "$(includedir)\Ice\Incoming.h" \ + "$(includedir)\Ice\ServantLocatorF.h" \ + "$(includedir)\Ice\ServantManagerF.h" \ + "$(includedir)\Ice\ResponseHandlerF.h" \ + "$(includedir)\Ice\FactoryTableInit.h" \ + "$(includedir)\Ice\DefaultObjectFactory.h" \ + "$(includedir)\Ice\ObjectFactory.h" \ + "$(includedir)\Ice\BuiltinSequences.h" \ + "$(includedir)\Ice\PropertiesF.h" \ + "$(includedir)\Ice\SliceChecksumDict.h" \ + "$(includedir)\IceBox\Config.h" \ diff --git a/cpp/src/IceBox/Makefile.mak b/cpp/src/IceBox/Makefile.mak index 220e196fcaf..899148378ff 100644 --- a/cpp/src/IceBox/Makefile.mak +++ b/cpp/src/IceBox/Makefile.mak @@ -23,7 +23,8 @@ TARGETS = $(LIBNAME) $(DLLNAME) $(SERVER) $(ADMIN) SLICE_OBJS = .\IceBox.obj -LIB_OBJS = $(SLICE_OBJS) .\Exception.obj \ +LIB_OBJS = $(SLICE_OBJS) \ + .\Exception.obj SOBJS = .\Service.obj \ .\ServiceManagerI.obj @@ -31,7 +32,8 @@ SOBJS = .\Service.obj \ AOBJS = .\Admin.obj OBJS = $(SOBJS) \ - $(AOBJS) + $(AOBJS) \ + $(LIB_OBJS) HDIR = $(headerdir)\IceBox SDIR = $(slicedir)\IceBox diff --git a/cpp/src/IceDiscovery/.depend.mak b/cpp/src/IceDiscovery/.depend.mak index ea69682d1fa..ea69682d1fa 100644..100755 --- a/cpp/src/IceDiscovery/.depend.mak +++ b/cpp/src/IceDiscovery/.depend.mak diff --git a/cpp/src/IceGrid/.depend.mak b/cpp/src/IceGrid/.depend.mak index b35d9e7ef9c..18871eb2fa5 100644..100755 --- a/cpp/src/IceGrid/.depend.mak +++ b/cpp/src/IceGrid/.depend.mak @@ -2725,6 +2725,8 @@ AdapterCache.obj: \ "SessionI.h" \ "ReapThread.h" \ "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\Connection.h" \ + "$(includedir)\Ice\Endpoint.h" \ "SessionServantManager.h" \ "AdminCallbackRouter.h" \ "$(includedir)\Ice\Ice.h" \ @@ -2735,14 +2737,12 @@ AdapterCache.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\CommunicatorAsync.h" \ "$(includedir)\Ice\ObjectAdapter.h" \ - "$(includedir)\Ice\Endpoint.h" \ "$(includedir)\Ice\ServantLocator.h" \ "$(includedir)\Ice\SlicedData.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\Ice\OutgoingAsyncF.h" \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\Application.h" \ - "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ @@ -3354,6 +3354,8 @@ Allocatable.obj: \ "$(includedir)\Ice\LoggerUtil.h" \ "$(includedir)\Ice\Plugin.h" \ "$(includedir)\Ice\LoggerF.h" \ + "$(includedir)\Ice\Connection.h" \ + "$(includedir)\Ice\Endpoint.h" \ "SessionServantManager.h" \ "AdminCallbackRouter.h" \ "$(includedir)\Ice\Ice.h" \ @@ -3373,14 +3375,12 @@ Allocatable.obj: \ "$(includedir)\Ice\FacetMap.h" \ "$(includedir)\Ice\CommunicatorAsync.h" \ "$(includedir)\Ice\ObjectAdapter.h" \ - "$(includedir)\Ice\Endpoint.h" \ "$(includedir)\Ice\ServantLocator.h" \ "$(includedir)\Ice\SlicedData.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\Ice\OutgoingAsyncF.h" \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\Application.h" \ - "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ @@ -3504,6 +3504,8 @@ AllocatableObjectCache.obj: \ "$(includedir)\IceGrid\Session.h" \ "SessionI.h" \ "ReapThread.h" \ + "$(includedir)\Ice\Connection.h" \ + "$(includedir)\Ice\Endpoint.h" \ "SessionServantManager.h" \ "AdminCallbackRouter.h" \ "$(includedir)\Ice\Ice.h" \ @@ -3514,14 +3516,12 @@ AllocatableObjectCache.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\CommunicatorAsync.h" \ "$(includedir)\Ice\ObjectAdapter.h" \ - "$(includedir)\Ice\Endpoint.h" \ "$(includedir)\Ice\ServantLocator.h" \ "$(includedir)\Ice\SlicedData.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\Ice\OutgoingAsyncF.h" \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\Application.h" \ - "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ @@ -4566,6 +4566,8 @@ NodeCache.obj: \ "$(includedir)\IceUtil\Thread.h" \ "ReapThread.h" \ "$(includedir)\Ice\LocalException.h" \ + "$(includedir)\Ice\Connection.h" \ + "$(includedir)\Ice\Endpoint.h" \ "SessionServantManager.h" \ "AdminCallbackRouter.h" \ "$(includedir)\Ice\Ice.h" \ @@ -4576,14 +4578,12 @@ NodeCache.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\CommunicatorAsync.h" \ "$(includedir)\Ice\ObjectAdapter.h" \ - "$(includedir)\Ice\Endpoint.h" \ "$(includedir)\Ice\ServantLocator.h" \ "$(includedir)\Ice\SlicedData.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\Ice\OutgoingAsyncF.h" \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\Application.h" \ - "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\Ice\Stream.h" \ @@ -4893,6 +4893,8 @@ ObjectCache.obj: \ "$(includedir)\IceUtil\Thread.h" \ "SessionI.h" \ "ReapThread.h" \ + "$(includedir)\Ice\Connection.h" \ + "$(includedir)\Ice\Endpoint.h" \ "SessionServantManager.h" \ "AdminCallbackRouter.h" \ "$(includedir)\Ice\Ice.h" \ @@ -4903,14 +4905,12 @@ ObjectCache.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\CommunicatorAsync.h" \ "$(includedir)\Ice\ObjectAdapter.h" \ - "$(includedir)\Ice\Endpoint.h" \ "$(includedir)\Ice\ServantLocator.h" \ "$(includedir)\Ice\SlicedData.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\Ice\OutgoingAsyncF.h" \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\Application.h" \ - "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ @@ -6448,6 +6448,8 @@ ServerCache.obj: \ "AllocatableObjectCache.h" \ "SessionI.h" \ "ReapThread.h" \ + "$(includedir)\Ice\Connection.h" \ + "$(includedir)\Ice\Endpoint.h" \ "SessionServantManager.h" \ "AdminCallbackRouter.h" \ "$(includedir)\Ice\Ice.h" \ @@ -6458,14 +6460,12 @@ ServerCache.obj: \ "$(includedir)\Ice\RemoteLogger.h" \ "$(includedir)\Ice\CommunicatorAsync.h" \ "$(includedir)\Ice\ObjectAdapter.h" \ - "$(includedir)\Ice\Endpoint.h" \ "$(includedir)\Ice\ServantLocator.h" \ "$(includedir)\Ice\SlicedData.h" \ "$(includedir)\Ice\OutgoingAsync.h" \ "$(includedir)\Ice\OutgoingAsyncF.h" \ "$(includedir)\Ice\Process.h" \ "$(includedir)\Ice\Application.h" \ - "$(includedir)\Ice\Connection.h" \ "$(includedir)\Ice\ConnectionAsync.h" \ "$(includedir)\Ice\Functional.h" \ "$(includedir)\IceUtil\Functional.h" \ diff --git a/cpp/src/IceGridLib/.depend.mak b/cpp/src/IceGridLib/.depend.mak index c3793d6f8eb..c3793d6f8eb 100644..100755 --- a/cpp/src/IceGridLib/.depend.mak +++ b/cpp/src/IceGridLib/.depend.mak diff --git a/cpp/src/IcePatch2/.depend.mak b/cpp/src/IcePatch2/.depend.mak index f6ea1dc1690..f6ea1dc1690 100644..100755 --- a/cpp/src/IcePatch2/.depend.mak +++ b/cpp/src/IcePatch2/.depend.mak diff --git a/cpp/src/IcePatch2Lib/.depend.mak b/cpp/src/IcePatch2Lib/.depend.mak index 3db997c71f6..3db997c71f6 100644..100755 --- a/cpp/src/IcePatch2Lib/.depend.mak +++ b/cpp/src/IcePatch2Lib/.depend.mak diff --git a/cpp/src/IceSSL/.depend.mak b/cpp/src/IceSSL/.depend.mak index 8ee69282e04..8ee69282e04 100644..100755 --- a/cpp/src/IceSSL/.depend.mak +++ b/cpp/src/IceSSL/.depend.mak diff --git a/cpp/src/IceStorm/.depend.mak b/cpp/src/IceStorm/.depend.mak index 1989b110ef1..1989b110ef1 100644..100755 --- a/cpp/src/IceStorm/.depend.mak +++ b/cpp/src/IceStorm/.depend.mak diff --git a/cpp/src/IceStormLib/.depend.mak b/cpp/src/IceStormLib/.depend.mak index fcf2119c005..fcf2119c005 100644..100755 --- a/cpp/src/IceStormLib/.depend.mak +++ b/cpp/src/IceStormLib/.depend.mak diff --git a/cpp/src/IceUtil/.depend.mak b/cpp/src/IceUtil/.depend.mak index cb40355131b..cb40355131b 100644..100755 --- a/cpp/src/IceUtil/.depend.mak +++ b/cpp/src/IceUtil/.depend.mak diff --git a/cpp/src/IceXML/.depend.mak b/cpp/src/IceXML/.depend.mak index 88053f20e8e..88053f20e8e 100644..100755 --- a/cpp/src/IceXML/.depend.mak +++ b/cpp/src/IceXML/.depend.mak diff --git a/cpp/src/Slice/.depend.mak b/cpp/src/Slice/.depend.mak index 7e180d21656..7e180d21656 100644..100755 --- a/cpp/src/Slice/.depend.mak +++ b/cpp/src/Slice/.depend.mak diff --git a/cpp/src/iceserviceinstall/.depend.mak b/cpp/src/iceserviceinstall/.depend.mak index a301101bab7..a301101bab7 100644..100755 --- a/cpp/src/iceserviceinstall/.depend.mak +++ b/cpp/src/iceserviceinstall/.depend.mak diff --git a/cpp/src/slice2cpp/.depend.mak b/cpp/src/slice2cpp/.depend.mak index 54595c43dc5..54595c43dc5 100644..100755 --- a/cpp/src/slice2cpp/.depend.mak +++ b/cpp/src/slice2cpp/.depend.mak diff --git a/cpp/src/slice2cs/.depend.mak b/cpp/src/slice2cs/.depend.mak index 77d897a3041..77d897a3041 100644..100755 --- a/cpp/src/slice2cs/.depend.mak +++ b/cpp/src/slice2cs/.depend.mak diff --git a/cpp/src/slice2freeze/.depend.mak b/cpp/src/slice2freeze/.depend.mak index 91c5cdfb9b4..91c5cdfb9b4 100644..100755 --- a/cpp/src/slice2freeze/.depend.mak +++ b/cpp/src/slice2freeze/.depend.mak diff --git a/cpp/src/slice2freezej/.depend.mak b/cpp/src/slice2freezej/.depend.mak index c158a896f6c..c158a896f6c 100644..100755 --- a/cpp/src/slice2freezej/.depend.mak +++ b/cpp/src/slice2freezej/.depend.mak diff --git a/cpp/src/slice2html/.depend.mak b/cpp/src/slice2html/.depend.mak index 7055996248e..7055996248e 100644..100755 --- a/cpp/src/slice2html/.depend.mak +++ b/cpp/src/slice2html/.depend.mak diff --git a/cpp/src/slice2java/.depend.mak b/cpp/src/slice2java/.depend.mak index 40b220eab36..40b220eab36 100644..100755 --- a/cpp/src/slice2java/.depend.mak +++ b/cpp/src/slice2java/.depend.mak diff --git a/cpp/src/slice2js/.depend.mak b/cpp/src/slice2js/.depend.mak index 3aab5d7a09a..3aab5d7a09a 100644..100755 --- a/cpp/src/slice2js/.depend.mak +++ b/cpp/src/slice2js/.depend.mak diff --git a/cpp/src/slice2php/.depend.mak b/cpp/src/slice2php/.depend.mak index 626b121cd8b..626b121cd8b 100644..100755 --- a/cpp/src/slice2php/.depend.mak +++ b/cpp/src/slice2php/.depend.mak diff --git a/cpp/src/slice2py/.depend.mak b/cpp/src/slice2py/.depend.mak index cb275a4ea03..cb275a4ea03 100644..100755 --- a/cpp/src/slice2py/.depend.mak +++ b/cpp/src/slice2py/.depend.mak diff --git a/cpp/src/slice2rb/.depend.mak b/cpp/src/slice2rb/.depend.mak index a5b6f529965..a5b6f529965 100644..100755 --- a/cpp/src/slice2rb/.depend.mak +++ b/cpp/src/slice2rb/.depend.mak |