diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-08-08 15:22:27 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-08-08 15:22:27 +0200 |
| commit | b9e90a9c390c55244a65472ef93d01baefca8c4d (patch) | |
| tree | ad338ae8f6e79297ccf61b7523261e4680492474 /cpp/src | |
| parent | Merge remote-tracking branch 'origin/encoding11' into mx (diff) | |
| download | ice-b9e90a9c390c55244a65472ef93d01baefca8c4d.tar.bz2 ice-b9e90a9c390c55244a65472ef93d01baefca8c4d.tar.xz ice-b9e90a9c390c55244a65472ef93d01baefca8c4d.zip | |
Fixes
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/.depend | 80 | ||||
| -rw-r--r-- | cpp/src/Ice/.depend.mak | 80 | ||||
| -rw-r--r-- | cpp/src/Ice/Incoming.cpp | 36 | ||||
| -rw-r--r-- | cpp/src/Ice/ObserverHelper.cpp | 40 | ||||
| -rw-r--r-- | cpp/src/Ice/ObserverI.cpp | 94 | ||||
| -rw-r--r-- | cpp/src/Ice/ObserverI.h | 23 | ||||
| -rw-r--r-- | cpp/src/Ice/Outgoing.cpp | 35 | ||||
| -rw-r--r-- | cpp/src/Ice/OutgoingAsync.cpp | 37 | ||||
| -rw-r--r-- | cpp/src/Ice/Proxy.cpp | 136 | ||||
| -rwxr-xr-x | cpp/src/Slice/Parser.cpp | 8 | ||||
| -rw-r--r-- | cpp/src/slice2cpp/Gen.cpp | 21 |
11 files changed, 344 insertions, 246 deletions
diff --git a/cpp/src/Ice/.depend b/cpp/src/Ice/.depend index 18adf7369c6..1e8e8d93aa9 100644 --- a/cpp/src/Ice/.depend +++ b/cpp/src/Ice/.depend @@ -86,7 +86,6 @@ Stats$(OBJEXT): Stats.cpp $(includedir)/Ice/Stats.h $(includedir)/Ice/LocalObjec StreamI$(OBJEXT): StreamI.cpp ../Ice/StreamI.h $(includedir)/Ice/Stream.h $(includedir)/Ice/StreamF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/Exception.h $(includedir)/Ice/Format.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/StreamTraits.h $(includedir)/IceUtil/ScopedArray.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/Optional.h $(includedir)/Ice/UndefSysMacros.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/GCShared.h $(includedir)/Ice/GCCountMap.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/EndpointIF.h $(includedir)/Ice/EndpointF.h $(includedir)/Ice/EndpointTypes.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/IceUtil/StopWatch.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/SlicedDataF.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/ObserverF.h ../Ice/Instance.h $(includedir)/IceUtil/RecMutex.h $(includedir)/Ice/StatsF.h ../Ice/TraceLevelsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../Ice/ThreadPoolF.h $(includedir)/Ice/ConnectionFactoryF.h $(includedir)/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h $(includedir)/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../Ice/RetryQueueF.h $(includedir)/Ice/DynamicLibraryF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/Dispatcher.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/Plugin.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/IceUtil/Unicode.h ../Ice/ImplicitContextI.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/Process.h $(includedir)/Ice/Outgoing.h $(includedir)/Ice/ObserverHelper.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h ../Ice/DefaultsAndOverrides.h $(includedir)/Ice/Endpoint.h Stream$(OBJEXT): Stream.cpp $(includedir)/Ice/Stream.h $(includedir)/Ice/StreamF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/Exception.h $(includedir)/Ice/Format.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/StreamTraits.h $(includedir)/IceUtil/ScopedArray.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/Optional.h $(includedir)/Ice/UndefSysMacros.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/GCShared.h $(includedir)/Ice/GCCountMap.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/EndpointIF.h $(includedir)/Ice/EndpointF.h $(includedir)/Ice/EndpointTypes.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/IceUtil/StopWatch.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/SlicedDataF.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/ObserverF.h StringConverter$(OBJEXT): StringConverter.cpp $(includedir)/Ice/StringConverter.h $(includedir)/Ice/Config.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/Exception.h $(includedir)/Ice/Format.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/StreamTraits.h $(includedir)/IceUtil/ScopedArray.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/Optional.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/Plugin.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/EndpointIF.h $(includedir)/Ice/EndpointF.h $(includedir)/Ice/EndpointTypes.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/IceUtil/StopWatch.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/Version.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/SlicedDataF.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/ObserverF.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/Stream.h $(includedir)/Ice/Object.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/IceUtil/Unicode.h $(includedir)/IceUtil/IceUtil.h $(includedir)/IceUtil/AbstractMutex.h $(includedir)/IceUtil/Cache.h $(includedir)/IceUtil/CountDownLatch.h $(includedir)/IceUtil/CtrlCHandler.h $(includedir)/IceUtil/Functional.h $(includedir)/IceUtil/MutexPtrLock.h $(includedir)/IceUtil/RecMutex.h $(includedir)/IceUtil/UUID.h $(includedir)/IceUtil/StringUtil.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/Dispatcher.h ../Ice/Instance.h ../Ice/TraceLevelsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../Ice/ThreadPoolF.h $(includedir)/Ice/ConnectionFactoryF.h $(includedir)/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h $(includedir)/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../Ice/RetryQueueF.h $(includedir)/Ice/DynamicLibraryF.h $(includedir)/Ice/PluginF.h ../Ice/ImplicitContextI.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/Process.h $(includedir)/Ice/Outgoing.h $(includedir)/Ice/ObserverHelper.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/Properties.h $(includedir)/Ice/IconvStringConverter.h -SysLoggerI$(OBJEXT): SysLoggerI.cpp ../Ice/SysLoggerI.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/IceUtil/MutexProtocol.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/Exception.h $(includedir)/Ice/Format.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/StreamTraits.h $(includedir)/IceUtil/ScopedArray.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/Optional.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/EndpointF.h $(includedir)/Ice/EndpointTypes.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/IceUtil/StopWatch.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/Version.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/SlicedDataF.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/ObserverF.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/Stream.h $(includedir)/Ice/Object.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/IncomingAsyncF.h TcpAcceptor$(OBJEXT): TcpAcceptor.cpp ../Ice/TcpAcceptor.h ../Ice/TransceiverF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/InstanceF.h ../Ice/TraceLevelsF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/Exception.h $(includedir)/Ice/Format.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/StreamTraits.h $(includedir)/IceUtil/ScopedArray.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/Optional.h $(includedir)/Ice/UndefSysMacros.h ../Ice/Acceptor.h ../Ice/AcceptorF.h ../Ice/Network.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/EndpointIF.h $(includedir)/Ice/EndpointF.h $(includedir)/Ice/EndpointTypes.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/IceUtil/StopWatch.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/Version.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/SlicedDataF.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/ObserverF.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/IncomingAsyncF.h ../Ice/TcpTransceiver.h $(includedir)/Ice/StatsF.h ../Ice/Transceiver.h ../Ice/Instance.h $(includedir)/IceUtil/RecMutex.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../Ice/ThreadPoolF.h $(includedir)/Ice/ConnectionFactoryF.h $(includedir)/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h $(includedir)/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../Ice/RetryQueueF.h $(includedir)/Ice/DynamicLibraryF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/Dispatcher.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/Plugin.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/Stream.h $(includedir)/IceUtil/Unicode.h ../Ice/ImplicitContextI.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/Process.h $(includedir)/Ice/Outgoing.h $(includedir)/Ice/ObserverHelper.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h ../Ice/TraceLevels.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Properties.h $(includedir)/IceUtil/StringUtil.h TcpConnector$(OBJEXT): TcpConnector.cpp ../Ice/TcpConnector.h ../Ice/TransceiverF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/Version.h $(includedir)/Ice/LocalObjectF.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/Exception.h $(includedir)/Ice/Format.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/StreamTraits.h $(includedir)/IceUtil/ScopedArray.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/Optional.h $(includedir)/Ice/UndefSysMacros.h ../Ice/TraceLevelsF.h $(includedir)/Ice/LoggerF.h ../Ice/Connector.h ../Ice/ConnectorF.h ../Ice/Network.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/EndpointIF.h $(includedir)/Ice/EndpointF.h $(includedir)/Ice/EndpointTypes.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/IceUtil/StopWatch.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/SlicedDataF.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/ObserverF.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/IncomingAsyncF.h ../Ice/TcpTransceiver.h $(includedir)/Ice/StatsF.h ../Ice/Transceiver.h ../Ice/TcpEndpointI.h ../Ice/EndpointI.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/Stream.h ../Ice/AcceptorF.h $(includedir)/Ice/ObserverHelper.h $(includedir)/Ice/EndpointFactory.h $(includedir)/Ice/EndpointFactoryF.h ../Ice/Instance.h $(includedir)/IceUtil/RecMutex.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../Ice/ThreadPoolF.h $(includedir)/Ice/ConnectionFactoryF.h $(includedir)/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h $(includedir)/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../Ice/RetryQueueF.h $(includedir)/Ice/DynamicLibraryF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/Dispatcher.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/Plugin.h $(includedir)/IceUtil/Unicode.h ../Ice/ImplicitContextI.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/Process.h $(includedir)/Ice/Outgoing.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h ../Ice/TraceLevels.h $(includedir)/Ice/LoggerUtil.h TcpEndpointI$(OBJEXT): TcpEndpointI.cpp ../Ice/TcpEndpointI.h $(includedir)/IceUtil/Config.h ../Ice/EndpointI.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Thread.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/IceUtil/MutexProtocol.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/LocalObjectF.h $(includedir)/Ice/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/Exception.h $(includedir)/Ice/Format.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/StreamTraits.h $(includedir)/IceUtil/ScopedArray.h $(includedir)/IceUtil/Iterator.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/EndpointF.h $(includedir)/IceUtil/Optional.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/EndpointTypes.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/StopWatch.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/Version.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/SlicedDataF.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/ObserverF.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/Stream.h $(includedir)/Ice/Object.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/IncomingAsyncF.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/Network.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/ObserverHelper.h $(includedir)/Ice/EndpointFactory.h $(includedir)/Ice/EndpointFactoryF.h ../Ice/TcpAcceptor.h ../Ice/TraceLevelsF.h ../Ice/Acceptor.h ../Ice/TcpConnector.h ../Ice/Connector.h ../Ice/TcpTransceiver.h $(includedir)/Ice/StatsF.h ../Ice/Transceiver.h $(includedir)/Ice/LocalException.h ../Ice/Instance.h $(includedir)/IceUtil/RecMutex.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../Ice/ThreadPoolF.h $(includedir)/Ice/ConnectionFactoryF.h $(includedir)/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h $(includedir)/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../Ice/RetryQueueF.h $(includedir)/Ice/DynamicLibraryF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/Dispatcher.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/Plugin.h $(includedir)/IceUtil/Unicode.h ../Ice/ImplicitContextI.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/Process.h $(includedir)/Ice/Outgoing.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h ../Ice/DefaultsAndOverrides.h ../Ice/HashUtil.h @@ -99,43 +98,44 @@ UdpConnector$(OBJEXT): UdpConnector.cpp ../Ice/UdpConnector.h ../Ice/Transceiver UdpEndpointI$(OBJEXT): UdpEndpointI.cpp ../Ice/UdpEndpointI.h $(includedir)/IceUtil/Config.h ../Ice/EndpointI.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Thread.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Time.h $(includedir)/IceUtil/MutexProtocol.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/LocalObjectF.h $(includedir)/Ice/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/Exception.h $(includedir)/Ice/Format.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/StreamTraits.h $(includedir)/IceUtil/ScopedArray.h $(includedir)/IceUtil/Iterator.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/EndpointF.h $(includedir)/IceUtil/Optional.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/EndpointTypes.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/StopWatch.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/Version.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/SlicedDataF.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/ObserverF.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/Stream.h $(includedir)/Ice/Object.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/IncomingAsyncF.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/Network.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/ObserverHelper.h $(includedir)/Ice/EndpointFactory.h $(includedir)/Ice/EndpointFactoryF.h ../Ice/UdpConnector.h ../Ice/Connector.h ../Ice/UdpTransceiver.h ../Ice/TraceLevelsF.h $(includedir)/Ice/StatsF.h ../Ice/Transceiver.h $(includedir)/Ice/LocalException.h ../Ice/Instance.h $(includedir)/IceUtil/RecMutex.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../Ice/ThreadPoolF.h $(includedir)/Ice/ConnectionFactoryF.h $(includedir)/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h $(includedir)/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../Ice/RetryQueueF.h $(includedir)/Ice/DynamicLibraryF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/Dispatcher.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/Plugin.h $(includedir)/IceUtil/Unicode.h ../Ice/ImplicitContextI.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/Process.h $(includedir)/Ice/Outgoing.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h ../Ice/DefaultsAndOverrides.h ../Ice/HashUtil.h UdpTransceiver$(OBJEXT): UdpTransceiver.cpp ../Ice/UdpTransceiver.h $(includedir)/Ice/InstanceF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h ../Ice/TraceLevelsF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/LocalObjectF.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/Exception.h $(includedir)/Ice/Format.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/StreamTraits.h $(includedir)/IceUtil/ScopedArray.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/Optional.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/StatsF.h ../Ice/Transceiver.h ../Ice/TransceiverF.h $(includedir)/Ice/ConnectionF.h ../Ice/Network.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/EndpointIF.h $(includedir)/Ice/EndpointF.h $(includedir)/Ice/EndpointTypes.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/IceUtil/StopWatch.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/Current.h $(includedir)/Ice/Identity.h $(includedir)/Ice/Version.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/SlicedDataF.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/ObserverF.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/Stream.h ../Ice/Instance.h $(includedir)/IceUtil/RecMutex.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../Ice/ThreadPoolF.h $(includedir)/Ice/ConnectionFactoryF.h $(includedir)/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h $(includedir)/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../Ice/RetryQueueF.h $(includedir)/Ice/DynamicLibraryF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/Dispatcher.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/Plugin.h $(includedir)/IceUtil/Unicode.h ../Ice/ImplicitContextI.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/Process.h $(includedir)/Ice/Outgoing.h $(includedir)/Ice/ObserverHelper.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h ../Ice/TraceLevels.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Properties.h $(includedir)/IceUtil/StringUtil.h Version$(OBJEXT): Version.cpp $(includedir)/Ice/Version.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/Exception.h $(includedir)/Ice/Format.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/StreamTraits.h $(includedir)/IceUtil/ScopedArray.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/Optional.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/SlicedDataF.h $(includedir)/Ice/UserExceptionFactory.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/GCShared.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/IceUtil/DisableWarnings.h +SysLoggerI$(OBJEXT): SysLoggerI.cpp ../Ice/SysLoggerI.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/IceUtil/MutexProtocol.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/Exception.h $(includedir)/Ice/Format.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/StreamTraits.h $(includedir)/IceUtil/ScopedArray.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/Optional.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/EndpointF.h $(includedir)/Ice/EndpointTypes.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/IceUtil/StopWatch.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/Version.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/SlicedDataF.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/ObserverF.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/Stream.h $(includedir)/Ice/Object.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/IncomingAsyncF.h DLLMain$(OBJEXT): DLLMain.cpp ../Ice/ImplicitContextI.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/LocalObjectF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/Exception.h $(includedir)/Ice/Format.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/StreamTraits.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/EndpointIF.h $(includedir)/Ice/EndpointF.h $(includedir)/IceUtil/Optional.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/EndpointTypes.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/IceUtil/StopWatch.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/Version.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/SlicedDataF.h $(includedir)/Ice/UserExceptionFactory.h $(includedir)/Ice/ObserverF.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/Stream.h $(includedir)/Ice/Object.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/Service.h $(includedir)/Ice/Ice.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/Dispatcher.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/Plugin.h $(includedir)/IceUtil/Unicode.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Outgoing.h $(includedir)/Ice/ObserverHelper.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Logger.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Stats.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/CommunicatorAsync.h $(includedir)/Ice/ObjectFactory.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/ServantLocator.h $(includedir)/Ice/SlicedData.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Process.h $(includedir)/Ice/Application.h $(includedir)/Ice/Connection.h $(includedir)/Ice/ConnectionAsync.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h $(includedir)/Ice/Locator.h $(includedir)/Ice/FactoryTableInit.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/Router.h $(includedir)/Ice/DispatchInterceptor.h $(includedir)/Ice/IconvStringConverter.h -BuiltinSequences.h BuiltinSequences.cpp: $(slicedir)/Ice/BuiltinSequences.ice $(SLICE2CPP) $(SLICEPARSERLIB) -CommunicatorF.h CommunicatorF.cpp: $(slicedir)/Ice/CommunicatorF.ice $(SLICE2CPP) $(SLICEPARSERLIB) -Communicator.h Communicator.cpp: $(slicedir)/Ice/Communicator.ice $(slicedir)/Ice/LoggerF.ice $(slicedir)/Ice/StatsF.ice $(slicedir)/Ice/ObserverF.ice $(slicedir)/Ice/ObjectAdapterF.ice $(slicedir)/Ice/ObjectFactoryF.ice $(slicedir)/Ice/RouterF.ice $(slicedir)/Ice/LocatorF.ice $(slicedir)/Ice/PluginF.ice $(slicedir)/Ice/ImplicitContextF.ice $(slicedir)/Ice/Current.ice $(slicedir)/Ice/ConnectionF.ice $(slicedir)/Ice/Identity.ice $(slicedir)/Ice/Version.ice $(slicedir)/Ice/Properties.ice $(slicedir)/Ice/BuiltinSequences.ice $(SLICE2CPP) $(SLICEPARSERLIB) -ConnectionF.h ConnectionF.cpp: $(slicedir)/Ice/ConnectionF.ice $(SLICE2CPP) $(SLICEPARSERLIB) -Connection.h Connection.cpp: $(slicedir)/Ice/Connection.ice $(slicedir)/Ice/ObjectAdapterF.ice $(slicedir)/Ice/Identity.ice $(slicedir)/Ice/Endpoint.ice $(slicedir)/Ice/Version.ice $(slicedir)/Ice/BuiltinSequences.ice $(slicedir)/Ice/EndpointF.ice $(SLICE2CPP) $(SLICEPARSERLIB) -Current.h Current.cpp: $(slicedir)/Ice/Current.ice $(slicedir)/Ice/ObjectAdapterF.ice $(slicedir)/Ice/ConnectionF.ice $(slicedir)/Ice/Identity.ice $(slicedir)/Ice/Version.ice $(SLICE2CPP) $(SLICEPARSERLIB) -Endpoint.h Endpoint.cpp: $(slicedir)/Ice/Endpoint.ice $(slicedir)/Ice/Version.ice $(slicedir)/Ice/BuiltinSequences.ice $(slicedir)/Ice/EndpointF.ice $(SLICE2CPP) $(SLICEPARSERLIB) -EndpointF.h EndpointF.cpp: $(slicedir)/Ice/EndpointF.ice $(SLICE2CPP) $(SLICEPARSERLIB) -EndpointTypes.h EndpointTypes.cpp: $(slicedir)/Ice/EndpointTypes.ice $(SLICE2CPP) $(SLICEPARSERLIB) -FacetMap.h FacetMap.cpp: $(slicedir)/Ice/FacetMap.ice $(SLICE2CPP) $(SLICEPARSERLIB) -Identity.h Identity.cpp: $(slicedir)/Ice/Identity.ice $(SLICE2CPP) $(SLICEPARSERLIB) -ImplicitContextF.h ImplicitContextF.cpp: $(slicedir)/Ice/ImplicitContextF.ice $(SLICE2CPP) $(SLICEPARSERLIB) -ImplicitContext.h ImplicitContext.cpp: $(slicedir)/Ice/ImplicitContext.ice $(slicedir)/Ice/LocalException.ice $(slicedir)/Ice/Identity.ice $(slicedir)/Ice/Version.ice $(slicedir)/Ice/BuiltinSequences.ice $(slicedir)/Ice/Current.ice $(slicedir)/Ice/ObjectAdapterF.ice $(slicedir)/Ice/ConnectionF.ice $(SLICE2CPP) $(SLICEPARSERLIB) -LocalException.h LocalException.cpp: $(slicedir)/Ice/LocalException.ice $(slicedir)/Ice/Identity.ice $(slicedir)/Ice/Version.ice $(slicedir)/Ice/BuiltinSequences.ice $(SLICE2CPP) $(SLICEPARSERLIB) -LocatorF.h LocatorF.cpp: $(slicedir)/Ice/LocatorF.ice $(SLICE2CPP) $(SLICEPARSERLIB) -Locator.h Locator.cpp: $(slicedir)/Ice/Locator.ice $(slicedir)/Ice/Identity.ice $(slicedir)/Ice/ProcessF.ice $(SLICE2CPP) $(SLICEPARSERLIB) -LoggerF.h LoggerF.cpp: $(slicedir)/Ice/LoggerF.ice $(SLICE2CPP) $(SLICEPARSERLIB) -Logger.h Logger.cpp: $(slicedir)/Ice/Logger.ice $(SLICE2CPP) $(SLICEPARSERLIB) -Metrics.h Metrics.cpp: $(slicedir)/Ice/Metrics.ice $(slicedir)/Ice/BuiltinSequences.ice $(SLICE2CPP) $(SLICEPARSERLIB) -ObjectAdapterF.h ObjectAdapterF.cpp: $(slicedir)/Ice/ObjectAdapterF.ice $(SLICE2CPP) $(SLICEPARSERLIB) -ObjectAdapter.h ObjectAdapter.cpp: $(slicedir)/Ice/ObjectAdapter.ice $(slicedir)/Ice/CommunicatorF.ice $(slicedir)/Ice/ServantLocatorF.ice $(slicedir)/Ice/LocatorF.ice $(slicedir)/Ice/Identity.ice $(slicedir)/Ice/FacetMap.ice $(slicedir)/Ice/Endpoint.ice $(slicedir)/Ice/Version.ice $(slicedir)/Ice/BuiltinSequences.ice $(slicedir)/Ice/EndpointF.ice $(SLICE2CPP) $(SLICEPARSERLIB) -ObjectFactoryF.h ObjectFactoryF.cpp: $(slicedir)/Ice/ObjectFactoryF.ice $(SLICE2CPP) $(SLICEPARSERLIB) -ObjectFactory.h ObjectFactory.cpp: $(slicedir)/Ice/ObjectFactory.ice $(SLICE2CPP) $(SLICEPARSERLIB) -Observer.h Observer.cpp: $(slicedir)/Ice/Observer.ice $(slicedir)/Ice/EndpointF.ice $(slicedir)/Ice/ConnectionF.ice $(slicedir)/Ice/Current.ice $(slicedir)/Ice/ObjectAdapterF.ice $(slicedir)/Ice/Identity.ice $(slicedir)/Ice/Version.ice $(SLICE2CPP) $(SLICEPARSERLIB) -ObserverF.h ObserverF.cpp: $(slicedir)/Ice/ObserverF.ice $(SLICE2CPP) $(SLICEPARSERLIB) -PluginF.h PluginF.cpp: $(slicedir)/Ice/PluginF.ice $(SLICE2CPP) $(SLICEPARSERLIB) -Plugin.h Plugin.cpp: $(slicedir)/Ice/Plugin.ice $(slicedir)/Ice/LoggerF.ice $(slicedir)/Ice/BuiltinSequences.ice $(SLICE2CPP) $(SLICEPARSERLIB) -ProcessF.h ProcessF.cpp: $(slicedir)/Ice/ProcessF.ice $(SLICE2CPP) $(SLICEPARSERLIB) -Process.h Process.cpp: $(slicedir)/Ice/Process.ice $(SLICE2CPP) $(SLICEPARSERLIB) -PropertiesF.h PropertiesF.cpp: $(slicedir)/Ice/PropertiesF.ice $(SLICE2CPP) $(SLICEPARSERLIB) -Properties.h Properties.cpp: $(slicedir)/Ice/Properties.ice $(slicedir)/Ice/BuiltinSequences.ice $(SLICE2CPP) $(SLICEPARSERLIB) -RouterF.h RouterF.cpp: $(slicedir)/Ice/RouterF.ice $(SLICE2CPP) $(SLICEPARSERLIB) -Router.h Router.cpp: $(slicedir)/Ice/Router.ice $(slicedir)/Ice/BuiltinSequences.ice $(SLICE2CPP) $(SLICEPARSERLIB) -ServantLocatorF.h ServantLocatorF.cpp: $(slicedir)/Ice/ServantLocatorF.ice $(SLICE2CPP) $(SLICEPARSERLIB) -ServantLocator.h ServantLocator.cpp: $(slicedir)/Ice/ServantLocator.ice $(slicedir)/Ice/ObjectAdapterF.ice $(slicedir)/Ice/Current.ice $(slicedir)/Ice/ConnectionF.ice $(slicedir)/Ice/Identity.ice $(slicedir)/Ice/Version.ice $(SLICE2CPP) $(SLICEPARSERLIB) -SliceChecksumDict.h SliceChecksumDict.cpp: $(slicedir)/Ice/SliceChecksumDict.ice $(SLICE2CPP) $(SLICEPARSERLIB) -StatsF.h StatsF.cpp: $(slicedir)/Ice/StatsF.ice $(SLICE2CPP) $(SLICEPARSERLIB) -Stats.h Stats.cpp: $(slicedir)/Ice/Stats.ice $(SLICE2CPP) $(SLICEPARSERLIB) -Version.h Version.cpp: $(slicedir)/Ice/Version.ice $(SLICE2CPP) $(SLICEPARSERLIB) +$(HDIR)/BuiltinSequences.h BuiltinSequences.cpp: $(slicedir)/Ice/BuiltinSequences.ice $(SLICE2CPP) $(SLICEPARSERLIB) +$(HDIR)/CommunicatorF.h CommunicatorF.cpp: $(slicedir)/Ice/CommunicatorF.ice $(SLICE2CPP) $(SLICEPARSERLIB) +$(HDIR)/Communicator.h Communicator.cpp: $(slicedir)/Ice/Communicator.ice $(slicedir)/Ice/LoggerF.ice $(slicedir)/Ice/StatsF.ice $(slicedir)/Ice/ObserverF.ice $(slicedir)/Ice/ObjectAdapterF.ice $(slicedir)/Ice/ObjectFactoryF.ice $(slicedir)/Ice/RouterF.ice $(slicedir)/Ice/LocatorF.ice $(slicedir)/Ice/PluginF.ice $(slicedir)/Ice/ImplicitContextF.ice $(slicedir)/Ice/Current.ice $(slicedir)/Ice/ConnectionF.ice $(slicedir)/Ice/Identity.ice $(slicedir)/Ice/Version.ice $(slicedir)/Ice/Properties.ice $(slicedir)/Ice/BuiltinSequences.ice $(SLICE2CPP) $(SLICEPARSERLIB) +$(HDIR)/ConnectionF.h ConnectionF.cpp: $(slicedir)/Ice/ConnectionF.ice $(SLICE2CPP) $(SLICEPARSERLIB) +$(HDIR)/Connection.h Connection.cpp: $(slicedir)/Ice/Connection.ice $(slicedir)/Ice/ObjectAdapterF.ice $(slicedir)/Ice/Identity.ice $(slicedir)/Ice/Endpoint.ice $(slicedir)/Ice/Version.ice $(slicedir)/Ice/BuiltinSequences.ice $(slicedir)/Ice/EndpointF.ice $(SLICE2CPP) $(SLICEPARSERLIB) +$(HDIR)/Current.h Current.cpp: $(slicedir)/Ice/Current.ice $(slicedir)/Ice/ObjectAdapterF.ice $(slicedir)/Ice/ConnectionF.ice $(slicedir)/Ice/Identity.ice $(slicedir)/Ice/Version.ice $(SLICE2CPP) $(SLICEPARSERLIB) +$(HDIR)/Endpoint.h Endpoint.cpp: $(slicedir)/Ice/Endpoint.ice $(slicedir)/Ice/Version.ice $(slicedir)/Ice/BuiltinSequences.ice $(slicedir)/Ice/EndpointF.ice $(SLICE2CPP) $(SLICEPARSERLIB) +$(HDIR)/EndpointF.h EndpointF.cpp: $(slicedir)/Ice/EndpointF.ice $(SLICE2CPP) $(SLICEPARSERLIB) +$(HDIR)/EndpointTypes.h EndpointTypes.cpp: $(slicedir)/Ice/EndpointTypes.ice $(SLICE2CPP) $(SLICEPARSERLIB) +$(HDIR)/FacetMap.h FacetMap.cpp: $(slicedir)/Ice/FacetMap.ice $(SLICE2CPP) $(SLICEPARSERLIB) +$(HDIR)/Identity.h Identity.cpp: $(slicedir)/Ice/Identity.ice $(SLICE2CPP) $(SLICEPARSERLIB) +$(HDIR)/ImplicitContextF.h ImplicitContextF.cpp: $(slicedir)/Ice/ImplicitContextF.ice $(SLICE2CPP) $(SLICEPARSERLIB) +$(HDIR)/ImplicitContext.h ImplicitContext.cpp: $(slicedir)/Ice/ImplicitContext.ice $(slicedir)/Ice/LocalException.ice $(slicedir)/Ice/Identity.ice $(slicedir)/Ice/Version.ice $(slicedir)/Ice/BuiltinSequences.ice $(slicedir)/Ice/Current.ice $(slicedir)/Ice/ObjectAdapterF.ice $(slicedir)/Ice/ConnectionF.ice $(SLICE2CPP) $(SLICEPARSERLIB) +$(HDIR)/LocalException.h LocalException.cpp: $(slicedir)/Ice/LocalException.ice $(slicedir)/Ice/Identity.ice $(slicedir)/Ice/Version.ice $(slicedir)/Ice/BuiltinSequences.ice $(SLICE2CPP) $(SLICEPARSERLIB) +$(HDIR)/LocatorF.h LocatorF.cpp: $(slicedir)/Ice/LocatorF.ice $(SLICE2CPP) $(SLICEPARSERLIB) +$(HDIR)/Locator.h Locator.cpp: $(slicedir)/Ice/Locator.ice $(slicedir)/Ice/Identity.ice $(slicedir)/Ice/ProcessF.ice $(SLICE2CPP) $(SLICEPARSERLIB) +$(HDIR)/LoggerF.h LoggerF.cpp: $(slicedir)/Ice/LoggerF.ice $(SLICE2CPP) $(SLICEPARSERLIB) +$(HDIR)/Logger.h Logger.cpp: $(slicedir)/Ice/Logger.ice $(SLICE2CPP) $(SLICEPARSERLIB) +$(HDIR)/Metrics.h Metrics.cpp: $(slicedir)/Ice/Metrics.ice $(slicedir)/Ice/BuiltinSequences.ice $(SLICE2CPP) $(SLICEPARSERLIB) +$(HDIR)/ObjectAdapterF.h ObjectAdapterF.cpp: $(slicedir)/Ice/ObjectAdapterF.ice $(SLICE2CPP) $(SLICEPARSERLIB) +$(HDIR)/ObjectAdapter.h ObjectAdapter.cpp: $(slicedir)/Ice/ObjectAdapter.ice $(slicedir)/Ice/CommunicatorF.ice $(slicedir)/Ice/ServantLocatorF.ice $(slicedir)/Ice/LocatorF.ice $(slicedir)/Ice/Identity.ice $(slicedir)/Ice/FacetMap.ice $(slicedir)/Ice/Endpoint.ice $(slicedir)/Ice/Version.ice $(slicedir)/Ice/BuiltinSequences.ice $(slicedir)/Ice/EndpointF.ice $(SLICE2CPP) $(SLICEPARSERLIB) +$(HDIR)/ObjectFactoryF.h ObjectFactoryF.cpp: $(slicedir)/Ice/ObjectFactoryF.ice $(SLICE2CPP) $(SLICEPARSERLIB) +$(HDIR)/ObjectFactory.h ObjectFactory.cpp: $(slicedir)/Ice/ObjectFactory.ice $(SLICE2CPP) $(SLICEPARSERLIB) +$(HDIR)/Observer.h Observer.cpp: $(slicedir)/Ice/Observer.ice $(slicedir)/Ice/EndpointF.ice $(slicedir)/Ice/ConnectionF.ice $(slicedir)/Ice/Current.ice $(slicedir)/Ice/ObjectAdapterF.ice $(slicedir)/Ice/Identity.ice $(slicedir)/Ice/Version.ice $(SLICE2CPP) $(SLICEPARSERLIB) +$(HDIR)/ObserverF.h ObserverF.cpp: $(slicedir)/Ice/ObserverF.ice $(SLICE2CPP) $(SLICEPARSERLIB) +$(HDIR)/PluginF.h PluginF.cpp: $(slicedir)/Ice/PluginF.ice $(SLICE2CPP) $(SLICEPARSERLIB) +$(HDIR)/Plugin.h Plugin.cpp: $(slicedir)/Ice/Plugin.ice $(slicedir)/Ice/LoggerF.ice $(slicedir)/Ice/BuiltinSequences.ice $(SLICE2CPP) $(SLICEPARSERLIB) +$(HDIR)/ProcessF.h ProcessF.cpp: $(slicedir)/Ice/ProcessF.ice $(SLICE2CPP) $(SLICEPARSERLIB) +$(HDIR)/Process.h Process.cpp: $(slicedir)/Ice/Process.ice $(SLICE2CPP) $(SLICEPARSERLIB) +$(HDIR)/PropertiesF.h PropertiesF.cpp: $(slicedir)/Ice/PropertiesF.ice $(SLICE2CPP) $(SLICEPARSERLIB) +$(HDIR)/Properties.h Properties.cpp: $(slicedir)/Ice/Properties.ice $(slicedir)/Ice/BuiltinSequences.ice $(SLICE2CPP) $(SLICEPARSERLIB) +$(HDIR)/RouterF.h RouterF.cpp: $(slicedir)/Ice/RouterF.ice $(SLICE2CPP) $(SLICEPARSERLIB) +$(HDIR)/Router.h Router.cpp: $(slicedir)/Ice/Router.ice $(slicedir)/Ice/BuiltinSequences.ice $(SLICE2CPP) $(SLICEPARSERLIB) +$(HDIR)/ServantLocatorF.h ServantLocatorF.cpp: $(slicedir)/Ice/ServantLocatorF.ice $(SLICE2CPP) $(SLICEPARSERLIB) +$(HDIR)/ServantLocator.h ServantLocator.cpp: $(slicedir)/Ice/ServantLocator.ice $(slicedir)/Ice/ObjectAdapterF.ice $(slicedir)/Ice/Current.ice $(slicedir)/Ice/ConnectionF.ice $(slicedir)/Ice/Identity.ice $(slicedir)/Ice/Version.ice $(SLICE2CPP) $(SLICEPARSERLIB) +$(HDIR)/SliceChecksumDict.h SliceChecksumDict.cpp: $(slicedir)/Ice/SliceChecksumDict.ice $(SLICE2CPP) $(SLICEPARSERLIB) +$(HDIR)/StatsF.h StatsF.cpp: $(slicedir)/Ice/StatsF.ice $(SLICE2CPP) $(SLICEPARSERLIB) +$(HDIR)/Stats.h Stats.cpp: $(slicedir)/Ice/Stats.ice $(SLICE2CPP) $(SLICEPARSERLIB) +$(HDIR)/Version.h Version.cpp: $(slicedir)/Ice/Version.ice $(SLICE2CPP) $(SLICEPARSERLIB) diff --git a/cpp/src/Ice/.depend.mak b/cpp/src/Ice/.depend.mak index 004a4e44ba5..3824b21326e 100644 --- a/cpp/src/Ice/.depend.mak +++ b/cpp/src/Ice/.depend.mak @@ -86,7 +86,6 @@ Stats$(OBJEXT): Stats.cpp "$(includedir)/Ice/Stats.h" "$(includedir)/Ice/LocalOb StreamI$(OBJEXT): StreamI.cpp ../Ice/StreamI.h "$(includedir)/Ice/Stream.h" "$(includedir)/Ice/StreamF.h" "$(includedir)/IceUtil/Shared.h" "$(includedir)/IceUtil/Config.h" "$(includedir)/Ice/Handle.h" "$(includedir)/IceUtil/Handle.h" "$(includedir)/IceUtil/Exception.h" "$(includedir)/Ice/Config.h" "$(includedir)/Ice/CommunicatorF.h" "$(includedir)/Ice/LocalObjectF.h" "$(includedir)/Ice/ProxyF.h" "$(includedir)/Ice/ProxyHandle.h" "$(includedir)/Ice/ObjectF.h" "$(includedir)/Ice/Exception.h" "$(includedir)/Ice/Format.h" "$(includedir)/Ice/LocalObject.h" "$(includedir)/Ice/StreamTraits.h" "$(includedir)/IceUtil/ScopedArray.h" "$(includedir)/IceUtil/Iterator.h" "$(includedir)/IceUtil/Optional.h" "$(includedir)/Ice/UndefSysMacros.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/GCShared.h" "$(includedir)/Ice/GCCountMap.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/EndpointIF.h" "$(includedir)/Ice/EndpointF.h" "$(includedir)/Ice/EndpointTypes.h" "$(includedir)/Ice/ReferenceF.h" "$(includedir)/Ice/OutgoingAsync.h" "$(includedir)/IceUtil/Monitor.h" "$(includedir)/IceUtil/Cond.h" "$(includedir)/IceUtil/Timer.h" "$(includedir)/IceUtil/Thread.h" "$(includedir)/IceUtil/StopWatch.h" "$(includedir)/Ice/OutgoingAsyncF.h" "$(includedir)/Ice/InstanceF.h" "$(includedir)/Ice/BasicStream.h" "$(includedir)/Ice/ObjectFactoryF.h" "$(includedir)/Ice/Buffer.h" "$(includedir)/Ice/Protocol.h" "$(includedir)/Ice/SlicedDataF.h" "$(includedir)/Ice/UserExceptionFactory.h" "$(includedir)/Ice/ObserverF.h" ../Ice/Instance.h "$(includedir)/IceUtil/RecMutex.h" "$(includedir)/Ice/StatsF.h" ../Ice/TraceLevelsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../Ice/ThreadPoolF.h "$(includedir)/Ice/ConnectionFactoryF.h" "$(includedir)/Ice/ConnectionMonitorF.h" ../Ice/ObjectFactoryManagerF.h "$(includedir)/Ice/ObjectAdapterFactoryF.h" ../Ice/EndpointFactoryManagerF.h ../Ice/RetryQueueF.h "$(includedir)/Ice/DynamicLibraryF.h" "$(includedir)/Ice/PluginF.h" "$(includedir)/Ice/Initialize.h" "$(includedir)/Ice/PropertiesF.h" "$(includedir)/Ice/LoggerF.h" "$(includedir)/Ice/Dispatcher.h" "$(includedir)/Ice/StringConverter.h" "$(includedir)/Ice/Plugin.h" "$(includedir)/Ice/BuiltinSequences.h" "$(includedir)/IceUtil/Unicode.h" ../Ice/ImplicitContextI.h "$(includedir)/Ice/ImplicitContext.h" "$(includedir)/Ice/LocalException.h" "$(includedir)/Ice/FacetMap.h" "$(includedir)/Ice/Process.h" "$(includedir)/Ice/Outgoing.h" "$(includedir)/Ice/ObserverHelper.h" "$(includedir)/Ice/Incoming.h" "$(includedir)/Ice/ServantLocatorF.h" "$(includedir)/Ice/ServantManagerF.h" "$(includedir)/Ice/Direct.h" ../Ice/DefaultsAndOverrides.h "$(includedir)/Ice/Endpoint.h" Stream$(OBJEXT): Stream.cpp "$(includedir)/Ice/Stream.h" "$(includedir)/Ice/StreamF.h" "$(includedir)/IceUtil/Shared.h" "$(includedir)/IceUtil/Config.h" "$(includedir)/Ice/Handle.h" "$(includedir)/IceUtil/Handle.h" "$(includedir)/IceUtil/Exception.h" "$(includedir)/Ice/Config.h" "$(includedir)/Ice/CommunicatorF.h" "$(includedir)/Ice/LocalObjectF.h" "$(includedir)/Ice/ProxyF.h" "$(includedir)/Ice/ProxyHandle.h" "$(includedir)/Ice/ObjectF.h" "$(includedir)/Ice/Exception.h" "$(includedir)/Ice/Format.h" "$(includedir)/Ice/LocalObject.h" "$(includedir)/Ice/StreamTraits.h" "$(includedir)/IceUtil/ScopedArray.h" "$(includedir)/IceUtil/Iterator.h" "$(includedir)/IceUtil/Optional.h" "$(includedir)/Ice/UndefSysMacros.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/GCShared.h" "$(includedir)/Ice/GCCountMap.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/EndpointIF.h" "$(includedir)/Ice/EndpointF.h" "$(includedir)/Ice/EndpointTypes.h" "$(includedir)/Ice/ReferenceF.h" "$(includedir)/Ice/OutgoingAsync.h" "$(includedir)/IceUtil/Monitor.h" "$(includedir)/IceUtil/Cond.h" "$(includedir)/IceUtil/Timer.h" "$(includedir)/IceUtil/Thread.h" "$(includedir)/IceUtil/StopWatch.h" "$(includedir)/Ice/OutgoingAsyncF.h" "$(includedir)/Ice/InstanceF.h" "$(includedir)/Ice/BasicStream.h" "$(includedir)/Ice/ObjectFactoryF.h" "$(includedir)/Ice/Buffer.h" "$(includedir)/Ice/Protocol.h" "$(includedir)/Ice/SlicedDataF.h" "$(includedir)/Ice/UserExceptionFactory.h" "$(includedir)/Ice/ObserverF.h" StringConverter$(OBJEXT): StringConverter.cpp "$(includedir)/Ice/StringConverter.h" "$(includedir)/Ice/Config.h" "$(includedir)/IceUtil/Config.h" "$(includedir)/Ice/CommunicatorF.h" "$(includedir)/Ice/LocalObjectF.h" "$(includedir)/IceUtil/Shared.h" "$(includedir)/Ice/Handle.h" "$(includedir)/IceUtil/Handle.h" "$(includedir)/IceUtil/Exception.h" "$(includedir)/Ice/ProxyF.h" "$(includedir)/Ice/ProxyHandle.h" "$(includedir)/Ice/ObjectF.h" "$(includedir)/Ice/Exception.h" "$(includedir)/Ice/Format.h" "$(includedir)/Ice/LocalObject.h" "$(includedir)/Ice/StreamTraits.h" "$(includedir)/IceUtil/ScopedArray.h" "$(includedir)/IceUtil/Iterator.h" "$(includedir)/IceUtil/Optional.h" "$(includedir)/Ice/UndefSysMacros.h" "$(includedir)/Ice/Plugin.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/EndpointIF.h" "$(includedir)/Ice/EndpointF.h" "$(includedir)/Ice/EndpointTypes.h" "$(includedir)/Ice/ObjectAdapterF.h" "$(includedir)/Ice/ReferenceF.h" "$(includedir)/Ice/OutgoingAsync.h" "$(includedir)/IceUtil/Monitor.h" "$(includedir)/IceUtil/Cond.h" "$(includedir)/IceUtil/Timer.h" "$(includedir)/IceUtil/Thread.h" "$(includedir)/IceUtil/StopWatch.h" "$(includedir)/Ice/OutgoingAsyncF.h" "$(includedir)/Ice/InstanceF.h" "$(includedir)/Ice/Current.h" "$(includedir)/Ice/ConnectionF.h" "$(includedir)/Ice/Identity.h" "$(includedir)/Ice/Version.h" "$(includedir)/Ice/BasicStream.h" "$(includedir)/Ice/ObjectFactoryF.h" "$(includedir)/Ice/Buffer.h" "$(includedir)/Ice/Protocol.h" "$(includedir)/Ice/SlicedDataF.h" "$(includedir)/Ice/UserExceptionFactory.h" "$(includedir)/Ice/ObserverF.h" "$(includedir)/Ice/StreamF.h" "$(includedir)/Ice/LoggerF.h" "$(includedir)/Ice/BuiltinSequences.h" "$(includedir)/Ice/Stream.h" "$(includedir)/Ice/Object.h" "$(includedir)/Ice/GCShared.h" "$(includedir)/Ice/GCCountMap.h" "$(includedir)/Ice/IncomingAsyncF.h" "$(includedir)/IceUtil/Unicode.h" "$(includedir)/IceUtil/IceUtil.h" "$(includedir)/IceUtil/AbstractMutex.h" "$(includedir)/IceUtil/Cache.h" "$(includedir)/IceUtil/CountDownLatch.h" "$(includedir)/IceUtil/CtrlCHandler.h" "$(includedir)/IceUtil/Functional.h" "$(includedir)/IceUtil/MutexPtrLock.h" "$(includedir)/IceUtil/RecMutex.h" "$(includedir)/IceUtil/UUID.h" "$(includedir)/IceUtil/StringUtil.h" "$(includedir)/Ice/Initialize.h" "$(includedir)/Ice/PropertiesF.h" "$(includedir)/Ice/StatsF.h" "$(includedir)/Ice/Dispatcher.h" ../Ice/Instance.h ../Ice/TraceLevelsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../Ice/ThreadPoolF.h "$(includedir)/Ice/ConnectionFactoryF.h" "$(includedir)/Ice/ConnectionMonitorF.h" ../Ice/ObjectFactoryManagerF.h "$(includedir)/Ice/ObjectAdapterFactoryF.h" ../Ice/EndpointFactoryManagerF.h ../Ice/RetryQueueF.h "$(includedir)/Ice/DynamicLibraryF.h" "$(includedir)/Ice/PluginF.h" ../Ice/ImplicitContextI.h "$(includedir)/Ice/ImplicitContext.h" "$(includedir)/Ice/LocalException.h" "$(includedir)/Ice/FacetMap.h" "$(includedir)/Ice/Process.h" "$(includedir)/Ice/Outgoing.h" "$(includedir)/Ice/ObserverHelper.h" "$(includedir)/Ice/Incoming.h" "$(includedir)/Ice/ServantLocatorF.h" "$(includedir)/Ice/ServantManagerF.h" "$(includedir)/Ice/Direct.h" "$(includedir)/Ice/LoggerUtil.h" "$(includedir)/Ice/Communicator.h" "$(includedir)/Ice/RouterF.h" "$(includedir)/Ice/LocatorF.h" "$(includedir)/Ice/ImplicitContextF.h" "$(includedir)/Ice/Properties.h" "$(includedir)/Ice/IconvStringConverter.h" -SysLoggerI$(OBJEXT): SysLoggerI.cpp ../Ice/SysLoggerI.h "$(includedir)/IceUtil/Mutex.h" "$(includedir)/IceUtil/Config.h" "$(includedir)/IceUtil/Lock.h" "$(includedir)/IceUtil/ThreadException.h" "$(includedir)/IceUtil/Exception.h" "$(includedir)/IceUtil/Time.h" "$(includedir)/IceUtil/MutexProtocol.h" "$(includedir)/Ice/Logger.h" "$(includedir)/Ice/LocalObjectF.h" "$(includedir)/IceUtil/Shared.h" "$(includedir)/Ice/Handle.h" "$(includedir)/IceUtil/Handle.h" "$(includedir)/Ice/Config.h" "$(includedir)/Ice/ProxyF.h" "$(includedir)/Ice/ProxyHandle.h" "$(includedir)/Ice/ObjectF.h" "$(includedir)/Ice/Exception.h" "$(includedir)/Ice/Format.h" "$(includedir)/Ice/LocalObject.h" "$(includedir)/Ice/StreamTraits.h" "$(includedir)/IceUtil/ScopedArray.h" "$(includedir)/IceUtil/Iterator.h" "$(includedir)/IceUtil/Optional.h" "$(includedir)/Ice/UndefSysMacros.h" "$(includedir)/Ice/LocalException.h" "$(includedir)/Ice/Proxy.h" "$(includedir)/Ice/ProxyFactoryF.h" "$(includedir)/Ice/ConnectionIF.h" "$(includedir)/Ice/RequestHandlerF.h" "$(includedir)/Ice/EndpointIF.h" "$(includedir)/Ice/EndpointF.h" "$(includedir)/Ice/EndpointTypes.h" "$(includedir)/Ice/ObjectAdapterF.h" "$(includedir)/Ice/ReferenceF.h" "$(includedir)/Ice/OutgoingAsync.h" "$(includedir)/IceUtil/Monitor.h" "$(includedir)/IceUtil/Cond.h" "$(includedir)/IceUtil/Timer.h" "$(includedir)/IceUtil/Thread.h" "$(includedir)/IceUtil/StopWatch.h" "$(includedir)/Ice/OutgoingAsyncF.h" "$(includedir)/Ice/InstanceF.h" "$(includedir)/Ice/CommunicatorF.h" "$(includedir)/Ice/Current.h" "$(includedir)/Ice/ConnectionF.h" "$(includedir)/Ice/Identity.h" "$(includedir)/Ice/Version.h" "$(includedir)/Ice/BasicStream.h" "$(includedir)/Ice/ObjectFactoryF.h" "$(includedir)/Ice/Buffer.h" "$(includedir)/Ice/Protocol.h" "$(includedir)/Ice/SlicedDataF.h" "$(includedir)/Ice/UserExceptionFactory.h" "$(includedir)/Ice/ObserverF.h" "$(includedir)/Ice/StreamF.h" "$(includedir)/Ice/BuiltinSequences.h" "$(includedir)/Ice/Stream.h" "$(includedir)/Ice/Object.h" "$(includedir)/Ice/GCShared.h" "$(includedir)/Ice/GCCountMap.h" "$(includedir)/Ice/IncomingAsyncF.h" TcpAcceptor$(OBJEXT): TcpAcceptor.cpp ../Ice/TcpAcceptor.h ../Ice/TransceiverF.h "$(includedir)/IceUtil/Shared.h" "$(includedir)/IceUtil/Config.h" "$(includedir)/Ice/Handle.h" "$(includedir)/IceUtil/Handle.h" "$(includedir)/IceUtil/Exception.h" "$(includedir)/Ice/Config.h" "$(includedir)/Ice/InstanceF.h" ../Ice/TraceLevelsF.h "$(includedir)/Ice/LoggerF.h" "$(includedir)/Ice/LocalObjectF.h" "$(includedir)/Ice/ProxyF.h" "$(includedir)/Ice/ProxyHandle.h" "$(includedir)/Ice/ObjectF.h" "$(includedir)/Ice/Exception.h" "$(includedir)/Ice/Format.h" "$(includedir)/Ice/LocalObject.h" "$(includedir)/Ice/StreamTraits.h" "$(includedir)/IceUtil/ScopedArray.h" "$(includedir)/IceUtil/Iterator.h" "$(includedir)/IceUtil/Optional.h" "$(includedir)/Ice/UndefSysMacros.h" ../Ice/Acceptor.h ../Ice/AcceptorF.h ../Ice/Network.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/EndpointIF.h" "$(includedir)/Ice/EndpointF.h" "$(includedir)/Ice/EndpointTypes.h" "$(includedir)/Ice/ObjectAdapterF.h" "$(includedir)/Ice/ReferenceF.h" "$(includedir)/Ice/OutgoingAsync.h" "$(includedir)/IceUtil/Monitor.h" "$(includedir)/IceUtil/Cond.h" "$(includedir)/IceUtil/Timer.h" "$(includedir)/IceUtil/Thread.h" "$(includedir)/IceUtil/StopWatch.h" "$(includedir)/Ice/OutgoingAsyncF.h" "$(includedir)/Ice/CommunicatorF.h" "$(includedir)/Ice/Current.h" "$(includedir)/Ice/ConnectionF.h" "$(includedir)/Ice/Identity.h" "$(includedir)/Ice/Version.h" "$(includedir)/Ice/BasicStream.h" "$(includedir)/Ice/ObjectFactoryF.h" "$(includedir)/Ice/Buffer.h" "$(includedir)/Ice/Protocol.h" "$(includedir)/Ice/SlicedDataF.h" "$(includedir)/Ice/UserExceptionFactory.h" "$(includedir)/Ice/ObserverF.h" "$(includedir)/Ice/StreamF.h" "$(includedir)/Ice/Object.h" "$(includedir)/Ice/GCShared.h" "$(includedir)/Ice/GCCountMap.h" "$(includedir)/Ice/IncomingAsyncF.h" ../Ice/TcpTransceiver.h "$(includedir)/Ice/StatsF.h" ../Ice/Transceiver.h ../Ice/Instance.h "$(includedir)/IceUtil/RecMutex.h" ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../Ice/ThreadPoolF.h "$(includedir)/Ice/ConnectionFactoryF.h" "$(includedir)/Ice/ConnectionMonitorF.h" ../Ice/ObjectFactoryManagerF.h "$(includedir)/Ice/ObjectAdapterFactoryF.h" ../Ice/EndpointFactoryManagerF.h ../Ice/RetryQueueF.h "$(includedir)/Ice/DynamicLibraryF.h" "$(includedir)/Ice/PluginF.h" "$(includedir)/Ice/Initialize.h" "$(includedir)/Ice/Dispatcher.h" "$(includedir)/Ice/StringConverter.h" "$(includedir)/Ice/Plugin.h" "$(includedir)/Ice/BuiltinSequences.h" "$(includedir)/Ice/Stream.h" "$(includedir)/IceUtil/Unicode.h" ../Ice/ImplicitContextI.h "$(includedir)/Ice/ImplicitContext.h" "$(includedir)/Ice/LocalException.h" "$(includedir)/Ice/FacetMap.h" "$(includedir)/Ice/Process.h" "$(includedir)/Ice/Outgoing.h" "$(includedir)/Ice/ObserverHelper.h" "$(includedir)/Ice/Incoming.h" "$(includedir)/Ice/ServantLocatorF.h" "$(includedir)/Ice/ServantManagerF.h" "$(includedir)/Ice/Direct.h" ../Ice/TraceLevels.h "$(includedir)/Ice/LoggerUtil.h" "$(includedir)/Ice/Properties.h" "$(includedir)/IceUtil/StringUtil.h" TcpConnector$(OBJEXT): TcpConnector.cpp ../Ice/TcpConnector.h ../Ice/TransceiverF.h "$(includedir)/IceUtil/Shared.h" "$(includedir)/IceUtil/Config.h" "$(includedir)/Ice/Handle.h" "$(includedir)/IceUtil/Handle.h" "$(includedir)/IceUtil/Exception.h" "$(includedir)/Ice/Config.h" "$(includedir)/Ice/InstanceF.h" "$(includedir)/Ice/Protocol.h" "$(includedir)/Ice/Version.h" "$(includedir)/Ice/LocalObjectF.h" "$(includedir)/Ice/ProxyF.h" "$(includedir)/Ice/ProxyHandle.h" "$(includedir)/Ice/ObjectF.h" "$(includedir)/Ice/Exception.h" "$(includedir)/Ice/Format.h" "$(includedir)/Ice/LocalObject.h" "$(includedir)/Ice/StreamTraits.h" "$(includedir)/IceUtil/ScopedArray.h" "$(includedir)/IceUtil/Iterator.h" "$(includedir)/IceUtil/Optional.h" "$(includedir)/Ice/UndefSysMacros.h" ../Ice/TraceLevelsF.h "$(includedir)/Ice/LoggerF.h" ../Ice/Connector.h ../Ice/ConnectorF.h ../Ice/Network.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/EndpointIF.h" "$(includedir)/Ice/EndpointF.h" "$(includedir)/Ice/EndpointTypes.h" "$(includedir)/Ice/ObjectAdapterF.h" "$(includedir)/Ice/ReferenceF.h" "$(includedir)/Ice/OutgoingAsync.h" "$(includedir)/IceUtil/Monitor.h" "$(includedir)/IceUtil/Cond.h" "$(includedir)/IceUtil/Timer.h" "$(includedir)/IceUtil/Thread.h" "$(includedir)/IceUtil/StopWatch.h" "$(includedir)/Ice/OutgoingAsyncF.h" "$(includedir)/Ice/CommunicatorF.h" "$(includedir)/Ice/Current.h" "$(includedir)/Ice/ConnectionF.h" "$(includedir)/Ice/Identity.h" "$(includedir)/Ice/BasicStream.h" "$(includedir)/Ice/ObjectFactoryF.h" "$(includedir)/Ice/Buffer.h" "$(includedir)/Ice/SlicedDataF.h" "$(includedir)/Ice/UserExceptionFactory.h" "$(includedir)/Ice/ObserverF.h" "$(includedir)/Ice/StreamF.h" "$(includedir)/Ice/Object.h" "$(includedir)/Ice/GCShared.h" "$(includedir)/Ice/GCCountMap.h" "$(includedir)/Ice/IncomingAsyncF.h" ../Ice/TcpTransceiver.h "$(includedir)/Ice/StatsF.h" ../Ice/Transceiver.h ../Ice/TcpEndpointI.h ../Ice/EndpointI.h "$(includedir)/Ice/Endpoint.h" "$(includedir)/Ice/BuiltinSequences.h" "$(includedir)/Ice/Stream.h" ../Ice/AcceptorF.h "$(includedir)/Ice/ObserverHelper.h" "$(includedir)/Ice/EndpointFactory.h" "$(includedir)/Ice/EndpointFactoryF.h" ../Ice/Instance.h "$(includedir)/IceUtil/RecMutex.h" ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../Ice/ThreadPoolF.h "$(includedir)/Ice/ConnectionFactoryF.h" "$(includedir)/Ice/ConnectionMonitorF.h" ../Ice/ObjectFactoryManagerF.h "$(includedir)/Ice/ObjectAdapterFactoryF.h" ../Ice/EndpointFactoryManagerF.h ../Ice/RetryQueueF.h "$(includedir)/Ice/DynamicLibraryF.h" "$(includedir)/Ice/PluginF.h" "$(includedir)/Ice/Initialize.h" "$(includedir)/Ice/Dispatcher.h" "$(includedir)/Ice/StringConverter.h" "$(includedir)/Ice/Plugin.h" "$(includedir)/IceUtil/Unicode.h" ../Ice/ImplicitContextI.h "$(includedir)/Ice/ImplicitContext.h" "$(includedir)/Ice/LocalException.h" "$(includedir)/Ice/FacetMap.h" "$(includedir)/Ice/Process.h" "$(includedir)/Ice/Outgoing.h" "$(includedir)/Ice/Incoming.h" "$(includedir)/Ice/ServantLocatorF.h" "$(includedir)/Ice/ServantManagerF.h" "$(includedir)/Ice/Direct.h" ../Ice/TraceLevels.h "$(includedir)/Ice/LoggerUtil.h" TcpEndpointI$(OBJEXT): TcpEndpointI.cpp ../Ice/TcpEndpointI.h "$(includedir)/IceUtil/Config.h" ../Ice/EndpointI.h "$(includedir)/IceUtil/Shared.h" "$(includedir)/IceUtil/Thread.h" "$(includedir)/IceUtil/Handle.h" "$(includedir)/IceUtil/Exception.h" "$(includedir)/IceUtil/Mutex.h" "$(includedir)/IceUtil/Lock.h" "$(includedir)/IceUtil/ThreadException.h" "$(includedir)/IceUtil/Time.h" "$(includedir)/IceUtil/MutexProtocol.h" "$(includedir)/IceUtil/Monitor.h" "$(includedir)/IceUtil/Cond.h" "$(includedir)/Ice/Endpoint.h" "$(includedir)/Ice/LocalObjectF.h" "$(includedir)/Ice/Handle.h" "$(includedir)/Ice/Config.h" "$(includedir)/Ice/ProxyF.h" "$(includedir)/Ice/ProxyHandle.h" "$(includedir)/Ice/ObjectF.h" "$(includedir)/Ice/Exception.h" "$(includedir)/Ice/Format.h" "$(includedir)/Ice/LocalObject.h" "$(includedir)/Ice/StreamTraits.h" "$(includedir)/IceUtil/ScopedArray.h" "$(includedir)/IceUtil/Iterator.h" "$(includedir)/Ice/Proxy.h" "$(includedir)/Ice/ProxyFactoryF.h" "$(includedir)/Ice/ConnectionIF.h" "$(includedir)/Ice/RequestHandlerF.h" "$(includedir)/Ice/EndpointIF.h" "$(includedir)/Ice/EndpointF.h" "$(includedir)/IceUtil/Optional.h" "$(includedir)/Ice/UndefSysMacros.h" "$(includedir)/Ice/EndpointTypes.h" "$(includedir)/Ice/ObjectAdapterF.h" "$(includedir)/Ice/ReferenceF.h" "$(includedir)/Ice/OutgoingAsync.h" "$(includedir)/IceUtil/Timer.h" "$(includedir)/IceUtil/StopWatch.h" "$(includedir)/Ice/OutgoingAsyncF.h" "$(includedir)/Ice/InstanceF.h" "$(includedir)/Ice/CommunicatorF.h" "$(includedir)/Ice/Current.h" "$(includedir)/Ice/ConnectionF.h" "$(includedir)/Ice/Identity.h" "$(includedir)/Ice/Version.h" "$(includedir)/Ice/BasicStream.h" "$(includedir)/Ice/ObjectFactoryF.h" "$(includedir)/Ice/Buffer.h" "$(includedir)/Ice/Protocol.h" "$(includedir)/Ice/SlicedDataF.h" "$(includedir)/Ice/UserExceptionFactory.h" "$(includedir)/Ice/ObserverF.h" "$(includedir)/Ice/StreamF.h" "$(includedir)/Ice/BuiltinSequences.h" "$(includedir)/Ice/Stream.h" "$(includedir)/Ice/Object.h" "$(includedir)/Ice/GCShared.h" "$(includedir)/Ice/GCCountMap.h" "$(includedir)/Ice/IncomingAsyncF.h" ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/Network.h "$(includedir)/Ice/PropertiesF.h" "$(includedir)/Ice/LoggerF.h" "$(includedir)/Ice/ObserverHelper.h" "$(includedir)/Ice/EndpointFactory.h" "$(includedir)/Ice/EndpointFactoryF.h" ../Ice/TcpAcceptor.h ../Ice/TraceLevelsF.h ../Ice/Acceptor.h ../Ice/TcpConnector.h ../Ice/Connector.h ../Ice/TcpTransceiver.h "$(includedir)/Ice/StatsF.h" ../Ice/Transceiver.h "$(includedir)/Ice/LocalException.h" ../Ice/Instance.h "$(includedir)/IceUtil/RecMutex.h" ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../Ice/ThreadPoolF.h "$(includedir)/Ice/ConnectionFactoryF.h" "$(includedir)/Ice/ConnectionMonitorF.h" ../Ice/ObjectFactoryManagerF.h "$(includedir)/Ice/ObjectAdapterFactoryF.h" ../Ice/EndpointFactoryManagerF.h ../Ice/RetryQueueF.h "$(includedir)/Ice/DynamicLibraryF.h" "$(includedir)/Ice/PluginF.h" "$(includedir)/Ice/Initialize.h" "$(includedir)/Ice/Dispatcher.h" "$(includedir)/Ice/StringConverter.h" "$(includedir)/Ice/Plugin.h" "$(includedir)/IceUtil/Unicode.h" ../Ice/ImplicitContextI.h "$(includedir)/Ice/ImplicitContext.h" "$(includedir)/Ice/FacetMap.h" "$(includedir)/Ice/Process.h" "$(includedir)/Ice/Outgoing.h" "$(includedir)/Ice/Incoming.h" "$(includedir)/Ice/ServantLocatorF.h" "$(includedir)/Ice/ServantManagerF.h" "$(includedir)/Ice/Direct.h" ../Ice/DefaultsAndOverrides.h ../Ice/HashUtil.h @@ -99,43 +98,44 @@ UdpConnector$(OBJEXT): UdpConnector.cpp ../Ice/UdpConnector.h ../Ice/Transceiver UdpEndpointI$(OBJEXT): UdpEndpointI.cpp ../Ice/UdpEndpointI.h "$(includedir)/IceUtil/Config.h" ../Ice/EndpointI.h "$(includedir)/IceUtil/Shared.h" "$(includedir)/IceUtil/Thread.h" "$(includedir)/IceUtil/Handle.h" "$(includedir)/IceUtil/Exception.h" "$(includedir)/IceUtil/Mutex.h" "$(includedir)/IceUtil/Lock.h" "$(includedir)/IceUtil/ThreadException.h" "$(includedir)/IceUtil/Time.h" "$(includedir)/IceUtil/MutexProtocol.h" "$(includedir)/IceUtil/Monitor.h" "$(includedir)/IceUtil/Cond.h" "$(includedir)/Ice/Endpoint.h" "$(includedir)/Ice/LocalObjectF.h" "$(includedir)/Ice/Handle.h" "$(includedir)/Ice/Config.h" "$(includedir)/Ice/ProxyF.h" "$(includedir)/Ice/ProxyHandle.h" "$(includedir)/Ice/ObjectF.h" "$(includedir)/Ice/Exception.h" "$(includedir)/Ice/Format.h" "$(includedir)/Ice/LocalObject.h" "$(includedir)/Ice/StreamTraits.h" "$(includedir)/IceUtil/ScopedArray.h" "$(includedir)/IceUtil/Iterator.h" "$(includedir)/Ice/Proxy.h" "$(includedir)/Ice/ProxyFactoryF.h" "$(includedir)/Ice/ConnectionIF.h" "$(includedir)/Ice/RequestHandlerF.h" "$(includedir)/Ice/EndpointIF.h" "$(includedir)/Ice/EndpointF.h" "$(includedir)/IceUtil/Optional.h" "$(includedir)/Ice/UndefSysMacros.h" "$(includedir)/Ice/EndpointTypes.h" "$(includedir)/Ice/ObjectAdapterF.h" "$(includedir)/Ice/ReferenceF.h" "$(includedir)/Ice/OutgoingAsync.h" "$(includedir)/IceUtil/Timer.h" "$(includedir)/IceUtil/StopWatch.h" "$(includedir)/Ice/OutgoingAsyncF.h" "$(includedir)/Ice/InstanceF.h" "$(includedir)/Ice/CommunicatorF.h" "$(includedir)/Ice/Current.h" "$(includedir)/Ice/ConnectionF.h" "$(includedir)/Ice/Identity.h" "$(includedir)/Ice/Version.h" "$(includedir)/Ice/BasicStream.h" "$(includedir)/Ice/ObjectFactoryF.h" "$(includedir)/Ice/Buffer.h" "$(includedir)/Ice/Protocol.h" "$(includedir)/Ice/SlicedDataF.h" "$(includedir)/Ice/UserExceptionFactory.h" "$(includedir)/Ice/ObserverF.h" "$(includedir)/Ice/StreamF.h" "$(includedir)/Ice/BuiltinSequences.h" "$(includedir)/Ice/Stream.h" "$(includedir)/Ice/Object.h" "$(includedir)/Ice/GCShared.h" "$(includedir)/Ice/GCCountMap.h" "$(includedir)/Ice/IncomingAsyncF.h" ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/Network.h "$(includedir)/Ice/PropertiesF.h" "$(includedir)/Ice/LoggerF.h" "$(includedir)/Ice/ObserverHelper.h" "$(includedir)/Ice/EndpointFactory.h" "$(includedir)/Ice/EndpointFactoryF.h" ../Ice/UdpConnector.h ../Ice/Connector.h ../Ice/UdpTransceiver.h ../Ice/TraceLevelsF.h "$(includedir)/Ice/StatsF.h" ../Ice/Transceiver.h "$(includedir)/Ice/LocalException.h" ../Ice/Instance.h "$(includedir)/IceUtil/RecMutex.h" ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../Ice/ThreadPoolF.h "$(includedir)/Ice/ConnectionFactoryF.h" "$(includedir)/Ice/ConnectionMonitorF.h" ../Ice/ObjectFactoryManagerF.h "$(includedir)/Ice/ObjectAdapterFactoryF.h" ../Ice/EndpointFactoryManagerF.h ../Ice/RetryQueueF.h "$(includedir)/Ice/DynamicLibraryF.h" "$(includedir)/Ice/PluginF.h" "$(includedir)/Ice/Initialize.h" "$(includedir)/Ice/Dispatcher.h" "$(includedir)/Ice/StringConverter.h" "$(includedir)/Ice/Plugin.h" "$(includedir)/IceUtil/Unicode.h" ../Ice/ImplicitContextI.h "$(includedir)/Ice/ImplicitContext.h" "$(includedir)/Ice/FacetMap.h" "$(includedir)/Ice/Process.h" "$(includedir)/Ice/Outgoing.h" "$(includedir)/Ice/Incoming.h" "$(includedir)/Ice/ServantLocatorF.h" "$(includedir)/Ice/ServantManagerF.h" "$(includedir)/Ice/Direct.h" ../Ice/DefaultsAndOverrides.h ../Ice/HashUtil.h UdpTransceiver$(OBJEXT): UdpTransceiver.cpp ../Ice/UdpTransceiver.h "$(includedir)/Ice/InstanceF.h" "$(includedir)/IceUtil/Shared.h" "$(includedir)/IceUtil/Config.h" "$(includedir)/Ice/Handle.h" "$(includedir)/IceUtil/Handle.h" "$(includedir)/IceUtil/Exception.h" "$(includedir)/Ice/Config.h" ../Ice/TraceLevelsF.h "$(includedir)/Ice/LoggerF.h" "$(includedir)/Ice/LocalObjectF.h" "$(includedir)/Ice/ProxyF.h" "$(includedir)/Ice/ProxyHandle.h" "$(includedir)/Ice/ObjectF.h" "$(includedir)/Ice/Exception.h" "$(includedir)/Ice/Format.h" "$(includedir)/Ice/LocalObject.h" "$(includedir)/Ice/StreamTraits.h" "$(includedir)/IceUtil/ScopedArray.h" "$(includedir)/IceUtil/Iterator.h" "$(includedir)/IceUtil/Optional.h" "$(includedir)/Ice/UndefSysMacros.h" "$(includedir)/Ice/StatsF.h" ../Ice/Transceiver.h ../Ice/TransceiverF.h "$(includedir)/Ice/ConnectionF.h" ../Ice/Network.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/EndpointIF.h" "$(includedir)/Ice/EndpointF.h" "$(includedir)/Ice/EndpointTypes.h" "$(includedir)/Ice/ObjectAdapterF.h" "$(includedir)/Ice/ReferenceF.h" "$(includedir)/Ice/OutgoingAsync.h" "$(includedir)/IceUtil/Monitor.h" "$(includedir)/IceUtil/Cond.h" "$(includedir)/IceUtil/Timer.h" "$(includedir)/IceUtil/Thread.h" "$(includedir)/IceUtil/StopWatch.h" "$(includedir)/Ice/OutgoingAsyncF.h" "$(includedir)/Ice/CommunicatorF.h" "$(includedir)/Ice/Current.h" "$(includedir)/Ice/Identity.h" "$(includedir)/Ice/Version.h" "$(includedir)/Ice/BasicStream.h" "$(includedir)/Ice/ObjectFactoryF.h" "$(includedir)/Ice/Buffer.h" "$(includedir)/Ice/Protocol.h" "$(includedir)/Ice/SlicedDataF.h" "$(includedir)/Ice/UserExceptionFactory.h" "$(includedir)/Ice/ObserverF.h" "$(includedir)/Ice/StreamF.h" "$(includedir)/Ice/Object.h" "$(includedir)/Ice/GCShared.h" "$(includedir)/Ice/GCCountMap.h" "$(includedir)/Ice/IncomingAsyncF.h" "$(includedir)/Ice/Connection.h" "$(includedir)/Ice/Endpoint.h" "$(includedir)/Ice/BuiltinSequences.h" "$(includedir)/Ice/Stream.h" ../Ice/Instance.h "$(includedir)/IceUtil/RecMutex.h" ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../Ice/ThreadPoolF.h "$(includedir)/Ice/ConnectionFactoryF.h" "$(includedir)/Ice/ConnectionMonitorF.h" ../Ice/ObjectFactoryManagerF.h "$(includedir)/Ice/ObjectAdapterFactoryF.h" ../Ice/EndpointFactoryManagerF.h ../Ice/RetryQueueF.h "$(includedir)/Ice/DynamicLibraryF.h" "$(includedir)/Ice/PluginF.h" "$(includedir)/Ice/Initialize.h" "$(includedir)/Ice/Dispatcher.h" "$(includedir)/Ice/StringConverter.h" "$(includedir)/Ice/Plugin.h" "$(includedir)/IceUtil/Unicode.h" ../Ice/ImplicitContextI.h "$(includedir)/Ice/ImplicitContext.h" "$(includedir)/Ice/LocalException.h" "$(includedir)/Ice/FacetMap.h" "$(includedir)/Ice/Process.h" "$(includedir)/Ice/Outgoing.h" "$(includedir)/Ice/ObserverHelper.h" "$(includedir)/Ice/Incoming.h" "$(includedir)/Ice/ServantLocatorF.h" "$(includedir)/Ice/ServantManagerF.h" "$(includedir)/Ice/Direct.h" ../Ice/TraceLevels.h "$(includedir)/Ice/LoggerUtil.h" "$(includedir)/Ice/Stats.h" "$(includedir)/Ice/Properties.h" "$(includedir)/IceUtil/StringUtil.h" Version$(OBJEXT): Version.cpp "$(includedir)/Ice/Version.h" "$(includedir)/Ice/LocalObjectF.h" "$(includedir)/IceUtil/Shared.h" "$(includedir)/IceUtil/Config.h" "$(includedir)/Ice/Handle.h" "$(includedir)/IceUtil/Handle.h" "$(includedir)/IceUtil/Exception.h" "$(includedir)/Ice/Config.h" "$(includedir)/Ice/ProxyF.h" "$(includedir)/Ice/ProxyHandle.h" "$(includedir)/Ice/ObjectF.h" "$(includedir)/Ice/Exception.h" "$(includedir)/Ice/Format.h" "$(includedir)/Ice/LocalObject.h" "$(includedir)/Ice/StreamTraits.h" "$(includedir)/IceUtil/ScopedArray.h" "$(includedir)/IceUtil/Iterator.h" "$(includedir)/IceUtil/Optional.h" "$(includedir)/Ice/UndefSysMacros.h" "$(includedir)/Ice/BasicStream.h" "$(includedir)/Ice/InstanceF.h" "$(includedir)/Ice/ObjectFactoryF.h" "$(includedir)/Ice/Buffer.h" "$(includedir)/Ice/Protocol.h" "$(includedir)/Ice/SlicedDataF.h" "$(includedir)/Ice/UserExceptionFactory.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/GCShared.h" "$(includedir)/Ice/GCCountMap.h" "$(includedir)/Ice/IncomingAsyncF.h" "$(includedir)/Ice/Current.h" "$(includedir)/Ice/ObjectAdapterF.h" "$(includedir)/Ice/ConnectionF.h" "$(includedir)/Ice/Identity.h" "$(includedir)/Ice/StreamF.h" "$(includedir)/IceUtil/DisableWarnings.h" +SysLoggerI$(OBJEXT): SysLoggerI.cpp ../Ice/SysLoggerI.h "$(includedir)/IceUtil/Mutex.h" "$(includedir)/IceUtil/Config.h" "$(includedir)/IceUtil/Lock.h" "$(includedir)/IceUtil/ThreadException.h" "$(includedir)/IceUtil/Exception.h" "$(includedir)/IceUtil/Time.h" "$(includedir)/IceUtil/MutexProtocol.h" "$(includedir)/Ice/Logger.h" "$(includedir)/Ice/LocalObjectF.h" "$(includedir)/IceUtil/Shared.h" "$(includedir)/Ice/Handle.h" "$(includedir)/IceUtil/Handle.h" "$(includedir)/Ice/Config.h" "$(includedir)/Ice/ProxyF.h" "$(includedir)/Ice/ProxyHandle.h" "$(includedir)/Ice/ObjectF.h" "$(includedir)/Ice/Exception.h" "$(includedir)/Ice/Format.h" "$(includedir)/Ice/LocalObject.h" "$(includedir)/Ice/StreamTraits.h" "$(includedir)/IceUtil/ScopedArray.h" "$(includedir)/IceUtil/Iterator.h" "$(includedir)/IceUtil/Optional.h" "$(includedir)/Ice/UndefSysMacros.h" "$(includedir)/Ice/LocalException.h" "$(includedir)/Ice/Proxy.h" "$(includedir)/Ice/ProxyFactoryF.h" "$(includedir)/Ice/ConnectionIF.h" "$(includedir)/Ice/RequestHandlerF.h" "$(includedir)/Ice/EndpointIF.h" "$(includedir)/Ice/EndpointF.h" "$(includedir)/Ice/EndpointTypes.h" "$(includedir)/Ice/ObjectAdapterF.h" "$(includedir)/Ice/ReferenceF.h" "$(includedir)/Ice/OutgoingAsync.h" "$(includedir)/IceUtil/Monitor.h" "$(includedir)/IceUtil/Cond.h" "$(includedir)/IceUtil/Timer.h" "$(includedir)/IceUtil/Thread.h" "$(includedir)/IceUtil/StopWatch.h" "$(includedir)/Ice/OutgoingAsyncF.h" "$(includedir)/Ice/InstanceF.h" "$(includedir)/Ice/CommunicatorF.h" "$(includedir)/Ice/Current.h" "$(includedir)/Ice/ConnectionF.h" "$(includedir)/Ice/Identity.h" "$(includedir)/Ice/Version.h" "$(includedir)/Ice/BasicStream.h" "$(includedir)/Ice/ObjectFactoryF.h" "$(includedir)/Ice/Buffer.h" "$(includedir)/Ice/Protocol.h" "$(includedir)/Ice/SlicedDataF.h" "$(includedir)/Ice/UserExceptionFactory.h" "$(includedir)/Ice/ObserverF.h" "$(includedir)/Ice/StreamF.h" "$(includedir)/Ice/BuiltinSequences.h" "$(includedir)/Ice/Stream.h" "$(includedir)/Ice/Object.h" "$(includedir)/Ice/GCShared.h" "$(includedir)/Ice/GCCountMap.h" "$(includedir)/Ice/IncomingAsyncF.h" DLLMain$(OBJEXT): DLLMain.cpp ../Ice/ImplicitContextI.h "$(includedir)/Ice/ImplicitContext.h" "$(includedir)/Ice/LocalObjectF.h" "$(includedir)/IceUtil/Shared.h" "$(includedir)/IceUtil/Config.h" "$(includedir)/Ice/Handle.h" "$(includedir)/IceUtil/Handle.h" "$(includedir)/IceUtil/Exception.h" "$(includedir)/Ice/Config.h" "$(includedir)/Ice/ProxyF.h" "$(includedir)/Ice/ProxyHandle.h" "$(includedir)/Ice/ObjectF.h" "$(includedir)/Ice/Exception.h" "$(includedir)/Ice/Format.h" "$(includedir)/Ice/LocalObject.h" "$(includedir)/Ice/StreamTraits.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/EndpointIF.h" "$(includedir)/Ice/EndpointF.h" "$(includedir)/IceUtil/Optional.h" "$(includedir)/Ice/UndefSysMacros.h" "$(includedir)/Ice/EndpointTypes.h" "$(includedir)/Ice/ObjectAdapterF.h" "$(includedir)/Ice/ReferenceF.h" "$(includedir)/Ice/OutgoingAsync.h" "$(includedir)/IceUtil/Monitor.h" "$(includedir)/IceUtil/Cond.h" "$(includedir)/IceUtil/Timer.h" "$(includedir)/IceUtil/Thread.h" "$(includedir)/IceUtil/StopWatch.h" "$(includedir)/Ice/OutgoingAsyncF.h" "$(includedir)/Ice/InstanceF.h" "$(includedir)/Ice/CommunicatorF.h" "$(includedir)/Ice/Current.h" "$(includedir)/Ice/ConnectionF.h" "$(includedir)/Ice/Identity.h" "$(includedir)/Ice/Version.h" "$(includedir)/Ice/BasicStream.h" "$(includedir)/Ice/ObjectFactoryF.h" "$(includedir)/Ice/Buffer.h" "$(includedir)/Ice/Protocol.h" "$(includedir)/Ice/SlicedDataF.h" "$(includedir)/Ice/UserExceptionFactory.h" "$(includedir)/Ice/ObserverF.h" "$(includedir)/Ice/StreamF.h" "$(includedir)/Ice/LocalException.h" "$(includedir)/Ice/BuiltinSequences.h" "$(includedir)/Ice/Stream.h" "$(includedir)/Ice/Object.h" "$(includedir)/Ice/GCShared.h" "$(includedir)/Ice/GCCountMap.h" "$(includedir)/Ice/IncomingAsyncF.h" "$(includedir)/Ice/Service.h" "$(includedir)/Ice/Ice.h" "$(includedir)/Ice/Initialize.h" "$(includedir)/Ice/PropertiesF.h" "$(includedir)/Ice/LoggerF.h" "$(includedir)/Ice/StatsF.h" "$(includedir)/Ice/Dispatcher.h" "$(includedir)/Ice/StringConverter.h" "$(includedir)/Ice/Plugin.h" "$(includedir)/IceUtil/Unicode.h" "$(includedir)/Ice/Properties.h" "$(includedir)/Ice/Outgoing.h" "$(includedir)/Ice/ObserverHelper.h" "$(includedir)/Ice/Incoming.h" "$(includedir)/Ice/ServantLocatorF.h" "$(includedir)/Ice/ServantManagerF.h" "$(includedir)/Ice/Direct.h" "$(includedir)/Ice/Logger.h" "$(includedir)/Ice/LoggerUtil.h" "$(includedir)/Ice/Stats.h" "$(includedir)/Ice/Communicator.h" "$(includedir)/Ice/RouterF.h" "$(includedir)/Ice/LocatorF.h" "$(includedir)/Ice/PluginF.h" "$(includedir)/Ice/ImplicitContextF.h" "$(includedir)/Ice/CommunicatorAsync.h" "$(includedir)/Ice/ObjectFactory.h" "$(includedir)/Ice/ObjectAdapter.h" "$(includedir)/Ice/FacetMap.h" "$(includedir)/Ice/Endpoint.h" "$(includedir)/Ice/ServantLocator.h" "$(includedir)/Ice/SlicedData.h" "$(includedir)/Ice/IncomingAsync.h" "$(includedir)/Ice/Process.h" "$(includedir)/Ice/Application.h" "$(includedir)/Ice/Connection.h" "$(includedir)/Ice/ConnectionAsync.h" "$(includedir)/Ice/Functional.h" "$(includedir)/IceUtil/Functional.h" "$(includedir)/Ice/Locator.h" "$(includedir)/Ice/FactoryTableInit.h" "$(includedir)/Ice/FactoryTable.h" "$(includedir)/Ice/ProcessF.h" "$(includedir)/Ice/Router.h" "$(includedir)/Ice/DispatchInterceptor.h" "$(includedir)/Ice/IconvStringConverter.h" -BuiltinSequences.h BuiltinSequences.cpp: "$(slicedir)/Ice/BuiltinSequences.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" -CommunicatorF.h CommunicatorF.cpp: "$(slicedir)/Ice/CommunicatorF.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" -Communicator.h Communicator.cpp: "$(slicedir)/Ice/Communicator.ice" "$(slicedir)/Ice/LoggerF.ice" "$(slicedir)/Ice/StatsF.ice" "$(slicedir)/Ice/ObserverF.ice" "$(slicedir)/Ice/ObjectAdapterF.ice" "$(slicedir)/Ice/ObjectFactoryF.ice" "$(slicedir)/Ice/RouterF.ice" "$(slicedir)/Ice/LocatorF.ice" "$(slicedir)/Ice/PluginF.ice" "$(slicedir)/Ice/ImplicitContextF.ice" "$(slicedir)/Ice/Current.ice" "$(slicedir)/Ice/ConnectionF.ice" "$(slicedir)/Ice/Identity.ice" "$(slicedir)/Ice/Version.ice" "$(slicedir)/Ice/Properties.ice" "$(slicedir)/Ice/BuiltinSequences.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" -ConnectionF.h ConnectionF.cpp: "$(slicedir)/Ice/ConnectionF.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" -Connection.h Connection.cpp: "$(slicedir)/Ice/Connection.ice" "$(slicedir)/Ice/ObjectAdapterF.ice" "$(slicedir)/Ice/Identity.ice" "$(slicedir)/Ice/Endpoint.ice" "$(slicedir)/Ice/Version.ice" "$(slicedir)/Ice/BuiltinSequences.ice" "$(slicedir)/Ice/EndpointF.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" -Current.h Current.cpp: "$(slicedir)/Ice/Current.ice" "$(slicedir)/Ice/ObjectAdapterF.ice" "$(slicedir)/Ice/ConnectionF.ice" "$(slicedir)/Ice/Identity.ice" "$(slicedir)/Ice/Version.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" -Endpoint.h Endpoint.cpp: "$(slicedir)/Ice/Endpoint.ice" "$(slicedir)/Ice/Version.ice" "$(slicedir)/Ice/BuiltinSequences.ice" "$(slicedir)/Ice/EndpointF.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" -EndpointF.h EndpointF.cpp: "$(slicedir)/Ice/EndpointF.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" -EndpointTypes.h EndpointTypes.cpp: "$(slicedir)/Ice/EndpointTypes.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" -FacetMap.h FacetMap.cpp: "$(slicedir)/Ice/FacetMap.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" -Identity.h Identity.cpp: "$(slicedir)/Ice/Identity.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" -ImplicitContextF.h ImplicitContextF.cpp: "$(slicedir)/Ice/ImplicitContextF.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" -ImplicitContext.h ImplicitContext.cpp: "$(slicedir)/Ice/ImplicitContext.ice" "$(slicedir)/Ice/LocalException.ice" "$(slicedir)/Ice/Identity.ice" "$(slicedir)/Ice/Version.ice" "$(slicedir)/Ice/BuiltinSequences.ice" "$(slicedir)/Ice/Current.ice" "$(slicedir)/Ice/ObjectAdapterF.ice" "$(slicedir)/Ice/ConnectionF.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" -LocalException.h LocalException.cpp: "$(slicedir)/Ice/LocalException.ice" "$(slicedir)/Ice/Identity.ice" "$(slicedir)/Ice/Version.ice" "$(slicedir)/Ice/BuiltinSequences.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" -LocatorF.h LocatorF.cpp: "$(slicedir)/Ice/LocatorF.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" -Locator.h Locator.cpp: "$(slicedir)/Ice/Locator.ice" "$(slicedir)/Ice/Identity.ice" "$(slicedir)/Ice/ProcessF.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" -LoggerF.h LoggerF.cpp: "$(slicedir)/Ice/LoggerF.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" -Logger.h Logger.cpp: "$(slicedir)/Ice/Logger.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" -Metrics.h Metrics.cpp: "$(slicedir)/Ice/Metrics.ice" "$(slicedir)/Ice/BuiltinSequences.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" -ObjectAdapterF.h ObjectAdapterF.cpp: "$(slicedir)/Ice/ObjectAdapterF.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" -ObjectAdapter.h ObjectAdapter.cpp: "$(slicedir)/Ice/ObjectAdapter.ice" "$(slicedir)/Ice/CommunicatorF.ice" "$(slicedir)/Ice/ServantLocatorF.ice" "$(slicedir)/Ice/LocatorF.ice" "$(slicedir)/Ice/Identity.ice" "$(slicedir)/Ice/FacetMap.ice" "$(slicedir)/Ice/Endpoint.ice" "$(slicedir)/Ice/Version.ice" "$(slicedir)/Ice/BuiltinSequences.ice" "$(slicedir)/Ice/EndpointF.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" -ObjectFactoryF.h ObjectFactoryF.cpp: "$(slicedir)/Ice/ObjectFactoryF.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" -ObjectFactory.h ObjectFactory.cpp: "$(slicedir)/Ice/ObjectFactory.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" -Observer.h Observer.cpp: "$(slicedir)/Ice/Observer.ice" "$(slicedir)/Ice/EndpointF.ice" "$(slicedir)/Ice/ConnectionF.ice" "$(slicedir)/Ice/Current.ice" "$(slicedir)/Ice/ObjectAdapterF.ice" "$(slicedir)/Ice/Identity.ice" "$(slicedir)/Ice/Version.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" -ObserverF.h ObserverF.cpp: "$(slicedir)/Ice/ObserverF.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" -PluginF.h PluginF.cpp: "$(slicedir)/Ice/PluginF.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" -Plugin.h Plugin.cpp: "$(slicedir)/Ice/Plugin.ice" "$(slicedir)/Ice/LoggerF.ice" "$(slicedir)/Ice/BuiltinSequences.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" -ProcessF.h ProcessF.cpp: "$(slicedir)/Ice/ProcessF.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" -Process.h Process.cpp: "$(slicedir)/Ice/Process.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" -PropertiesF.h PropertiesF.cpp: "$(slicedir)/Ice/PropertiesF.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" -Properties.h Properties.cpp: "$(slicedir)/Ice/Properties.ice" "$(slicedir)/Ice/BuiltinSequences.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" -RouterF.h RouterF.cpp: "$(slicedir)/Ice/RouterF.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" -Router.h Router.cpp: "$(slicedir)/Ice/Router.ice" "$(slicedir)/Ice/BuiltinSequences.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" -ServantLocatorF.h ServantLocatorF.cpp: "$(slicedir)/Ice/ServantLocatorF.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" -ServantLocator.h ServantLocator.cpp: "$(slicedir)/Ice/ServantLocator.ice" "$(slicedir)/Ice/ObjectAdapterF.ice" "$(slicedir)/Ice/Current.ice" "$(slicedir)/Ice/ConnectionF.ice" "$(slicedir)/Ice/Identity.ice" "$(slicedir)/Ice/Version.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" -SliceChecksumDict.h SliceChecksumDict.cpp: "$(slicedir)/Ice/SliceChecksumDict.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" -StatsF.h StatsF.cpp: "$(slicedir)/Ice/StatsF.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" -Stats.h Stats.cpp: "$(slicedir)/Ice/Stats.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" -Version.h Version.cpp: "$(slicedir)/Ice/Version.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" +$(HDIR)\BuiltinSequences.h BuiltinSequences.cpp: "$(slicedir)/Ice/BuiltinSequences.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" +$(HDIR)\CommunicatorF.h CommunicatorF.cpp: "$(slicedir)/Ice/CommunicatorF.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" +$(HDIR)\Communicator.h Communicator.cpp: "$(slicedir)/Ice/Communicator.ice" "$(slicedir)/Ice/LoggerF.ice" "$(slicedir)/Ice/StatsF.ice" "$(slicedir)/Ice/ObserverF.ice" "$(slicedir)/Ice/ObjectAdapterF.ice" "$(slicedir)/Ice/ObjectFactoryF.ice" "$(slicedir)/Ice/RouterF.ice" "$(slicedir)/Ice/LocatorF.ice" "$(slicedir)/Ice/PluginF.ice" "$(slicedir)/Ice/ImplicitContextF.ice" "$(slicedir)/Ice/Current.ice" "$(slicedir)/Ice/ConnectionF.ice" "$(slicedir)/Ice/Identity.ice" "$(slicedir)/Ice/Version.ice" "$(slicedir)/Ice/Properties.ice" "$(slicedir)/Ice/BuiltinSequences.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" +$(HDIR)\ConnectionF.h ConnectionF.cpp: "$(slicedir)/Ice/ConnectionF.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" +$(HDIR)\Connection.h Connection.cpp: "$(slicedir)/Ice/Connection.ice" "$(slicedir)/Ice/ObjectAdapterF.ice" "$(slicedir)/Ice/Identity.ice" "$(slicedir)/Ice/Endpoint.ice" "$(slicedir)/Ice/Version.ice" "$(slicedir)/Ice/BuiltinSequences.ice" "$(slicedir)/Ice/EndpointF.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" +$(HDIR)\Current.h Current.cpp: "$(slicedir)/Ice/Current.ice" "$(slicedir)/Ice/ObjectAdapterF.ice" "$(slicedir)/Ice/ConnectionF.ice" "$(slicedir)/Ice/Identity.ice" "$(slicedir)/Ice/Version.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" +$(HDIR)\Endpoint.h Endpoint.cpp: "$(slicedir)/Ice/Endpoint.ice" "$(slicedir)/Ice/Version.ice" "$(slicedir)/Ice/BuiltinSequences.ice" "$(slicedir)/Ice/EndpointF.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" +$(HDIR)\EndpointF.h EndpointF.cpp: "$(slicedir)/Ice/EndpointF.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" +$(HDIR)\EndpointTypes.h EndpointTypes.cpp: "$(slicedir)/Ice/EndpointTypes.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" +$(HDIR)\FacetMap.h FacetMap.cpp: "$(slicedir)/Ice/FacetMap.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" +$(HDIR)\Identity.h Identity.cpp: "$(slicedir)/Ice/Identity.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" +$(HDIR)\ImplicitContextF.h ImplicitContextF.cpp: "$(slicedir)/Ice/ImplicitContextF.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" +$(HDIR)\ImplicitContext.h ImplicitContext.cpp: "$(slicedir)/Ice/ImplicitContext.ice" "$(slicedir)/Ice/LocalException.ice" "$(slicedir)/Ice/Identity.ice" "$(slicedir)/Ice/Version.ice" "$(slicedir)/Ice/BuiltinSequences.ice" "$(slicedir)/Ice/Current.ice" "$(slicedir)/Ice/ObjectAdapterF.ice" "$(slicedir)/Ice/ConnectionF.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" +$(HDIR)\LocalException.h LocalException.cpp: "$(slicedir)/Ice/LocalException.ice" "$(slicedir)/Ice/Identity.ice" "$(slicedir)/Ice/Version.ice" "$(slicedir)/Ice/BuiltinSequences.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" +$(HDIR)\LocatorF.h LocatorF.cpp: "$(slicedir)/Ice/LocatorF.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" +$(HDIR)\Locator.h Locator.cpp: "$(slicedir)/Ice/Locator.ice" "$(slicedir)/Ice/Identity.ice" "$(slicedir)/Ice/ProcessF.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" +$(HDIR)\LoggerF.h LoggerF.cpp: "$(slicedir)/Ice/LoggerF.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" +$(HDIR)\Logger.h Logger.cpp: "$(slicedir)/Ice/Logger.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" +$(HDIR)\Metrics.h Metrics.cpp: "$(slicedir)/Ice/Metrics.ice" "$(slicedir)/Ice/BuiltinSequences.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" +$(HDIR)\ObjectAdapterF.h ObjectAdapterF.cpp: "$(slicedir)/Ice/ObjectAdapterF.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" +$(HDIR)\ObjectAdapter.h ObjectAdapter.cpp: "$(slicedir)/Ice/ObjectAdapter.ice" "$(slicedir)/Ice/CommunicatorF.ice" "$(slicedir)/Ice/ServantLocatorF.ice" "$(slicedir)/Ice/LocatorF.ice" "$(slicedir)/Ice/Identity.ice" "$(slicedir)/Ice/FacetMap.ice" "$(slicedir)/Ice/Endpoint.ice" "$(slicedir)/Ice/Version.ice" "$(slicedir)/Ice/BuiltinSequences.ice" "$(slicedir)/Ice/EndpointF.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" +$(HDIR)\ObjectFactoryF.h ObjectFactoryF.cpp: "$(slicedir)/Ice/ObjectFactoryF.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" +$(HDIR)\ObjectFactory.h ObjectFactory.cpp: "$(slicedir)/Ice/ObjectFactory.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" +$(HDIR)\Observer.h Observer.cpp: "$(slicedir)/Ice/Observer.ice" "$(slicedir)/Ice/EndpointF.ice" "$(slicedir)/Ice/ConnectionF.ice" "$(slicedir)/Ice/Current.ice" "$(slicedir)/Ice/ObjectAdapterF.ice" "$(slicedir)/Ice/Identity.ice" "$(slicedir)/Ice/Version.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" +$(HDIR)\ObserverF.h ObserverF.cpp: "$(slicedir)/Ice/ObserverF.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" +$(HDIR)\PluginF.h PluginF.cpp: "$(slicedir)/Ice/PluginF.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" +$(HDIR)\Plugin.h Plugin.cpp: "$(slicedir)/Ice/Plugin.ice" "$(slicedir)/Ice/LoggerF.ice" "$(slicedir)/Ice/BuiltinSequences.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" +$(HDIR)\ProcessF.h ProcessF.cpp: "$(slicedir)/Ice/ProcessF.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" +$(HDIR)\Process.h Process.cpp: "$(slicedir)/Ice/Process.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" +$(HDIR)\PropertiesF.h PropertiesF.cpp: "$(slicedir)/Ice/PropertiesF.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" +$(HDIR)\Properties.h Properties.cpp: "$(slicedir)/Ice/Properties.ice" "$(slicedir)/Ice/BuiltinSequences.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" +$(HDIR)\RouterF.h RouterF.cpp: "$(slicedir)/Ice/RouterF.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" +$(HDIR)\Router.h Router.cpp: "$(slicedir)/Ice/Router.ice" "$(slicedir)/Ice/BuiltinSequences.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" +$(HDIR)\ServantLocatorF.h ServantLocatorF.cpp: "$(slicedir)/Ice/ServantLocatorF.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" +$(HDIR)\ServantLocator.h ServantLocator.cpp: "$(slicedir)/Ice/ServantLocator.ice" "$(slicedir)/Ice/ObjectAdapterF.ice" "$(slicedir)/Ice/Current.ice" "$(slicedir)/Ice/ConnectionF.ice" "$(slicedir)/Ice/Identity.ice" "$(slicedir)/Ice/Version.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" +$(HDIR)\SliceChecksumDict.h SliceChecksumDict.cpp: "$(slicedir)/Ice/SliceChecksumDict.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" +$(HDIR)\StatsF.h StatsF.cpp: "$(slicedir)/Ice/StatsF.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" +$(HDIR)\Stats.h Stats.cpp: "$(slicedir)/Ice/Stats.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" +$(HDIR)\Version.h Version.cpp: "$(slicedir)/Ice/Version.ice" "$(SLICE2CPP)" "$(SLICEPARSERLIB)" diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp index 3128a6f1f24..9c854ffb8dc 100644 --- a/cpp/src/Ice/Incoming.cpp +++ b/cpp/src/Ice/Incoming.cpp @@ -148,6 +148,11 @@ IncomingBase::__writeParamEncaps(const Byte* v, Ice::Int sz, bool ok) void IncomingBase::__writeUserException(const Ice::UserException& ex, Ice::FormatType format) { + if(_observer) + { + _observer.failed(ex.ice_name()); + } + ::IceInternal::BasicStream* __os = __startWriteParams(format); __os->write(ex); __endWriteParams(false); @@ -208,6 +213,11 @@ IceInternal::IncomingBase::__servantLocatorFinished() { assert(_connection); + if(_observer) + { + _observer.failed(ex.ice_name()); + } + // // The operation may have already marshaled a reply; we must overwrite that reply. // @@ -269,6 +279,11 @@ IceInternal::IncomingBase::__handleException(const std::exception& exc) __warning(*rfe); } + if(_observer) + { + _observer.failed(rfe->ice_name()); + } + if(_response) { _os.b.resize(headerSize + 4); // Reply status position. @@ -314,12 +329,16 @@ IceInternal::IncomingBase::__handleException(const std::exception& exc) } else if(const Exception* ex = dynamic_cast<const Exception*>(&exc)) { - if(_os.instance()->initializationData().properties->getPropertyAsIntWithDefault("Ice.Warn.Dispatch", 1) > 0) { __warning(*ex); } + if(_observer) + { + _observer.failed(ex->ice_name()); + } + if(_response) { _os.b.resize(headerSize + 4); // Reply status position. @@ -386,6 +405,11 @@ IceInternal::IncomingBase::__handleException(const std::exception& exc) __warning(string("std::exception: ") + exc.what()); } + if(_observer) + { + _observer.failed(typeid(exc).name()); + } + if(_response) { _os.b.resize(headerSize + 4); // Reply status position. @@ -415,6 +439,11 @@ IceInternal::IncomingBase::__handleException() assert(_connection); + if(_observer) + { + _observer.failed("unknown"); + } + if(_response) { _os.b.resize(headerSize + 4); // Reply status position. @@ -586,6 +615,11 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager, BasicStre { Ice::EncodingVersion encoding = _is->skipEncaps(); // Required for batch requests. + if(_observer) + { + _observer.failed(ex.ice_name()); + } + if(_response) { _os.write(replyUserException); diff --git a/cpp/src/Ice/ObserverHelper.cpp b/cpp/src/Ice/ObserverHelper.cpp index 6507da82287..93ea3cca669 100644 --- a/cpp/src/Ice/ObserverHelper.cpp +++ b/cpp/src/Ice/ObserverHelper.cpp @@ -9,7 +9,12 @@ #include <Ice/ObserverHelper.h> #include <Ice/Observer.h> +#include <Ice/Reference.h> +#include <Ice/Instance.h> +#include <Ice/Proxy.h> +using namespace std; +using namespace Ice; using namespace IceInternal; void @@ -30,3 +35,38 @@ ObserverHelper::failed(const Ice::Instrumentation::ObserverPtr& observer, const observer->failed(exceptionName); } +InvocationObserver::InvocationObserver(IceProxy::Ice::Object* proxy, const string& operation, const Context* context) +{ + if(proxy->__reference()->getInstance()->initializationData().observerResolver) + { + attach(proxy, operation, context); + } +} + +InvocationObserver::InvocationObserver() +{ +} + +void +InvocationObserver::attach(IceProxy::Ice::Object* proxy, const string& operation, const Context* context) +{ + const Ice::Instrumentation::ObserverResolverPtr& resolver = + proxy->__reference()->getInstance()->initializationData().observerResolver; + if(resolver) + { + if(context) + { + ObserverHelperT::attach(resolver->getInvocationObserverWithContext(proxy, operation, *context)); + } + else + { + ObserverHelperT::attach(resolver->getInvocationObserver(proxy, operation)); + } + } +} + +void +InvocationObserver::retryImpl() +{ + _observer->retried(); +} diff --git a/cpp/src/Ice/ObserverI.cpp b/cpp/src/Ice/ObserverI.cpp index f9e87eeed1a..7b6fb727d6e 100644 --- a/cpp/src/Ice/ObserverI.cpp +++ b/cpp/src/Ice/ObserverI.cpp @@ -274,36 +274,31 @@ private: DispatchRequestHelper::Attributes DispatchRequestHelper::attributes; -class InvocationRequestHelper : public MetricsHelperT<Metrics> +class InvocationHelper : public MetricsHelperT<Metrics> { public: - class Attributes : public AttributeResolverT<InvocationRequestHelper> + class Attributes : public AttributeResolverT<InvocationHelper> { public: Attributes() { - add("parent", &InvocationRequestHelper::getParent); - add("id", &InvocationRequestHelper::getId); - - addConnectionAttributes<InvocationRequestHelper>(*this); - - add("operation", &InvocationRequestHelper::_operation); - add("identityCategory", &InvocationRequestHelper::getIdentity, &Identity::category); - add("identityName", &InvocationRequestHelper::getIdentity, &Identity::name); - add("facet", &InvocationRequestHelper::getProxy, &IceProxy::Ice::Object::ice_getFacet); - add("encoding", &InvocationRequestHelper::getProxy, &IceProxy::Ice::Object::ice_getEncodingVersion); - add("mode", &InvocationRequestHelper::getMode); + add("parent", &InvocationHelper::getParent); + add("id", &InvocationHelper::getId); + + add("operation", &InvocationHelper::_operation); + add("identityCategory", &InvocationHelper::getIdentity, &Identity::category); + add("identityName", &InvocationHelper::getIdentity, &Identity::name); + add("facet", &InvocationHelper::getProxy, &IceProxy::Ice::Object::ice_getFacet); + add("encoding", &InvocationHelper::getProxy, &IceProxy::Ice::Object::ice_getEncodingVersion); + add("mode", &InvocationHelper::getMode); } }; static Attributes attributes; - InvocationRequestHelper(const Ice::ObjectPrx& proxy, - const string& op, - const Ice::Context& ctx, - const Ice::ConnectionPtr& con) : - _proxy(proxy), _operation(op), _context(ctx), _connection(con) + InvocationHelper(const Ice::ObjectPrx& proxy, const string& op, const Ice::Context& ctx = Ice::Context()) : + _proxy(proxy), _operation(op), _context(ctx) { } @@ -378,25 +373,6 @@ public: return _proxy; } - ::Ice::ConnectionInfoPtr - getConnectionInfo() const - { - if(!_connection) - { - return 0; - } - return _connection->getInfo(); - } - - ::Ice::EndpointInfoPtr - getEndpointInfo() const - { - if(!_connection) - { - return 0; - } - return _connection->getEndpoint()->getInfo(); - } Identity getIdentity() const @@ -409,10 +385,9 @@ private: const ObjectPrx& _proxy; string _operation; const Ice::Context& _context; - const Ice::ConnectionPtr& _connection; }; -InvocationRequestHelper::Attributes InvocationRequestHelper::attributes; +InvocationHelper::Attributes InvocationHelper::attributes; class ThreadHelper : public MetricsHelperT<ThreadMetrics> { @@ -575,12 +550,24 @@ ThreadObserverI::stateChanged(ThreadState oldState, ThreadState newState) forEach(StateChanged(oldState, newState)); } +void +InvocationObserverI::retried() +{ + forEach(inc(&InvocationMetrics::retry)); +} + +ObserverPtr +InvocationObserverI::getRemoteInvocationObserver(const Ice::ConnectionPtr&) +{ + return 0; +} + ObserverResolverI::ObserverResolverI(const MetricsAdminIPtr& metrics) : _metrics(metrics), _connections("Connection", metrics), - _requests("Request", metrics), + _dispatch("Dispatch", metrics), + _invocations("Invocation", metrics), _threads("Thread", metrics), - _locatorQueries("LocatorQuery", metrics), _connects("Connect", metrics), _endpointResolves("EndpointResolve", metrics) { @@ -594,12 +581,6 @@ ObserverResolverI::setObserverUpdater(const ObserverUpdaterPtr& updater) } Ice::Instrumentation::ObserverPtr -ObserverResolverI::getLocatorQueryObserver(const string& adapterId) -{ - return 0; -} - -Ice::Instrumentation::ObserverPtr ObserverResolverI::getConnectObserver(const Ice::EndpointInfoPtr& endpt, const string& connector) { return _connects.getObserver(ConnectHelper(endpt, connector)); @@ -629,17 +610,22 @@ ObserverResolverI::getThreadObserver(const string& parent, return _threads.getObserver(ThreadHelper(parent, id, state), observer); } -ObserverPtr -ObserverResolverI::getInvocationObserver(const ObjectPrx& proxy, - const string& op, - const Context& ctx, - const ConnectionPtr& con) +InvocationObserverPtr +ObserverResolverI::getInvocationObserver(const ObjectPrx& proxy, const string& op) +{ + return _invocations.getObserver(InvocationHelper(proxy, op)); +} + +InvocationObserverPtr +ObserverResolverI::getInvocationObserverWithContext(const ObjectPrx& proxy, + const string& op, + const Context& ctx) { - return _requests.getObserver(InvocationRequestHelper(proxy, op, ctx, con)); + return _invocations.getObserver(InvocationHelper(proxy, op, ctx)); } ObserverPtr ObserverResolverI::getDispatchObserver(const Current& current) { - return _requests.getObserver(DispatchRequestHelper(current)); + return _dispatch.getObserver(DispatchRequestHelper(current)); } diff --git a/cpp/src/Ice/ObserverI.h b/cpp/src/Ice/ObserverI.h index 5b594bdd319..fae42ad831a 100644 --- a/cpp/src/Ice/ObserverI.h +++ b/cpp/src/Ice/ObserverI.h @@ -31,6 +31,13 @@ class ThreadObserverI : public Ice::Instrumentation::ThreadObserver, public Obse virtual void stateChanged(Ice::Instrumentation::ThreadState, Ice::Instrumentation::ThreadState); }; +class InvocationObserverI : public Ice::Instrumentation::InvocationObserver, public ObserverT<InvocationMetrics> +{ + virtual void retried(); + + virtual Ice::Instrumentation::ObserverPtr getRemoteInvocationObserver(const Ice::ConnectionPtr&); +}; + class ObserverResolverI : public Ice::Instrumentation::ObserverResolver { public: @@ -38,8 +45,6 @@ public: ObserverResolverI(const MetricsAdminIPtr&); virtual void setObserverUpdater(const Ice::Instrumentation::ObserverUpdaterPtr&); - - virtual Ice::Instrumentation::ObserverPtr getLocatorQueryObserver(const std::string&); virtual Ice::Instrumentation::ObserverPtr getConnectObserver(const Ice::EndpointInfoPtr&, const std::string&); @@ -57,10 +62,12 @@ public: Ice::Instrumentation::ThreadState, const Ice::Instrumentation::ThreadObserverPtr&); - virtual Ice::Instrumentation::ObserverPtr getInvocationObserver(const Ice::ObjectPrx&, - const std::string&, - const Ice::Context&, - const Ice::ConnectionPtr&); + virtual Ice::Instrumentation::InvocationObserverPtr getInvocationObserverWithContext(const Ice::ObjectPrx&, + const std::string&, + const Ice::Context&); + + virtual Ice::Instrumentation::InvocationObserverPtr getInvocationObserver(const Ice::ObjectPrx&, + const std::string&); virtual Ice::Instrumentation::ObserverPtr getDispatchObserver(const Ice::Current&); @@ -69,9 +76,9 @@ private: const MetricsAdminIPtr _metrics; ObserverResolverT<ConnectionObserverI> _connections; - ObserverResolverT<ObserverI> _requests; + ObserverResolverT<ObserverI> _dispatch; + ObserverResolverT<InvocationObserverI> _invocations; ObserverResolverT<ThreadObserverI> _threads; - ObserverResolverT<ObserverI> _locatorQueries; ObserverResolverT<ObserverI> _connects; ObserverResolverT<ObserverI> _endpointResolves; diff --git a/cpp/src/Ice/Outgoing.cpp b/cpp/src/Ice/Outgoing.cpp index e5b0e833de7..64d9bb248c2 100644 --- a/cpp/src/Ice/Outgoing.cpp +++ b/cpp/src/Ice/Outgoing.cpp @@ -84,35 +84,16 @@ IceInternal::LocalExceptionWrapper::retry() const } IceInternal::Outgoing::Outgoing(RequestHandler* handler, const string& operation, OperationMode mode, - const Context* context) : + const Context* context, InvocationObserver& observer) : _handler(handler), + _observer(observer), _state(StateUnsent), _encoding(handler->getReference()->getEncoding()), _is(handler->getReference()->getInstance().get(), Ice::currentProtocolEncoding), _os(handler->getReference()->getInstance().get(), Ice::currentProtocolEncoding), _sent(false) { - const ReferencePtr& ref = _handler->getReference(); - const ObserverResolverPtr& resolver = ref->getInstance()->initializationData().observerResolver; - if(resolver) - { - try - { - _observer.attach(resolver->getInvocationObserver(ref->getInstance()->proxyFactory()->referenceToProxy(ref), - operation, - *context, - handler->getConnection(false))); - } - catch(const Ice::LocalException&) - { - // - // Ignore: can be raised by getConnection is no connection could be obtained, - // the request will be re-tried in this case. - // - } - } - - switch(ref->getMode()) + switch(_handler->getReference()->getMode()) { case Reference::ModeTwoway: case Reference::ModeOneway: @@ -132,18 +113,18 @@ IceInternal::Outgoing::Outgoing(RequestHandler* handler, const string& operation try { - ref->getIdentity().__write(&_os); + _handler->getReference()->getIdentity().__write(&_os); // // For compatibility with the old FacetPath. // - if(ref->getFacet().empty()) + if(_handler->getReference()->getFacet().empty()) { _os.write(static_cast<string*>(0), static_cast<string*>(0)); } else { - string facet = ref->getFacet(); + string facet = _handler->getReference()->getFacet(); _os.write(&facet, &facet + 1); } @@ -163,8 +144,8 @@ IceInternal::Outgoing::Outgoing(RequestHandler* handler, const string& operation // // Implicit context // - const ImplicitContextIPtr& implicitContext = ref->getInstance()->getImplicitContext(); - const Context& prxContext = ref->getContext()->getValue(); + const ImplicitContextIPtr& implicitContext = _handler->getReference()->getInstance()->getImplicitContext(); + const Context& prxContext = _handler->getReference()->getContext()->getValue(); if(implicitContext == 0) { _os.write(prxContext); diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp index c68c271cefc..8bb137ef68f 100644 --- a/cpp/src/Ice/OutgoingAsync.cpp +++ b/cpp/src/Ice/OutgoingAsync.cpp @@ -285,6 +285,8 @@ Ice::AsyncResult::__exception(const Ice::Exception& ex) __warning(); } } + + _observer.detach(); } void @@ -325,6 +327,8 @@ Ice::AsyncResult::__response() __warning(); } } + + _observer.detach(); } void @@ -424,6 +428,8 @@ IceInternal::OutgoingAsync::__prepare(const std::string& operation, OperationMod _mode = mode; _sentSynchronously = false; + _observer.attach(_proxy.get(), operation, context); + // // Can't call async via a batch proxy. // @@ -497,6 +503,10 @@ IceInternal::OutgoingAsync::__sent(Ice::ConnectionI* connection) { if(!_proxy->ice_isTwoway()) { + if(!_callback || !_callback->__hasSentCallback()) + { + _observer.detach(); + } _state |= Done | OK; } else if(connection->timeout() > 0) @@ -519,6 +529,10 @@ IceInternal::OutgoingAsync::__sent() #else ::Ice::AsyncResult::__sent(); #endif + if(!_proxy->ice_isTwoway()) + { + _observer.detach(); + } } void @@ -786,11 +800,11 @@ IceInternal::OutgoingAsync::handleException(const LocalExceptionWrapper& ex) { if(_mode == Nonmutating || _mode == Idempotent) { - return _proxy->__handleExceptionWrapperRelaxed(_delegate, ex, false, _cnt); + return _proxy->__handleExceptionWrapperRelaxed(_delegate, ex, false, _cnt, _observer); } else { - return _proxy->__handleExceptionWrapper(_delegate, ex); + return _proxy->__handleExceptionWrapper(_delegate, ex, _observer); } } @@ -827,16 +841,16 @@ IceInternal::OutgoingAsync::handleException(const Ice::LocalException& exc, bool { if(_mode == Nonmutating || _mode == Idempotent) { - return _proxy->__handleExceptionWrapperRelaxed(_delegate, ex, false, _cnt); + return _proxy->__handleExceptionWrapperRelaxed(_delegate, ex, false, _cnt, _observer); } else { - return _proxy->__handleExceptionWrapper(_delegate, ex); + return _proxy->__handleExceptionWrapper(_delegate, ex, _observer); } } catch(const Ice::LocalException& ex) { - return _proxy->__handleException(_delegate, ex, false, _cnt); + return _proxy->__handleException(_delegate, ex, false, _cnt, _observer); } return 0; // Keep the compiler happy. } @@ -873,7 +887,15 @@ IceInternal::BatchOutgoingAsync::__sent(Ice::ConnectionI* connection) assert(!_exception.get()); _state |= Done | OK | Sent; _monitor.notifyAll(); - return _callback && _callback->__hasSentCallback(); + if(_callback && _callback->__hasSentCallback()) + { + return true; + } + else + { + _observer.detach(); + return false; + } } void @@ -899,6 +921,7 @@ IceInternal::ProxyBatchOutgoingAsync::ProxyBatchOutgoingAsync(const Ice::ObjectP BatchOutgoingAsync(proxy->ice_getCommunicator(), proxy->__reference()->getInstance(), operation, delegate, cookie), _proxy(proxy) { + _observer.attach(proxy.get(), operation, 0); } void @@ -925,7 +948,7 @@ IceInternal::ProxyBatchOutgoingAsync::__send() } catch(const ::Ice::LocalException& ex) { - _proxy->__handleException(delegate, ex, 0, cnt); + _proxy->__handleException(delegate, ex, 0, cnt, _observer); } } diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp index 33081299113..a5506007a83 100644 --- a/cpp/src/Ice/Proxy.cpp +++ b/cpp/src/Ice/Proxy.cpp @@ -123,6 +123,7 @@ IceProxy::Ice::Object::ice_toString() const bool IceProxy::Ice::Object::ice_isA(const string& typeId, const Context* context) { + InvocationObserver __observer(this, ice_isA_name, context); int __cnt = 0; while(true) { @@ -131,15 +132,15 @@ IceProxy::Ice::Object::ice_isA(const string& typeId, const Context* context) { __checkTwowayOnly(ice_isA_name); __del = __getDelegate(false); - return __del->ice_isA(typeId, context); + return __del->ice_isA(typeId, context, __observer); } catch(const LocalExceptionWrapper& __ex) { - __handleExceptionWrapperRelaxed(__del, __ex, true, __cnt); + __handleExceptionWrapperRelaxed(__del, __ex, true, __cnt, __observer); } catch(const LocalException& __ex) { - __handleException(__del, __ex, true, __cnt); + __handleException(__del, __ex, true, __cnt, __observer); } } } @@ -192,6 +193,7 @@ IceProxy::Ice::Object::end_ice_isA(const AsyncResultPtr& __result) void IceProxy::Ice::Object::ice_ping(const Context* context) { + InvocationObserver __observer(this, ice_ping_name, context); int __cnt = 0; while(true) { @@ -199,16 +201,16 @@ IceProxy::Ice::Object::ice_ping(const Context* context) try { __del = __getDelegate(false); - __del->ice_ping(context); + __del->ice_ping(context, __observer); return; } catch(const LocalExceptionWrapper& __ex) { - __handleExceptionWrapperRelaxed(__del, __ex, true, __cnt); + __handleExceptionWrapperRelaxed(__del, __ex, true, __cnt, __observer); } catch(const LocalException& __ex) { - __handleException(__del, __ex, true, __cnt); + __handleException(__del, __ex, true, __cnt, __observer); } } } @@ -241,6 +243,7 @@ IceProxy::Ice::Object::end_ice_ping(const AsyncResultPtr& __result) vector<string> IceProxy::Ice::Object::ice_ids(const Context* context) { + InvocationObserver __observer(this, ice_ids_name, context); int __cnt = 0; while(true) { @@ -249,15 +252,15 @@ IceProxy::Ice::Object::ice_ids(const Context* context) { __checkTwowayOnly(ice_ids_name); __del = __getDelegate(false); - return __del->ice_ids(context); + return __del->ice_ids(context, __observer); } catch(const LocalExceptionWrapper& __ex) { - __handleExceptionWrapperRelaxed(__del, __ex, true, __cnt); + __handleExceptionWrapperRelaxed(__del, __ex, true, __cnt, __observer); } catch(const LocalException& __ex) { - __handleException(__del, __ex, true, __cnt); + __handleException(__del, __ex, true, __cnt, __observer); } } } @@ -265,6 +268,7 @@ IceProxy::Ice::Object::ice_ids(const Context* context) string IceProxy::Ice::Object::ice_id(const Context* context) { + InvocationObserver __observer(this, ice_id_name, context); int __cnt = 0; while(true) { @@ -273,15 +277,15 @@ IceProxy::Ice::Object::ice_id(const Context* context) { __checkTwowayOnly(ice_id_name); __del = __getDelegate(false); - return __del->ice_id(context); + return __del->ice_id(context, __observer); } catch(const LocalExceptionWrapper& __ex) { - __handleExceptionWrapperRelaxed(__del, __ex, true, __cnt); + __handleExceptionWrapperRelaxed(__del, __ex, true, __cnt, __observer); } catch(const LocalException& __ex) { - __handleException(__del, __ex, true, __cnt); + __handleException(__del, __ex, true, __cnt, __observer); } } } @@ -483,6 +487,7 @@ IceProxy::Ice::Object::ice_invoke(const string& operation, vector<Byte>& outEncaps, const Context* context) { + InvocationObserver __observer(this, ice_invoke_name, context); int __cnt = 0; while(true) { @@ -490,23 +495,23 @@ IceProxy::Ice::Object::ice_invoke(const string& operation, try { __del = __getDelegate(false); - return __del->ice_invoke(operation, mode, inEncaps, outEncaps, context); + return __del->ice_invoke(operation, mode, inEncaps, outEncaps, context, __observer); } catch(const LocalExceptionWrapper& __ex) { bool canRetry = mode == Nonmutating || mode == Idempotent; if(canRetry) { - __handleExceptionWrapperRelaxed(__del, __ex, true, __cnt); + __handleExceptionWrapperRelaxed(__del, __ex, true, __cnt, __observer); } else { - __handleExceptionWrapper(__del, __ex); + __handleExceptionWrapper(__del, __ex, __observer); } } catch(const LocalException& __ex) { - __handleException(__del, __ex, true, __cnt); + __handleException(__del, __ex, true, __cnt, __observer); } } } @@ -1066,6 +1071,7 @@ IceProxy::Ice::Object::ice_getConnectionId() const ConnectionPtr IceProxy::Ice::Object::ice_getConnection() { + InvocationObserver __observer(this, "ice_getConnection", 0); int __cnt = 0; while(true) { @@ -1078,7 +1084,7 @@ IceProxy::Ice::Object::ice_getConnection() } catch(const LocalException& __ex) { - __handleException(__del, __ex, true, __cnt); + __handleException(__del, __ex, true, __cnt, __observer); } } } @@ -1112,16 +1118,17 @@ IceProxy::Ice::Object::ice_flushBatchRequests() // We don't automatically retry if ice_flushBatchRequests fails. Otherwise, if some batch // requests were queued with the connection, they would be lost without being noticed. // + InvocationObserver __observer(this, ice_flushBatchRequests_name, 0); Handle< ::IceDelegate::Ice::Object> __del; int __cnt = -1; // Don't retry. try { __del = __getDelegate(false); - __del->ice_flushBatchRequests(); + __del->ice_flushBatchRequests(__observer); } catch(const LocalException& __ex) { - __handleException(__del, __ex, true, __cnt); + __handleException(__del, __ex, true, __cnt, __observer); } } @@ -1167,12 +1174,6 @@ IceProxy::Ice::Object::end_ice_flushBatchRequests(const AsyncResultPtr& __result __result->__wait(); } -ReferencePtr -IceProxy::Ice::Object::__reference() const -{ - return _reference; -} - void IceProxy::Ice::Object::__copyFrom(const ObjectPrx& from) { @@ -1225,7 +1226,8 @@ int IceProxy::Ice::Object::__handleException(const ::IceInternal::Handle< ::IceDelegate::Ice::Object>& delegate, const LocalException& ex, bool sleep, - int& cnt) + int& cnt, + InvocationObserver& observer) { // // Only _delegate needs to be mutex protected here. @@ -1238,28 +1240,38 @@ IceProxy::Ice::Object::__handleException(const ::IceInternal::Handle< ::IceDeleg } } - if(cnt == -1) // Don't retry if the retry count is -1. - { - ex.ice_throw(); - } - try { - return _reference->getInstance()->proxyFactory()->checkRetryAfterException(ex, _reference, sleep, cnt); + if(cnt == -1) // Don't retry if the retry count is -1. + { + ex.ice_throw(); + } + + try + { + return _reference->getInstance()->proxyFactory()->checkRetryAfterException(ex, _reference, sleep, cnt); + } + catch(const CommunicatorDestroyedException&) + { + // + // The communicator is already destroyed, so we cannot retry. + // + ex.ice_throw(); + } + observer.retry(); } - catch(const CommunicatorDestroyedException&) + catch(const ::Ice::LocalException& ex) { - // - // The communicator is already destroyed, so we cannot retry. - // - ex.ice_throw(); + observer.failed(ex.ice_name()); + throw; } return 0; // Keep the compiler happy. } int IceProxy::Ice::Object::__handleExceptionWrapper(const ::IceInternal::Handle< ::IceDelegate::Ice::Object>& delegate, - const LocalExceptionWrapper& ex) + const LocalExceptionWrapper& ex, + InvocationObserver& observer) { { IceUtil::Mutex::Lock sync(*this); @@ -1271,8 +1283,13 @@ IceProxy::Ice::Object::__handleExceptionWrapper(const ::IceInternal::Handle< ::I if(!ex.retry()) { + observer.failed(ex.get()->ice_name()); ex.get()->ice_throw(); } + else + { + observer.retry(); + } return 0; } @@ -1281,11 +1298,12 @@ int IceProxy::Ice::Object::__handleExceptionWrapperRelaxed(const ::IceInternal::Handle< ::IceDelegate::Ice::Object>& del, const LocalExceptionWrapper& ex, bool sleep, - int& cnt) + int& cnt, + InvocationObserver& observer) { if(!ex.retry()) { - return __handleException(del, *ex.get(), sleep, cnt); + return __handleException(del, *ex.get(), sleep, cnt, observer); } else { @@ -1296,7 +1314,7 @@ IceProxy::Ice::Object::__handleExceptionWrapperRelaxed(const ::IceInternal::Hand _delegate = 0; } } - + observer.retry(); return 0; } } @@ -1456,9 +1474,9 @@ IceDelegateM::Ice::Object::~Object() } bool -IceDelegateM::Ice::Object::ice_isA(const string& __id, const Context* context) +IceDelegateM::Ice::Object::ice_isA(const string& __id, const Context* context, InvocationObserver& observer) { - Outgoing __og(__handler.get(), ice_isA_name, ::Ice::Nonmutating, context); + Outgoing __og(__handler.get(), ice_isA_name, ::Ice::Nonmutating, context, observer); try { BasicStream* __os = __og.startWriteParams(DefaultFormat); @@ -1496,9 +1514,9 @@ IceDelegateM::Ice::Object::ice_isA(const string& __id, const Context* context) } void -IceDelegateM::Ice::Object::ice_ping(const Context* context) +IceDelegateM::Ice::Object::ice_ping(const Context* context, InvocationObserver& observer) { - Outgoing __og(__handler.get(), ice_ping_name, ::Ice::Nonmutating, context); + Outgoing __og(__handler.get(), ice_ping_name, ::Ice::Nonmutating, context, observer); __og.writeEmptyParams(); bool __ok = __og.invoke(); if(__og.hasResponse()) @@ -1526,9 +1544,9 @@ IceDelegateM::Ice::Object::ice_ping(const Context* context) } vector<string> -IceDelegateM::Ice::Object::ice_ids(const Context* context) +IceDelegateM::Ice::Object::ice_ids(const Context* context, InvocationObserver& observer) { - Outgoing __og(__handler.get(), ice_ids_name, ::Ice::Nonmutating, context); + Outgoing __og(__handler.get(), ice_ids_name, ::Ice::Nonmutating, context, observer); __og.writeEmptyParams(); vector<string> __ret; bool __ok = __og.invoke(); @@ -1557,9 +1575,9 @@ IceDelegateM::Ice::Object::ice_ids(const Context* context) } string -IceDelegateM::Ice::Object::ice_id(const Context* context) +IceDelegateM::Ice::Object::ice_id(const Context* context, InvocationObserver& observer) { - Outgoing __og(__handler.get(), ice_id_name, ::Ice::Nonmutating, context); + Outgoing __og(__handler.get(), ice_id_name, ::Ice::Nonmutating, context, observer); __og.writeEmptyParams(); string __ret; bool __ok = __og.invoke(); @@ -1592,9 +1610,10 @@ IceDelegateM::Ice::Object::ice_invoke(const string& operation, OperationMode mode, const pair<const Byte*, const Byte*>& inEncaps, vector<Byte>& outEncaps, - const Context* context) + const Context* context, + InvocationObserver& observer) { - Outgoing __og(__handler.get(), operation, mode, context); + Outgoing __og(__handler.get(), operation, mode, context, observer); try { __og.writeParamEncaps(inEncaps.first, static_cast<Int>(inEncaps.second - inEncaps.first)); @@ -1622,7 +1641,7 @@ IceDelegateM::Ice::Object::ice_invoke(const string& operation, } void -IceDelegateM::Ice::Object::ice_flushBatchRequests() +IceDelegateM::Ice::Object::ice_flushBatchRequests(InvocationObserver& observer) { BatchOutgoing __og(__handler.get()); __og.invoke(); @@ -1680,7 +1699,7 @@ IceDelegateM::Ice::Object::setup(const ReferencePtr& ref, const ::Ice::ObjectPrx } bool -IceDelegateD::Ice::Object::ice_isA(const string& __id, const Context* context) +IceDelegateD::Ice::Object::ice_isA(const string& __id, const Context* context, InvocationObserver& observer) { class DirectI : public Direct { @@ -1746,7 +1765,7 @@ IceDelegateD::Ice::Object::ice_isA(const string& __id, const Context* context) } void -IceDelegateD::Ice::Object::ice_ping(const ::Ice::Context* context) +IceDelegateD::Ice::Object::ice_ping(const ::Ice::Context* context, InvocationObserver&) { class DirectI : public Direct { @@ -1803,7 +1822,7 @@ IceDelegateD::Ice::Object::ice_ping(const ::Ice::Context* context) } vector<string> -IceDelegateD::Ice::Object::ice_ids(const ::Ice::Context* context) +IceDelegateD::Ice::Object::ice_ids(const ::Ice::Context* context, InvocationObserver&) { class DirectI : public Direct { @@ -1867,7 +1886,7 @@ IceDelegateD::Ice::Object::ice_ids(const ::Ice::Context* context) } string -IceDelegateD::Ice::Object::ice_id(const ::Ice::Context* context) +IceDelegateD::Ice::Object::ice_id(const ::Ice::Context* context, InvocationObserver&) { class DirectI : public Direct { @@ -1935,14 +1954,15 @@ IceDelegateD::Ice::Object::ice_invoke(const string&, OperationMode, const pair<const Byte*, const Byte*>& inEncaps, vector<Byte>&, - const Context*) + const Context*, + InvocationObserver&) { throw CollocationOptimizationException(__FILE__, __LINE__); return false; } void -IceDelegateD::Ice::Object::ice_flushBatchRequests() +IceDelegateD::Ice::Object::ice_flushBatchRequests(InvocationObserver& observer) { throw CollocationOptimizationException(__FILE__, __LINE__); } diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp index e7ecd451617..8b6c5e24ac3 100755 --- a/cpp/src/Slice/Parser.cpp +++ b/cpp/src/Slice/Parser.cpp @@ -5823,10 +5823,10 @@ Slice::Unit::usesProxies() const } } - if(_builtins.find(Builtin::KindObjectProxy) != _builtins.end()) - { - return true; - } + // if(_builtins.find(Builtin::KindObjectProxy) != _builtins.end()) + // { + // return true; + // } return false; } diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index e07bc4bf44a..d7b20bc1235 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -2173,6 +2173,8 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p) C << sp << nl << retS << nl << "IceProxy" << scoped << spar << paramsDecl << "const ::Ice::Context* __ctx" << epar; C << sb; + C << nl << "::IceInternal::InvocationObserver __observer(this, " << p->flattenedScope() << p->name() + << "_name, __ctx);"; C << nl << "int __cnt = 0;"; C << nl << "while(true)"; C << sb; @@ -2192,7 +2194,7 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p) { C << "return "; } - C << "__del->" << fixKwd(name) << spar << args << "__ctx" << epar << ';'; + C << "__del->" << fixKwd(name) << spar << args << "__ctx" << "__observer" << epar << ';'; if(!ret) { C << nl << "return;"; @@ -2202,16 +2204,16 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p) C << sb; if(p->mode() == Operation::Idempotent || p->mode() == Operation::Nonmutating) { - C << nl << "__handleExceptionWrapperRelaxed(__delBase, __ex, true, __cnt);"; + C << nl << "__handleExceptionWrapperRelaxed(__delBase, __ex, true, __cnt, __observer);"; } else { - C << nl << "__handleExceptionWrapper(__delBase, __ex);"; + C << nl << "__handleExceptionWrapper(__delBase, __ex, __observer);"; } C << eb; C << nl << "catch(const ::Ice::LocalException& __ex)"; C << sb; - C << nl << "__handleException(__delBase, __ex, true, __cnt);"; + C << nl << "__handleException(__delBase, __ex, true, __cnt, __observer);"; C << eb; C << eb; C << eb; @@ -2614,6 +2616,7 @@ Slice::Gen::DelegateVisitor::visitOperation(const OperationPtr& p) } params.push_back("const ::Ice::Context*"); + params.push_back("::IceInternal::InvocationObserver&"); H << sp << nl << "virtual " << retS << ' ' << name << spar << params << epar << " = 0;"; } @@ -2755,7 +2758,9 @@ Slice::Gen::DelegateMVisitor::visitOperation(const OperationPtr& p) } params.push_back("const ::Ice::Context*"); + params.push_back("::IceInternal::InvocationObserver&"); paramsDecl.push_back("const ::Ice::Context* __context"); + paramsDecl.push_back("::IceInternal::InvocationObserver& __observer"); string flatName = p->flattenedScope() + p->name() + "_name"; @@ -2763,7 +2768,7 @@ Slice::Gen::DelegateMVisitor::visitOperation(const OperationPtr& p) C << sp << nl << retS << nl << "IceDelegateM" << scoped << spar << paramsDecl << epar; C << sb; C << nl << "::IceInternal::Outgoing __og(__handler.get(), " << flatName << ", " - << operationModeToString(p->sendMode()) << ", __context);"; + << operationModeToString(p->sendMode()) << ", __context, __observer);"; if(inParams.empty()) { C << nl << "__og.writeEmptyParams();"; @@ -3017,6 +3022,9 @@ Slice::Gen::DelegateDVisitor::visitOperation(const OperationPtr& p) } params.push_back("const ::Ice::Context*"); + params.push_back("::IceInternal::InvocationObserver&"); + paramsDecl.push_back("const ::Ice::Context* __context"); + paramsDecl.push_back("::IceInternal::InvocationObserver&"); args.push_back("__current"); argMembers.push_back("_current"); @@ -3041,8 +3049,7 @@ Slice::Gen::DelegateDVisitor::visitOperation(const OperationPtr& p) } else { - C << sp << nl << retS << nl << "IceDelegateD" << scoped << spar << paramsDecl - << "const ::Ice::Context* __context" << epar; + C << sp << nl << retS << nl << "IceDelegateD" << scoped << spar << paramsDecl << epar; C << sb; C << nl << "class _DirectI : public ::IceInternal::Direct"; C << sb; |