More fixes

9 files changed, 314 insertions, 88 deletions

diff --git a/cpp/src/Ice/.depend b/cpp/src/Ice/.depend
index 9af5b744a0c..acb20502580 100644
--- a/cpp/src/Ice/.depend
+++ b/cpp/src/Ice/.depend
@@ -35,7 +35,7 @@ ImplicitContext$(OBJEXT): ImplicitContext.cpp $(includedir)/Ice/ImplicitContext.
 IncomingAsync$(OBJEXT): IncomingAsync.cpp $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/IncomingAsyncF.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/Incoming.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/LocalObjectF.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/Exception.h $(includedir)/Ice/Format.h $(includedir)/Ice/StreamTraits.h $(includedir)/IceUtil/ScopedArray.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/Optional.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/Version.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/Current.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/ObserverHelper.h $(includedir)/Ice/Observer.h $(includedir)/Ice/EndpointF.h $(includedir)/Ice/ServantLocator.h ../Ice/ConnectionI.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/IceUtil/StopWatch.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/Connection.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/Stream.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/EndpointTypes.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/Ice/OutgoingAsyncF.h $(includedir)/Ice/ConnectionFactoryF.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h $(includedir)/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/ThreadPoolF.h ../Ice/Network.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Dispatcher.h $(includedir)/Ice/LocalException.h ../Ice/Instance.h $(includedir)/IceUtil/RecMutex.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/ObserverF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.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/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/Direct.h $(includedir)/Ice/Properties.h ../Ice/ReplyStatus.h $(includedir)/IceUtil/MutexPtrLock.h
 Incoming$(OBJEXT): Incoming.cpp $(includedir)/Ice/Incoming.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 $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/LocalObjectF.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/Exception.h $(includedir)/Ice/Format.h $(includedir)/Ice/StreamTraits.h $(includedir)/IceUtil/ScopedArray.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/Optional.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/BasicStream.h $(includedir)/Ice/ObjectFactoryF.h $(includedir)/Ice/Buffer.h $(includedir)/Ice/Protocol.h $(includedir)/Ice/Version.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)/Ice/ObserverHelper.h $(includedir)/Ice/Observer.h $(includedir)/Ice/EndpointF.h $(includedir)/Ice/IncomingAsync.h ../Ice/IncomingRequest.h $(includedir)/Ice/ObjectAdapter.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/Endpoint.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/Stream.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.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/ServantLocator.h ../Ice/ServantManager.h ../Ice/ConnectionI.h $(includedir)/Ice/Connection.h $(includedir)/Ice/ConnectionFactoryF.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h $(includedir)/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/ThreadPoolF.h ../Ice/Network.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Dispatcher.h $(includedir)/Ice/LocalException.h ../Ice/Instance.h $(includedir)/IceUtil/RecMutex.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/ObserverF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.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/StringConverter.h $(includedir)/Ice/Plugin.h $(includedir)/IceUtil/Unicode.h ../Ice/ImplicitContextI.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/Process.h $(includedir)/Ice/Outgoing.h $(includedir)/Ice/Direct.h $(includedir)/Ice/Properties.h $(includedir)/Ice/LoggerUtil.h ../Ice/ReplyStatus.h $(includedir)/IceUtil/StringUtil.h
 Initialize$(OBJEXT): Initialize.cpp $(includedir)/IceUtil/DisableWarnings.h $(includedir)/IceUtil/ArgVector.h $(includedir)/IceUtil/Config.h ../Ice/GC.h $(includedir)/Ice/Config.h $(includedir)/IceUtil/Thread.h $(includedir)/IceUtil/Shared.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/ObserverHelper.h $(includedir)/Ice/Observer.h $(includedir)/Ice/ProxyF.h $(includedir)/Ice/ProxyHandle.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/Handle.h $(includedir)/Ice/Exception.h $(includedir)/Ice/Format.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/LocalObjectF.h $(includedir)/Ice/StreamTraits.h $(includedir)/IceUtil/ScopedArray.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/Optional.h $(includedir)/Ice/EndpointF.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/Current.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/Version.h ../Ice/CommunicatorI.h $(includedir)/IceUtil/RecMutex.h $(includedir)/Ice/DynamicLibraryF.h $(includedir)/Ice/Initialize.h $(includedir)/Ice/CommunicatorF.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/LoggerF.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/ObserverF.h $(includedir)/Ice/Dispatcher.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/Plugin.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/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/EndpointTypes.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/OutgoingAsync.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/StopWatch.h $(includedir)/Ice/OutgoingAsyncF.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)/IceUtil/Unicode.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/Outgoing.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/Direct.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/PluginF.h $(includedir)/Ice/ImplicitContextF.h $(includedir)/Ice/Properties.h ../Ice/PropertiesI.h $(includedir)/Ice/LocalException.h ../Ice/StreamI.h ../Ice/LoggerI.h $(includedir)/Ice/Logger.h $(includedir)/IceUtil/FileUtil.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 ../Ice/ImplicitContextI.h $(includedir)/Ice/ImplicitContext.h $(includedir)/Ice/FacetMap.h $(includedir)/Ice/Process.h $(includedir)/IceUtil/MutexPtrLock.h
-Instance$(OBJEXT): Instance.cpp $(includedir)/IceUtil/DisableWarnings.h ../Ice/Instance.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/IceUtil/MutexProtocol.h $(includedir)/IceUtil/RecMutex.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/CommunicatorF.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/LocalObjectF.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 $(includedir)/Ice/ObserverF.h ../Ice/TraceLevelsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h $(includedir)/Ice/ProxyFactoryF.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/StreamF.h $(includedir)/Ice/Dispatcher.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/Plugin.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/Current.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/Version.h $(includedir)/Ice/Proxy.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/StopWatch.h $(includedir)/Ice/OutgoingAsyncF.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/ObserverHelper.h $(includedir)/Ice/Observer.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 ../Ice/DefaultsAndOverrides.h $(includedir)/Ice/Endpoint.h ../Ice/RouterInfo.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/Router.h ../Ice/LocatorInfo.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/Locator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/FactoryTableInit.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/ProcessF.h ../Ice/ReferenceFactory.h ../Ice/Reference.h ../Ice/SharedContext.h $(includedir)/Ice/Properties.h ../Ice/ProxyFactory.h ../Ice/ThreadPool.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/Network.h ../Ice/Selector.h $(includedir)/IceUtil/StringUtil.h ../Ice/ConnectionFactory.h ../Ice/ConnectionI.h $(includedir)/Ice/Connection.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/EndpointI.h ../Ice/ConnectionMonitor.h ../Ice/ObjectFactoryManager.h ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h $(includedir)/Ice/ObjectAdapter.h ../Ice/PropertiesI.h ../Ice/LoggerI.h $(includedir)/Ice/Logger.h $(includedir)/IceUtil/FileUtil.h ../Ice/EndpointFactoryManager.h $(includedir)/Ice/EndpointFactoryF.h ../Ice/RetryQueue.h $(includedir)/Ice/DynamicLibrary.h ../Ice/PluginManagerI.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/ImplicitContextF.h ../Ice/GC.h ../Ice/MetricsAdminI.h $(includedir)/Ice/Metrics.h $(includedir)/IceUtil/UUID.h $(includedir)/IceUtil/MutexPtrLock.h ../Ice/SysLoggerI.h ../Ice/UdpEndpointI.h $(includedir)/Ice/EndpointFactory.h ../Ice/TcpEndpointI.h
+Instance$(OBJEXT): Instance.cpp $(includedir)/IceUtil/DisableWarnings.h ../Ice/Instance.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/IceUtil/MutexProtocol.h $(includedir)/IceUtil/RecMutex.h $(includedir)/IceUtil/Timer.h $(includedir)/IceUtil/Thread.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h $(includedir)/Ice/InstanceF.h $(includedir)/Ice/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/CommunicatorF.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/LocalObjectF.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 $(includedir)/Ice/ObserverF.h ../Ice/TraceLevelsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h $(includedir)/Ice/ProxyFactoryF.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/StreamF.h $(includedir)/Ice/Dispatcher.h $(includedir)/Ice/ConnectionF.h $(includedir)/Ice/StringConverter.h $(includedir)/Ice/Plugin.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/Current.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/Version.h $(includedir)/Ice/Proxy.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/StopWatch.h $(includedir)/Ice/OutgoingAsyncF.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/ObserverHelper.h $(includedir)/Ice/Observer.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 ../Ice/DefaultsAndOverrides.h $(includedir)/Ice/Endpoint.h ../Ice/RouterInfo.h $(includedir)/Ice/RouterF.h $(includedir)/Ice/Router.h ../Ice/LocatorInfo.h $(includedir)/Ice/LocatorF.h $(includedir)/Ice/Locator.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/FactoryTableInit.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/ProcessF.h ../Ice/ReferenceFactory.h ../Ice/Reference.h ../Ice/SharedContext.h $(includedir)/Ice/Properties.h ../Ice/ProxyFactory.h ../Ice/ThreadPool.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/Network.h ../Ice/Selector.h $(includedir)/IceUtil/StringUtil.h ../Ice/ConnectionFactory.h ../Ice/ConnectionI.h $(includedir)/Ice/Connection.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/EndpointI.h ../Ice/ConnectionMonitor.h ../Ice/ObjectFactoryManager.h ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h $(includedir)/Ice/ObjectAdapter.h ../Ice/PropertiesI.h ../Ice/LoggerI.h $(includedir)/Ice/Logger.h $(includedir)/IceUtil/FileUtil.h ../Ice/EndpointFactoryManager.h $(includedir)/Ice/EndpointFactoryF.h ../Ice/RetryQueue.h $(includedir)/Ice/DynamicLibrary.h ../Ice/PluginManagerI.h $(includedir)/Ice/LoggerUtil.h $(includedir)/Ice/Communicator.h $(includedir)/Ice/ImplicitContextF.h ../Ice/GC.h ../Ice/MetricsAdminI.h $(includedir)/Ice/Metrics.h ../Ice/ObserverI.h ../Ice/MetricsObserverI.h ../Ice/MetricsFunctional.h $(includedir)/IceUtil/UUID.h $(includedir)/IceUtil/MutexPtrLock.h ../Ice/SysLoggerI.h ../Ice/UdpEndpointI.h $(includedir)/Ice/EndpointFactory.h ../Ice/TcpEndpointI.h
 LocalException$(OBJEXT): LocalException.cpp $(includedir)/Ice/LocalException.h $(includedir)/Ice/ProxyF.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/Config.h $(includedir)/Ice/ProxyHandle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/ObjectF.h $(includedir)/Ice/Handle.h $(includedir)/Ice/Exception.h $(includedir)/Ice/Format.h $(includedir)/Ice/LocalObject.h $(includedir)/Ice/LocalObjectF.h $(includedir)/Ice/StreamTraits.h $(includedir)/IceUtil/ScopedArray.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/Optional.h $(includedir)/Ice/Identity.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/Version.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/Stream.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/CommunicatorF.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/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/ObserverHelper.h $(includedir)/Ice/Observer.h $(includedir)/IceUtil/DisableWarnings.h
 LocalObject$(OBJEXT): LocalObject.cpp $(includedir)/Ice/LocalObject.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/Ice/LocalObjectF.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/IceUtil/Exception.h $(includedir)/Ice/Config.h
 LocatorInfo$(OBJEXT): LocatorInfo.cpp ../Ice/LocatorInfo.h $(includedir)/IceUtil/Shared.h $(includedir)/IceUtil/Config.h $(includedir)/IceUtil/Mutex.h $(includedir)/IceUtil/Lock.h $(includedir)/IceUtil/ThreadException.h $(includedir)/IceUtil/Exception.h $(includedir)/IceUtil/Time.h $(includedir)/IceUtil/MutexProtocol.h $(includedir)/IceUtil/Monitor.h $(includedir)/IceUtil/Cond.h ../Ice/LocatorInfoF.h $(includedir)/Ice/Handle.h $(includedir)/IceUtil/Handle.h $(includedir)/Ice/Config.h $(includedir)/Ice/LocatorF.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/LocalObjectF.h $(includedir)/Ice/StreamTraits.h $(includedir)/IceUtil/ScopedArray.h $(includedir)/IceUtil/Iterator.h $(includedir)/IceUtil/Optional.h $(includedir)/Ice/UndefSysMacros.h $(includedir)/Ice/ReferenceF.h $(includedir)/Ice/Identity.h $(includedir)/Ice/EndpointIF.h $(includedir)/Ice/PropertiesF.h $(includedir)/Ice/Locator.h $(includedir)/Ice/Proxy.h $(includedir)/Ice/ProxyFactoryF.h $(includedir)/Ice/ConnectionIF.h $(includedir)/Ice/RequestHandlerF.h $(includedir)/Ice/EndpointF.h $(includedir)/Ice/EndpointTypes.h $(includedir)/Ice/ObjectAdapterF.h $(includedir)/Ice/OutgoingAsync.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/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/ObserverHelper.h $(includedir)/Ice/Observer.h $(includedir)/Ice/StreamF.h $(includedir)/Ice/Object.h $(includedir)/Ice/GCShared.h $(includedir)/Ice/GCCountMap.h $(includedir)/Ice/IncomingAsyncF.h $(includedir)/Ice/Outgoing.h $(includedir)/Ice/Incoming.h $(includedir)/Ice/ServantLocatorF.h $(includedir)/Ice/ServantManagerF.h $(includedir)/Ice/IncomingAsync.h $(includedir)/Ice/Direct.h $(includedir)/Ice/FactoryTableInit.h $(includedir)/Ice/FactoryTable.h $(includedir)/Ice/ProcessF.h $(includedir)/Ice/LocalException.h $(includedir)/Ice/BuiltinSequences.h $(includedir)/Ice/Stream.h ../Ice/Instance.h $(includedir)/IceUtil/RecMutex.h $(includedir)/Ice/StatsF.h $(includedir)/Ice/ObserverF.h ../Ice/TraceLevelsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.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/LoggerF.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 ../Ice/TraceLevels.h $(includedir)/Ice/LoggerUtil.h ../Ice/EndpointI.h $(includedir)/Ice/Endpoint.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/Network.h ../Ice/Reference.h $(includedir)/Ice/RouterF.h ../Ice/SharedContext.h $(includedir)/Ice/Properties.h $(includedir)/Ice/Functional.h $(includedir)/IceUtil/Functional.h
diff --git a/cpp/src/Ice/.depend.mak b/cpp/src/Ice/.depend.mak
index ee1135ccec1..eea5cf25d97 100644
--- a/cpp/src/Ice/.depend.mak
+++ b/cpp/src/Ice/.depend.mak
@@ -35,7 +35,7 @@ ImplicitContext$(OBJEXT): ImplicitContext.cpp "$(includedir)/Ice/ImplicitContext
 IncomingAsync$(OBJEXT): IncomingAsync.cpp "$(includedir)/Ice/IncomingAsync.h" "$(includedir)/Ice/IncomingAsyncF.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/Incoming.h" "$(includedir)/Ice/InstanceF.h" "$(includedir)/Ice/ConnectionIF.h" "$(includedir)/Ice/LocalObject.h" "$(includedir)/Ice/LocalObjectF.h" "$(includedir)/Ice/ServantLocatorF.h" "$(includedir)/Ice/ProxyF.h" "$(includedir)/Ice/ProxyHandle.h" "$(includedir)/Ice/ObjectF.h" "$(includedir)/Ice/Exception.h" "$(includedir)/Ice/Format.h" "$(includedir)/Ice/StreamTraits.h" "$(includedir)/IceUtil/ScopedArray.h" "$(includedir)/IceUtil/Iterator.h" "$(includedir)/IceUtil/Optional.h" "$(includedir)/Ice/UndefSysMacros.h" "$(includedir)/Ice/ServantManagerF.h" "$(includedir)/Ice/BasicStream.h" "$(includedir)/Ice/ObjectFactoryF.h" "$(includedir)/Ice/Buffer.h" "$(includedir)/Ice/Protocol.h" "$(includedir)/Ice/Version.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/Current.h" "$(includedir)/Ice/ObjectAdapterF.h" "$(includedir)/Ice/ConnectionF.h" "$(includedir)/Ice/Identity.h" "$(includedir)/Ice/StreamF.h" "$(includedir)/Ice/ObserverHelper.h" "$(includedir)/Ice/Observer.h" "$(includedir)/Ice/EndpointF.h" "$(includedir)/Ice/ServantLocator.h" ../Ice/ConnectionI.h "$(includedir)/IceUtil/Monitor.h" "$(includedir)/IceUtil/Cond.h" "$(includedir)/IceUtil/StopWatch.h" "$(includedir)/IceUtil/Timer.h" "$(includedir)/IceUtil/Thread.h" "$(includedir)/Ice/CommunicatorF.h" "$(includedir)/Ice/Connection.h" "$(includedir)/Ice/Endpoint.h" "$(includedir)/Ice/BuiltinSequences.h" "$(includedir)/Ice/Stream.h" "$(includedir)/Ice/Proxy.h" "$(includedir)/Ice/ProxyFactoryF.h" "$(includedir)/Ice/RequestHandlerF.h" "$(includedir)/Ice/EndpointIF.h" "$(includedir)/Ice/EndpointTypes.h" "$(includedir)/Ice/ReferenceF.h" "$(includedir)/Ice/OutgoingAsync.h" "$(includedir)/Ice/OutgoingAsyncF.h" "$(includedir)/Ice/ConnectionFactoryF.h" ../Ice/TransceiverF.h ../Ice/ConnectorF.h "$(includedir)/Ice/LoggerF.h" ../Ice/TraceLevelsF.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/ThreadPoolF.h ../Ice/Network.h "$(includedir)/Ice/PropertiesF.h" "$(includedir)/Ice/Dispatcher.h" "$(includedir)/Ice/LocalException.h" ../Ice/Instance.h "$(includedir)/IceUtil/RecMutex.h" "$(includedir)/Ice/StatsF.h" "$(includedir)/Ice/ObserverF.h" ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.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/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/Direct.h" "$(includedir)/Ice/Properties.h" ../Ice/ReplyStatus.h "$(includedir)/IceUtil/MutexPtrLock.h"
 Incoming$(OBJEXT): Incoming.cpp "$(includedir)/Ice/Incoming.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" "$(includedir)/Ice/ConnectionIF.h" "$(includedir)/Ice/LocalObject.h" "$(includedir)/Ice/LocalObjectF.h" "$(includedir)/Ice/ServantLocatorF.h" "$(includedir)/Ice/ProxyF.h" "$(includedir)/Ice/ProxyHandle.h" "$(includedir)/Ice/ObjectF.h" "$(includedir)/Ice/Exception.h" "$(includedir)/Ice/Format.h" "$(includedir)/Ice/StreamTraits.h" "$(includedir)/IceUtil/ScopedArray.h" "$(includedir)/IceUtil/Iterator.h" "$(includedir)/IceUtil/Optional.h" "$(includedir)/Ice/UndefSysMacros.h" "$(includedir)/Ice/ServantManagerF.h" "$(includedir)/Ice/BasicStream.h" "$(includedir)/Ice/ObjectFactoryF.h" "$(includedir)/Ice/Buffer.h" "$(includedir)/Ice/Protocol.h" "$(includedir)/Ice/Version.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)/Ice/ObserverHelper.h" "$(includedir)/Ice/Observer.h" "$(includedir)/Ice/EndpointF.h" "$(includedir)/Ice/IncomingAsync.h" ../Ice/IncomingRequest.h "$(includedir)/Ice/ObjectAdapter.h" "$(includedir)/Ice/CommunicatorF.h" "$(includedir)/Ice/LocatorF.h" "$(includedir)/Ice/FacetMap.h" "$(includedir)/Ice/Endpoint.h" "$(includedir)/Ice/BuiltinSequences.h" "$(includedir)/Ice/Stream.h" "$(includedir)/Ice/Proxy.h" "$(includedir)/Ice/ProxyFactoryF.h" "$(includedir)/Ice/RequestHandlerF.h" "$(includedir)/Ice/EndpointIF.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/ServantLocator.h" ../Ice/ServantManager.h ../Ice/ConnectionI.h "$(includedir)/Ice/Connection.h" "$(includedir)/Ice/ConnectionFactoryF.h" ../Ice/TransceiverF.h ../Ice/ConnectorF.h "$(includedir)/Ice/LoggerF.h" ../Ice/TraceLevelsF.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/ThreadPoolF.h ../Ice/Network.h "$(includedir)/Ice/PropertiesF.h" "$(includedir)/Ice/Dispatcher.h" "$(includedir)/Ice/LocalException.h" ../Ice/Instance.h "$(includedir)/IceUtil/RecMutex.h" "$(includedir)/Ice/StatsF.h" "$(includedir)/Ice/ObserverF.h" ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.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/StringConverter.h" "$(includedir)/Ice/Plugin.h" "$(includedir)/IceUtil/Unicode.h" ../Ice/ImplicitContextI.h "$(includedir)/Ice/ImplicitContext.h" "$(includedir)/Ice/Process.h" "$(includedir)/Ice/Outgoing.h" "$(includedir)/Ice/Direct.h" "$(includedir)/Ice/Properties.h" "$(includedir)/Ice/LoggerUtil.h" ../Ice/ReplyStatus.h "$(includedir)/IceUtil/StringUtil.h"
 Initialize$(OBJEXT): Initialize.cpp "$(includedir)/IceUtil/DisableWarnings.h" "$(includedir)/IceUtil/ArgVector.h" "$(includedir)/IceUtil/Config.h" ../Ice/GC.h "$(includedir)/Ice/Config.h" "$(includedir)/IceUtil/Thread.h" "$(includedir)/IceUtil/Shared.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/ObserverHelper.h" "$(includedir)/Ice/Observer.h" "$(includedir)/Ice/ProxyF.h" "$(includedir)/Ice/ProxyHandle.h" "$(includedir)/Ice/ObjectF.h" "$(includedir)/Ice/Handle.h" "$(includedir)/Ice/Exception.h" "$(includedir)/Ice/Format.h" "$(includedir)/Ice/LocalObject.h" "$(includedir)/Ice/LocalObjectF.h" "$(includedir)/Ice/StreamTraits.h" "$(includedir)/IceUtil/ScopedArray.h" "$(includedir)/IceUtil/Iterator.h" "$(includedir)/IceUtil/Optional.h" "$(includedir)/Ice/EndpointF.h" "$(includedir)/Ice/UndefSysMacros.h" "$(includedir)/Ice/ConnectionF.h" "$(includedir)/Ice/Current.h" "$(includedir)/Ice/ObjectAdapterF.h" "$(includedir)/Ice/Identity.h" "$(includedir)/Ice/Version.h" ../Ice/CommunicatorI.h "$(includedir)/IceUtil/RecMutex.h" "$(includedir)/Ice/DynamicLibraryF.h" "$(includedir)/Ice/Initialize.h" "$(includedir)/Ice/CommunicatorF.h" "$(includedir)/Ice/PropertiesF.h" "$(includedir)/Ice/InstanceF.h" "$(includedir)/Ice/LoggerF.h" "$(includedir)/Ice/StreamF.h" "$(includedir)/Ice/StatsF.h" "$(includedir)/Ice/ObserverF.h" "$(includedir)/Ice/Dispatcher.h" "$(includedir)/Ice/StringConverter.h" "$(includedir)/Ice/Plugin.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/Proxy.h" "$(includedir)/Ice/ProxyFactoryF.h" "$(includedir)/Ice/ConnectionIF.h" "$(includedir)/Ice/RequestHandlerF.h" "$(includedir)/Ice/EndpointIF.h" "$(includedir)/Ice/EndpointTypes.h" "$(includedir)/Ice/ReferenceF.h" "$(includedir)/Ice/OutgoingAsync.h" "$(includedir)/IceUtil/Timer.h" "$(includedir)/IceUtil/StopWatch.h" "$(includedir)/Ice/OutgoingAsyncF.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)/IceUtil/Unicode.h" "$(includedir)/Ice/Communicator.h" "$(includedir)/Ice/Outgoing.h" "$(includedir)/Ice/Incoming.h" "$(includedir)/Ice/ServantLocatorF.h" "$(includedir)/Ice/ServantManagerF.h" "$(includedir)/Ice/Direct.h" "$(includedir)/Ice/RouterF.h" "$(includedir)/Ice/LocatorF.h" "$(includedir)/Ice/PluginF.h" "$(includedir)/Ice/ImplicitContextF.h" "$(includedir)/Ice/Properties.h" ../Ice/PropertiesI.h "$(includedir)/Ice/LocalException.h" ../Ice/StreamI.h ../Ice/LoggerI.h "$(includedir)/Ice/Logger.h" "$(includedir)/IceUtil/FileUtil.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 ../Ice/ImplicitContextI.h "$(includedir)/Ice/ImplicitContext.h" "$(includedir)/Ice/FacetMap.h" "$(includedir)/Ice/Process.h" "$(includedir)/IceUtil/MutexPtrLock.h"
-Instance$(OBJEXT): Instance.cpp "$(includedir)/IceUtil/DisableWarnings.h" ../Ice/Instance.h "$(includedir)/IceUtil/Config.h" "$(includedir)/IceUtil/Shared.h" "$(includedir)/IceUtil/Mutex.h" "$(includedir)/IceUtil/Lock.h" "$(includedir)/IceUtil/ThreadException.h" "$(includedir)/IceUtil/Exception.h" "$(includedir)/IceUtil/Time.h" "$(includedir)/IceUtil/MutexProtocol.h" "$(includedir)/IceUtil/RecMutex.h" "$(includedir)/IceUtil/Timer.h" "$(includedir)/IceUtil/Thread.h" "$(includedir)/IceUtil/Handle.h" "$(includedir)/IceUtil/Monitor.h" "$(includedir)/IceUtil/Cond.h" "$(includedir)/Ice/InstanceF.h" "$(includedir)/Ice/Handle.h" "$(includedir)/Ice/Config.h" "$(includedir)/Ice/CommunicatorF.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/LocalObjectF.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" "$(includedir)/Ice/ObserverF.h" ../Ice/TraceLevelsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h "$(includedir)/Ice/ProxyFactoryF.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/StreamF.h" "$(includedir)/Ice/Dispatcher.h" "$(includedir)/Ice/ConnectionF.h" "$(includedir)/Ice/StringConverter.h" "$(includedir)/Ice/Plugin.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/Current.h" "$(includedir)/Ice/ObjectAdapterF.h" "$(includedir)/Ice/Identity.h" "$(includedir)/Ice/Version.h" "$(includedir)/Ice/Proxy.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/StopWatch.h" "$(includedir)/Ice/OutgoingAsyncF.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/ObserverHelper.h" "$(includedir)/Ice/Observer.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 ../Ice/DefaultsAndOverrides.h "$(includedir)/Ice/Endpoint.h" ../Ice/RouterInfo.h "$(includedir)/Ice/RouterF.h" "$(includedir)/Ice/Router.h" ../Ice/LocatorInfo.h "$(includedir)/Ice/LocatorF.h" "$(includedir)/Ice/Locator.h" "$(includedir)/Ice/IncomingAsync.h" "$(includedir)/Ice/FactoryTableInit.h" "$(includedir)/Ice/FactoryTable.h" "$(includedir)/Ice/ProcessF.h" ../Ice/ReferenceFactory.h ../Ice/Reference.h ../Ice/SharedContext.h "$(includedir)/Ice/Properties.h" ../Ice/ProxyFactory.h ../Ice/ThreadPool.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/Network.h ../Ice/Selector.h "$(includedir)/IceUtil/StringUtil.h" ../Ice/ConnectionFactory.h ../Ice/ConnectionI.h "$(includedir)/Ice/Connection.h" ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/EndpointI.h ../Ice/ConnectionMonitor.h ../Ice/ObjectFactoryManager.h ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h "$(includedir)/Ice/ObjectAdapter.h" ../Ice/PropertiesI.h ../Ice/LoggerI.h "$(includedir)/Ice/Logger.h" "$(includedir)/IceUtil/FileUtil.h" ../Ice/EndpointFactoryManager.h "$(includedir)/Ice/EndpointFactoryF.h" ../Ice/RetryQueue.h "$(includedir)/Ice/DynamicLibrary.h" ../Ice/PluginManagerI.h "$(includedir)/Ice/LoggerUtil.h" "$(includedir)/Ice/Communicator.h" "$(includedir)/Ice/ImplicitContextF.h" ../Ice/GC.h ../Ice/MetricsAdminI.h "$(includedir)/Ice/Metrics.h" "$(includedir)/IceUtil/UUID.h" "$(includedir)/IceUtil/MutexPtrLock.h" ../Ice/SysLoggerI.h ../Ice/UdpEndpointI.h "$(includedir)/Ice/EndpointFactory.h" ../Ice/TcpEndpointI.h
+Instance$(OBJEXT): Instance.cpp "$(includedir)/IceUtil/DisableWarnings.h" ../Ice/Instance.h "$(includedir)/IceUtil/Config.h" "$(includedir)/IceUtil/Shared.h" "$(includedir)/IceUtil/Mutex.h" "$(includedir)/IceUtil/Lock.h" "$(includedir)/IceUtil/ThreadException.h" "$(includedir)/IceUtil/Exception.h" "$(includedir)/IceUtil/Time.h" "$(includedir)/IceUtil/MutexProtocol.h" "$(includedir)/IceUtil/RecMutex.h" "$(includedir)/IceUtil/Timer.h" "$(includedir)/IceUtil/Thread.h" "$(includedir)/IceUtil/Handle.h" "$(includedir)/IceUtil/Monitor.h" "$(includedir)/IceUtil/Cond.h" "$(includedir)/Ice/InstanceF.h" "$(includedir)/Ice/Handle.h" "$(includedir)/Ice/Config.h" "$(includedir)/Ice/CommunicatorF.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/LocalObjectF.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" "$(includedir)/Ice/ObserverF.h" ../Ice/TraceLevelsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h "$(includedir)/Ice/ProxyFactoryF.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/StreamF.h" "$(includedir)/Ice/Dispatcher.h" "$(includedir)/Ice/ConnectionF.h" "$(includedir)/Ice/StringConverter.h" "$(includedir)/Ice/Plugin.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/Current.h" "$(includedir)/Ice/ObjectAdapterF.h" "$(includedir)/Ice/Identity.h" "$(includedir)/Ice/Version.h" "$(includedir)/Ice/Proxy.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/StopWatch.h" "$(includedir)/Ice/OutgoingAsyncF.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/ObserverHelper.h" "$(includedir)/Ice/Observer.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 ../Ice/DefaultsAndOverrides.h "$(includedir)/Ice/Endpoint.h" ../Ice/RouterInfo.h "$(includedir)/Ice/RouterF.h" "$(includedir)/Ice/Router.h" ../Ice/LocatorInfo.h "$(includedir)/Ice/LocatorF.h" "$(includedir)/Ice/Locator.h" "$(includedir)/Ice/IncomingAsync.h" "$(includedir)/Ice/FactoryTableInit.h" "$(includedir)/Ice/FactoryTable.h" "$(includedir)/Ice/ProcessF.h" ../Ice/ReferenceFactory.h ../Ice/Reference.h ../Ice/SharedContext.h "$(includedir)/Ice/Properties.h" ../Ice/ProxyFactory.h ../Ice/ThreadPool.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/Network.h ../Ice/Selector.h "$(includedir)/IceUtil/StringUtil.h" ../Ice/ConnectionFactory.h ../Ice/ConnectionI.h "$(includedir)/Ice/Connection.h" ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/EndpointI.h ../Ice/ConnectionMonitor.h ../Ice/ObjectFactoryManager.h ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h "$(includedir)/Ice/ObjectAdapter.h" ../Ice/PropertiesI.h ../Ice/LoggerI.h "$(includedir)/Ice/Logger.h" "$(includedir)/IceUtil/FileUtil.h" ../Ice/EndpointFactoryManager.h "$(includedir)/Ice/EndpointFactoryF.h" ../Ice/RetryQueue.h "$(includedir)/Ice/DynamicLibrary.h" ../Ice/PluginManagerI.h "$(includedir)/Ice/LoggerUtil.h" "$(includedir)/Ice/Communicator.h" "$(includedir)/Ice/ImplicitContextF.h" ../Ice/GC.h ../Ice/MetricsAdminI.h "$(includedir)/Ice/Metrics.h" ../Ice/ObserverI.h ../Ice/MetricsObserverI.h ../Ice/MetricsFunctional.h "$(includedir)/IceUtil/UUID.h" "$(includedir)/IceUtil/MutexPtrLock.h" ../Ice/SysLoggerI.h ../Ice/UdpEndpointI.h "$(includedir)/Ice/EndpointFactory.h" ../Ice/TcpEndpointI.h
 LocalException$(OBJEXT): LocalException.cpp "$(includedir)/Ice/LocalException.h" "$(includedir)/Ice/ProxyF.h" "$(includedir)/IceUtil/Shared.h" "$(includedir)/IceUtil/Config.h" "$(includedir)/Ice/Config.h" "$(includedir)/Ice/ProxyHandle.h" "$(includedir)/IceUtil/Handle.h" "$(includedir)/IceUtil/Exception.h" "$(includedir)/Ice/ObjectF.h" "$(includedir)/Ice/Handle.h" "$(includedir)/Ice/Exception.h" "$(includedir)/Ice/Format.h" "$(includedir)/Ice/LocalObject.h" "$(includedir)/Ice/LocalObjectF.h" "$(includedir)/Ice/StreamTraits.h" "$(includedir)/IceUtil/ScopedArray.h" "$(includedir)/IceUtil/Iterator.h" "$(includedir)/IceUtil/Optional.h" "$(includedir)/Ice/Identity.h" "$(includedir)/Ice/UndefSysMacros.h" "$(includedir)/Ice/Version.h" "$(includedir)/Ice/BuiltinSequences.h" "$(includedir)/Ice/Stream.h" "$(includedir)/Ice/StreamF.h" "$(includedir)/Ice/CommunicatorF.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/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/ObserverHelper.h" "$(includedir)/Ice/Observer.h" "$(includedir)/IceUtil/DisableWarnings.h"
 LocalObject$(OBJEXT): LocalObject.cpp "$(includedir)/Ice/LocalObject.h" "$(includedir)/IceUtil/Shared.h" "$(includedir)/IceUtil/Config.h" "$(includedir)/Ice/LocalObjectF.h" "$(includedir)/Ice/Handle.h" "$(includedir)/IceUtil/Handle.h" "$(includedir)/IceUtil/Exception.h" "$(includedir)/Ice/Config.h"
 LocatorInfo$(OBJEXT): LocatorInfo.cpp ../Ice/LocatorInfo.h "$(includedir)/IceUtil/Shared.h" "$(includedir)/IceUtil/Config.h" "$(includedir)/IceUtil/Mutex.h" "$(includedir)/IceUtil/Lock.h" "$(includedir)/IceUtil/ThreadException.h" "$(includedir)/IceUtil/Exception.h" "$(includedir)/IceUtil/Time.h" "$(includedir)/IceUtil/MutexProtocol.h" "$(includedir)/IceUtil/Monitor.h" "$(includedir)/IceUtil/Cond.h" ../Ice/LocatorInfoF.h "$(includedir)/Ice/Handle.h" "$(includedir)/IceUtil/Handle.h" "$(includedir)/Ice/Config.h" "$(includedir)/Ice/LocatorF.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/LocalObjectF.h" "$(includedir)/Ice/StreamTraits.h" "$(includedir)/IceUtil/ScopedArray.h" "$(includedir)/IceUtil/Iterator.h" "$(includedir)/IceUtil/Optional.h" "$(includedir)/Ice/UndefSysMacros.h" "$(includedir)/Ice/ReferenceF.h" "$(includedir)/Ice/Identity.h" "$(includedir)/Ice/EndpointIF.h" "$(includedir)/Ice/PropertiesF.h" "$(includedir)/Ice/Locator.h" "$(includedir)/Ice/Proxy.h" "$(includedir)/Ice/ProxyFactoryF.h" "$(includedir)/Ice/ConnectionIF.h" "$(includedir)/Ice/RequestHandlerF.h" "$(includedir)/Ice/EndpointF.h" "$(includedir)/Ice/EndpointTypes.h" "$(includedir)/Ice/ObjectAdapterF.h" "$(includedir)/Ice/OutgoingAsync.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/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/ObserverHelper.h" "$(includedir)/Ice/Observer.h" "$(includedir)/Ice/StreamF.h" "$(includedir)/Ice/Object.h" "$(includedir)/Ice/GCShared.h" "$(includedir)/Ice/GCCountMap.h" "$(includedir)/Ice/IncomingAsyncF.h" "$(includedir)/Ice/Outgoing.h" "$(includedir)/Ice/Incoming.h" "$(includedir)/Ice/ServantLocatorF.h" "$(includedir)/Ice/ServantManagerF.h" "$(includedir)/Ice/IncomingAsync.h" "$(includedir)/Ice/Direct.h" "$(includedir)/Ice/FactoryTableInit.h" "$(includedir)/Ice/FactoryTable.h" "$(includedir)/Ice/ProcessF.h" "$(includedir)/Ice/LocalException.h" "$(includedir)/Ice/BuiltinSequences.h" "$(includedir)/Ice/Stream.h" ../Ice/Instance.h "$(includedir)/IceUtil/RecMutex.h" "$(includedir)/Ice/StatsF.h" "$(includedir)/Ice/ObserverF.h" ../Ice/TraceLevelsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.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/LoggerF.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" ../Ice/TraceLevels.h "$(includedir)/Ice/LoggerUtil.h" ../Ice/EndpointI.h "$(includedir)/Ice/Endpoint.h" ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/Network.h ../Ice/Reference.h "$(includedir)/Ice/RouterF.h" ../Ice/SharedContext.h "$(includedir)/Ice/Properties.h" "$(includedir)/Ice/Functional.h" "$(includedir)/IceUtil/Functional.h"
diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp
index a75ab843c66..aab937b5573 100755
--- a/cpp/src/Ice/ConnectionFactory.cpp
+++ b/cpp/src/Ice/ConnectionFactory.cpp
@@ -259,7 +259,7 @@ IceInternal::OutgoingConnectionFactory::create(const vector<EndpointIPtr>& endpt
         ObserverPtr observer;
         if(obsv)
         {
-            observer = obsv->getConnectObserver(q->endpoint->getInfo(), q->connector->toString());
+            observer = obsv->getConnectionEstablishmentObserver(q->endpoint->getInfo(), q->connector->toString());
             if(observer)
             {
                 observer->attach();
@@ -1163,7 +1163,8 @@ IceInternal::OutgoingConnectionFactory::ConnectCallback::nextConnector()
         const CommunicatorObserverPtr& obsv = _factory->_instance->initializationData().observer;
         if(obsv)
         {
-            _observer = obsv->getConnectObserver(_iter->endpoint->getInfo(), _iter->connector->toString());
+            _observer = obsv->getConnectionEstablishmentObserver(_iter->endpoint->getInfo(), 
+                                                                 _iter->connector->toString());
             if(_observer)
             {
                 _observer->attach();
diff --git a/cpp/src/Ice/EndpointI.cpp b/cpp/src/Ice/EndpointI.cpp
index b084d8f4a8b..d53cf2ec612 100644
--- a/cpp/src/Ice/EndpointI.cpp
+++ b/cpp/src/Ice/EndpointI.cpp
@@ -191,7 +191,16 @@ IceInternal::EndpointHostResolver::EndpointHostResolver(const InstancePtr& insta
 vector<ConnectorPtr>
 IceInternal::EndpointHostResolver::resolve(const string& host, int port, const EndpointIPtr& endpoint)
 {
-    vector<ConnectorPtr> connectors;
+    //
+    // Try to get the addresses without DNS lookup. If this doesn't
+    // work, we retry with DNS lookup (and observer).
+    //
+    vector<struct sockaddr_storage> addrs = getAddresses(host, port, _instance->protocolSupport(), false);
+    if(!addrs.empty())
+    {
+        return endpoint->connectors(addrs);
+    }
+
     ObserverHelperT<> observer;
     const CommunicatorObserverPtr& obsv = _instance->initializationData().observer;
     if(obsv)
@@ -199,6 +208,7 @@ IceInternal::EndpointHostResolver::resolve(const string& host, int port, const E
         observer.attach(obsv->getEndpointLookupObserver(endpoint->getInfo(), endpoint->toString()));
     }
     
+    vector<ConnectorPtr> connectors;
     try 
     {
         connectors = endpoint->connectors(getAddresses(host, port, _instance->protocolSupport(), true));
diff --git a/cpp/src/Ice/MetricsAdminI.cpp b/cpp/src/Ice/MetricsAdminI.cpp
index a4b502bebbb..ed7f5aa9049 100644
--- a/cpp/src/Ice/MetricsAdminI.cpp
+++ b/cpp/src/Ice/MetricsAdminI.cpp
@@ -43,9 +43,12 @@ match(const string& value, const string& expr)
 
 }
 
-MetricsMapI::MetricsMapI(const string& groupBy, int retain, const NameValueDict& accept, const NameValueDict& reject) : 
-    _retain(retain), _accept(accept), _reject(reject)
+MetricsMapI::MetricsMapI(const std::string& mapPrefix, const Ice::PropertiesPtr& properties) :
+    _retain(properties->getPropertyAsIntWithDefault(mapPrefix + ".RetainDetached", 10)),
+    _accept(parseRule(properties, mapPrefix + ".Accept")),
+    _reject(parseRule(properties, mapPrefix + ".Reject"))
 {
+    string groupBy = properties->getPropertyWithDefault(mapPrefix + ".GroupBy", "id");
     if(!groupBy.empty())
     {
         string v;
@@ -87,8 +90,17 @@ MetricsMapI::MetricsMapI(const string& groupBy, int retain, const NameValueDict&
     }
 }
 
+MetricsMapI::MetricsMapI(const MetricsMapI& map) :
+    _groupByAttributes(map._groupByAttributes),
+    _groupBySeparators(map._groupBySeparators),
+    _retain(map._retain),
+    _accept(map._accept),
+    _reject(map._reject)
+{
+}
+
 MetricsMap
-MetricsMapI::getMetrics()
+MetricsMapI::getMetrics() const
 {
     MetricsMap objects;
 
@@ -153,7 +165,7 @@ MetricsMapI::getMatching(const MetricsHelper& helper)
     map<string, EntryPtr>::const_iterator p = _objects.find(key);
     if(p == _objects.end())
     {
-        p = _objects.insert(make_pair(key, newEntry(this, helper.newMetrics(key)))).first;
+        p = _objects.insert(make_pair(key, newEntry(helper.newMetrics(key)))).first;
     }
     return p->second;
 }
@@ -279,7 +291,7 @@ MetricsAdminI::addFactory(const string& mapName, const MetricsMapFactoryPtr& fac
     _factories[mapName] = factory;
 
     //
-    // Add maps to views configured with the given map name.
+    // Add maps to views configured with the given map.
     //
     const string viewsPrefix = "IceMX.MetricsView.";
     PropertyDict views = _properties->getPropertiesForPrefix(viewsPrefix);
@@ -302,22 +314,18 @@ MetricsAdminI::addFactory(const string& mapName, const MetricsMapFactoryPtr& fac
         
         const string mapsPrefix = viewsPrefix + viewName + ".Map.";
         string mapPrefix = mapsPrefix + mapName;
-        if(_properties->getPropertiesForPrefix(mapPrefix).empty() && 
-           _properties->getPropertiesForPrefix(mapsPrefix).empty())
-        {
-            mapPrefix = viewsPrefix + viewName;
-        }
-        else
+        if(_properties->getPropertyAsInt(mapPrefix) == 0 || _properties->getPropertiesForPrefix(mapPrefix).empty())
         {
-            continue; // This map isn't configured for this view.
+            if(_properties->getPropertiesForPrefix(mapsPrefix).empty())
+            {
+                mapPrefix = viewsPrefix + viewName;
+            }
+            else
+            {
+                continue; // This map isn't configured for this view.
+            }
         }
-
-        string groupBy = _properties->getProperty(mapPrefix + ".GroupBy");
-        int retain = _properties->getPropertyAsIntWithDefault(mapPrefix + ".RetainDetached", 10);
-        NameValueDict accept = parseRule(_properties, mapPrefix + ".Accept");
-        NameValueDict reject = parseRule(_properties, mapPrefix + ".Reject");
-
-        view->add(mapName, factory->create(groupBy, retain, accept, reject));
+        view->add(mapName, factory->create(mapPrefix, _properties));
     }
 }
 
@@ -386,19 +394,20 @@ MetricsAdminI::addMapToView(const string& view,
 {
     UpdaterPtr updater;
     {
-        Lock sync(*this);
-        map<string, MetricsViewIPtr>::const_iterator p = _views.find(view);
-        if(p == _views.end())
-        {
-            p = _views.insert(make_pair(view, new MetricsViewI(true))).first;
-        }
-        p->second->add(mapName, _factories[mapName]->create(groupBy, retain, accept, reject));
-
-        map<string, UpdaterPtr>::const_iterator q = _updaters.find(mapName);
-        if(q != _updaters.end())
-        {
-            updater = q->second;
-        }
+        // TODO: XXX
+        // Lock sync(*this);
+        // map<string, MetricsViewIPtr>::const_iterator p = _views.find(view);
+        // if(p == _views.end())
+        // {
+        //     p = _views.insert(make_pair(view, new MetricsViewI(true))).first;
+        // }
+        // p->second->add(mapName, _factories[mapName]->create());
+
+        // map<string, UpdaterPtr>::const_iterator q = _updaters.find(mapName);
+        // if(q != _updaters.end())
+        // {
+        //     updater = q->second;
+        // }
     }
     if(updater)
     {
diff --git a/cpp/src/Ice/MetricsAdminI.h b/cpp/src/Ice/MetricsAdminI.h
index c8875054e4f..f2001a5ecaa 100644
--- a/cpp/src/Ice/MetricsAdminI.h
+++ b/cpp/src/Ice/MetricsAdminI.h
@@ -33,7 +33,7 @@ public:
     {
     public:
 
-        Entry(MetricsMapI* map, const MetricsPtr& object) : _map(map), _object(object)
+        Entry(MetricsMapI* map, const MetricsPtr& object) : _object(object), _map(map)
         {
         }
 
@@ -49,7 +49,8 @@ public:
             return obj;
         }
 
-        void failed(const std::string& exceptionName)
+        void 
+        failed(const std::string& exceptionName)
         {
             IceUtil::Mutex::Lock sync(*this);
             ++_failures[exceptionName];
@@ -66,7 +67,6 @@ public:
             return f;
         }
 
-
         template<typename Function, typename MetricsType> void
         execute(Function func, const MetricsType& obj)
         {
@@ -74,7 +74,8 @@ public:
             func(obj);
         }
         
-        void detach(long lifetime)
+        void 
+        detach(long lifetime)
         {
             bool detached = false;
             {
@@ -88,7 +89,7 @@ public:
             }
         }
 
-        MetricsPtr
+        virtual MetricsPtr
         clone() const
         {
             IceUtil::Mutex::Lock sync(*this);
@@ -96,34 +97,49 @@ public:
             return dynamic_cast<Metrics*>(_object->ice_clone().get());
         }
 
-        const std::string& id() const
+        const std::string& 
+        id() const
         {
             return _object->id;
         }
 
-        bool isDetached() const
+        bool 
+        isDetached() const
         {
             IceUtil::Mutex::Lock sync(*this);
             return _object->current == 0;
         }
 
+        virtual Entry*
+        getMatching(const std::string&, const MetricsHelper&)
+        {
+            return 0;
+        }
+
+    protected:
+
+        MetricsPtr _object;
+
     private:
 
         MetricsMapI* _map;
-        MetricsPtr _object;
         StringIntDict _failures;
     };
     typedef IceUtil::Handle<Entry> EntryPtr;
 
-    MetricsMapI(const std::string&, int, const NameValueDict&, const NameValueDict&);
+    MetricsMapI(const std::string&, const Ice::PropertiesPtr&);
+    MetricsMapI(const MetricsMapI&);
 
     MetricsFailuresSeq getFailures();
-    MetricsMap getMetrics();
+    MetricsMap getMetrics() const;
     EntryPtr getMatching(const MetricsHelper&);
 
 protected:
 
-    virtual EntryPtr newEntry(MetricsMapI*, const MetricsPtr& object) = 0;
+    virtual EntryPtr newEntry(const MetricsPtr& object)
+    {
+        return new Entry(this, object);
+    }
 
 private:
 
@@ -132,7 +148,7 @@ private:
 
     std::vector<std::string> _groupByAttributes;
     std::vector<std::string> _groupBySeparators;
-    int _retain;
+    const int _retain;
     const NameValueDict _accept;
     const NameValueDict _reject;
 
@@ -145,7 +161,7 @@ class MetricsMapFactory : public IceUtil::Shared
 {
 public:
 
-    virtual MetricsMapIPtr create(const std::string&, int, const NameValueDict&, const NameValueDict&) = 0;
+    virtual MetricsMapIPtr create(const std::string&, const Ice::PropertiesPtr&) = 0;
 };
 typedef IceUtil::Handle<MetricsMapFactory> MetricsMapFactoryPtr;
 
@@ -156,28 +172,102 @@ public:
     typedef MetricsType T;
     typedef IceInternal::Handle<MetricsType> TPtr;
 
+    typedef MetricsMap MetricsType::*SubMapMember;
+
     class EntryT : public MetricsMapI::Entry
     {
     public:
 
-        EntryT(MetricsMapI* map, const TPtr& object) : Entry(map, object)
+        EntryT(MetricsMapT* map, const TPtr& object) : Entry(map, object), _map(map)
+        {
+        }
+
+        virtual Entry*
+        getMatching(const std::string& mapName, const MetricsHelper& helper)
+        {
+            typename std::map<std::string, std::pair<MetricsMapIPtr, SubMapMember> >::iterator p = 
+                _subMaps.find(mapName);
+            if(p == _subMaps.end())
+            {
+                std::pair<MetricsMapIPtr, SubMapMember> map = _map->createSubMap(mapName);
+                if(map.first)
+                {
+                    p = _subMaps.insert(make_pair(mapName, map)).first;
+                }
+            }
+            if(p == _subMaps.end())
+            {
+                return 0;
+            }            
+            return p->second.first->getMatching(helper).get();
+        }
+
+        virtual MetricsPtr
+        clone() const
         {
+            IceUtil::Mutex::Lock sync(*this);
+            TPtr metrics = TPtr::dynamicCast(_object->ice_clone());
+            for(typename std::map<std::string, std::pair<MetricsMapIPtr, SubMapMember> >::const_iterator p =
+                    _subMaps.begin(); p != _subMaps.end(); ++p)
+            {
+                metrics.get()->*p->second.second = p->second.first->getMetrics();
+            }
+            return metrics;
         }
 
+    private:
+
+        std::map<std::string, std::pair<MetricsMapIPtr, SubMapMember> > _subMaps;
+        MetricsMapT* _map;
     };
     typedef IceUtil::Handle<EntryT> EntryTPtr;
 
-    MetricsMapT(const std::string& groupBy, int retain, const NameValueDict& accept, const NameValueDict& reject) :
-        MetricsMapI(groupBy, retain, accept, reject)
+    MetricsMapT(const std::string& mapPrefix, 
+                const Ice::PropertiesPtr& properties,
+                const std::map<std::string, SubMapMember>& subMaps) : 
+        MetricsMapI(mapPrefix, properties)
+    {
+        for(typename std::map<std::string, SubMapMember>::const_iterator p = subMaps.begin(); p != subMaps.end(); ++p)
+        {
+            const std::string subMapsPrefix = mapPrefix + ".Map.";
+            std::string subMapPrefix = subMapsPrefix + p->first;
+            if(properties->getPropertyAsInt(subMapPrefix) == 0 || 
+               properties->getPropertiesForPrefix(subMapPrefix).empty())
+            {
+                if(properties->getPropertiesForPrefix(subMapsPrefix).empty())
+                {
+                    subMapPrefix = mapPrefix;
+                }
+                else
+                {
+                    continue; // This sub-map isn't configured.
+                }
+            }
+            _subMaps.insert(std::make_pair(p->first, 
+                                           std::make_pair(new MetricsMapI(subMapPrefix, properties), p->second)));
+        }
+    }
+
+    std::pair<MetricsMapIPtr, SubMapMember>
+    createSubMap(const std::string& subMapName)
     {
+        typename std::map<std::string, std::pair<MetricsMapIPtr, SubMapMember> >::const_iterator p =
+            _subMaps.find(subMapName);
+        if(p != _subMaps.end())
+        {
+            return std::make_pair(new MetricsMapI(*p->second.first), p->second.second);
+        }
+        return std::make_pair(MetricsMapIPtr(), static_cast<SubMapMember>(0));
     }
 
 protected:
 
-    virtual EntryPtr newEntry(MetricsMapI* map, const MetricsPtr& object)
+    virtual EntryPtr newEntry(const MetricsPtr& object)
     {
-        return new EntryT(map, TPtr::dynamicCast(object));
+        return new EntryT(this, TPtr::dynamicCast(object));
     }
+
+    std::map<std::string, std::pair<MetricsMapIPtr, SubMapMember> > _subMaps;
 };
 
 class MetricsViewI : public IceUtil::Shared
diff --git a/cpp/src/Ice/MetricsObserverI.h b/cpp/src/Ice/MetricsObserverI.h
index 0dfb46ec22a..a30eb4ecd14 100644
--- a/cpp/src/Ice/MetricsObserverI.h
+++ b/cpp/src/Ice/MetricsObserverI.h
@@ -35,12 +35,6 @@ public:
         return _name;
     }
 
-    const std::string& 
-    getSubMapName() const
-    {
-        return _subName;
-    }
-
 protected:
 
     MetricsHelper(const std::string& name, const std::string& subName) : _name(name), _subName(subName)
@@ -107,6 +101,10 @@ protected:
             typename std::map<std::string, Resolver*>::const_iterator p = _attributes.find(attribute);
             if(p == _attributes.end())
             {
+                if(attribute == "none")
+                {
+                    return "";
+                }
                 return "unknown";
             }
             return (*p->second)(helper);
@@ -276,6 +274,8 @@ private:
     void (T::*_fn)();
 };
 
+class ObserverI;
+
 template<class MetricsType> class ObserverT : virtual public Ice::Instrumentation::Observer
 {
 public:
@@ -346,6 +346,24 @@ public:
             }
         }
     }
+
+    template<typename ObserverImpl, typename ObserverMetricsType> IceInternal::Handle<ObserverImpl>
+    getObserver(const MetricsHelperT<ObserverMetricsType>& helper)
+    {
+        std::vector<MetricsMapI::EntryPtr> metricsObjects;
+        for(typename SeqType::const_iterator p = _objects.begin(); p != _objects.end(); ++p)
+        {
+            MetricsMapI::EntryPtr e = p->second->getMatching(helper.getMapName(), helper);
+            if(e)
+            {
+                metricsObjects.push_back(e);
+            }
+        }
+
+        IceInternal::Handle<ObserverImpl> obsv = new ObserverImpl();
+        obsv->update(helper, metricsObjects);
+        return obsv;
+    }
     
 private:
 
@@ -421,14 +439,37 @@ public:
         public:
 
             virtual MetricsMapIPtr
-            create(const std::string& groupBy, int retain, const NameValueDict& accept, const NameValueDict& reject)
+            create(const std::string& mapPrefix, const Ice::PropertiesPtr& properties)
             {
-                return new MetricsMapT<MetricsType>(groupBy, retain, accept, reject);
+                return new MetricsMapI(mapPrefix, properties);
             }
         };
         return new Factory();
     }
 
+    virtual MetricsMapFactoryPtr
+    newFactory(const std::map<std::string, MetricsMap MetricsType::*>& subMaps)
+    {
+        class Factory : public MetricsMapFactory
+        {
+        public:
+            Factory(std::map<std::string, MetricsMap MetricsType::*> subMaps) : _subMaps(subMaps)
+            {
+            }
+
+            virtual MetricsMapIPtr
+            create(const std::string& mapPrefix, const Ice::PropertiesPtr& properties)
+            {
+                return new MetricsMapT<MetricsType>(mapPrefix, properties, _subMaps);
+            }
+
+        private:
+
+            std::map<std::string, MetricsMap MetricsType::*> _subMaps;
+        };
+        return new Factory(subMaps);
+    }
+
 private:
 
     const std::string _name;
diff --git a/cpp/src/Ice/ObserverI.cpp b/cpp/src/Ice/ObserverI.cpp
index 139645acebf..bf1567a7561 100644
--- a/cpp/src/Ice/ObserverI.cpp
+++ b/cpp/src/Ice/ObserverI.cpp
@@ -128,7 +128,7 @@ public:
         IPConnectionInfoPtr info = IPConnectionInfoPtr::dynamicCast(_connection);
         if(info)
         {
-            os << info->localAddress << ':' << info->localPort << '/' << info->remoteAddress << ':' << info->remotePort;
+            os << info->localAddress << ':' << info->localPort << " -> " << info->remoteAddress << ':' << info->remotePort;
         }
         else
         {
@@ -231,7 +231,7 @@ public:
         {
             os << _current.id.category << '/';
         }
-        os << _current.id.name << '-' << _current.operation;
+        os << _current.id.name << " [" << _current.operation << ']';
         return os.str();
     }
 
@@ -291,6 +291,7 @@ public:
             add("facet", &InvocationHelper::getProxy, &IceProxy::Ice::Object::ice_getFacet);
             add("encoding", &InvocationHelper::getProxy, &IceProxy::Ice::Object::ice_getEncodingVersion);
             add("mode", &InvocationHelper::getMode);
+            add("proxy", &InvocationHelper::getProxy);
         }
     };
     static Attributes attributes;
@@ -350,12 +351,7 @@ public:
     getId() const
     {
         ostringstream os;
-        const Ice::Identity& id = _proxy->ice_getIdentity();
-        if(!id.category.empty())
-        {
-            os << id.category << '/';
-        }
-        os << id.name << '-' << _operation;
+        os << _proxy << " [" << _operation << ']';
         return os.str();
     }
 
@@ -387,6 +383,80 @@ private:
 
 InvocationHelper::Attributes InvocationHelper::attributes;
 
+class RemoteInvocationHelper : public MetricsHelperT<Metrics>
+{
+public:
+
+    class Attributes : public AttributeResolverT<RemoteInvocationHelper>
+    {
+    public:
+        
+        Attributes()
+        {
+            add("parent", &RemoteInvocationHelper::getParent);
+            add("id", &RemoteInvocationHelper::getId);
+            addConnectionAttributes<RemoteInvocationHelper>(*this);
+        }
+    };
+    static Attributes attributes;
+    
+    RemoteInvocationHelper(const ConnectionPtr& con) : MetricsHelperT("Remote"), _connection(con)
+    {
+    }
+
+    virtual string operator()(const string& attribute) const
+    {
+        return attributes(this, attribute);
+    }
+
+    string 
+    getId() const
+    {
+        ostringstream os;
+        IPConnectionInfoPtr info = IPConnectionInfoPtr::dynamicCast(_connection->getInfo());
+        if(info)
+        {
+            os << info->remoteAddress << ':' << info->remotePort;
+        }
+        else
+        {
+            os << "connection-" << _connection.get();
+        }
+        return os.str();
+    }
+    
+    string 
+    getParent() const
+    {
+        if(_connection->getAdapter())
+        {
+            return _connection->getAdapter()->getName();
+        }
+        else
+        {
+            return "Communicator";
+        }
+    }
+    
+    ::Ice::ConnectionInfoPtr
+    getConnectionInfo() const
+    {
+        return _connection->getInfo();
+    }
+
+    ::Ice::EndpointInfoPtr
+    getEndpointInfo() const
+    {
+        return _connection->getEndpoint()->getInfo();
+    }
+    
+private:
+
+    ConnectionPtr _connection;
+};
+
+RemoteInvocationHelper::Attributes RemoteInvocationHelper::attributes;
+
 class ThreadHelper : public MetricsHelperT<ThreadMetrics>
 {
 public:
@@ -430,24 +500,26 @@ private:
 
 ThreadHelper::Attributes ThreadHelper::attributes;
 
-class ConnectHelper : public MetricsHelperT<Metrics>
+class EndpointHelper : public MetricsHelperT<Metrics>
 {
 public:
 
-    class Attributes : public AttributeResolverT<ConnectHelper>
+    class Attributes : public AttributeResolverT<EndpointHelper>
     {
     public:
         
         Attributes()
         {
-            add("parent", &ConnectHelper::getParent);
-            add("id", &ConnectHelper::_id);
-            addEndpointAttributes<ConnectHelper>(*this);
+            add("parent", &EndpointHelper::getParent);
+            add("id", &EndpointHelper::_id);
+            addEndpointAttributes<EndpointHelper>(*this);
         }
     };
     static Attributes attributes;
     
-    ConnectHelper(const EndpointInfoPtr& endpt, const string& id) : MetricsHelperT("Connect"), _id(id), _endpoint(endpt)
+    EndpointHelper(const string& mapName, 
+                   const EndpointInfoPtr& endpt, 
+                   const string& id) : MetricsHelperT(mapName), _id(id), _endpoint(endpt)
     {
     }
 
@@ -474,7 +546,7 @@ private:
     const Ice::EndpointInfoPtr _endpoint;
 };
 
-ConnectHelper::Attributes ConnectHelper::attributes;
+EndpointHelper::Attributes EndpointHelper::attributes;
 
 }
 
@@ -559,9 +631,9 @@ InvocationObserverI::retried()
 }
 
 ObserverPtr
-InvocationObserverI::getRemoteObserver(const Ice::ConnectionPtr&)
+InvocationObserverI::getRemoteObserver(const Ice::ConnectionPtr& connection)
 {
-    return 0;
+    return getObserver<ObserverI>(RemoteInvocationHelper(connection));
 }
 
 CommunicatorObserverI::CommunicatorObserverI(const MetricsAdminIPtr& metrics) : 
@@ -576,9 +648,12 @@ CommunicatorObserverI::CommunicatorObserverI(const MetricsAdminIPtr& metrics) :
     metrics->addFactory("Connection", _connections.newFactory());
     metrics->addFactory("Thread", _threads.newFactory());
     metrics->addFactory("Dispatch", _dispatch.newFactory());
-    metrics->addFactory("Invocation", _invocations.newFactory());
-    metrics->addFactory("Connect", _connects.newFactory());
-    metrics->addFactory("EndpointLookups", _endpointLookups.newFactory());
+    metrics->addFactory("ConnectionEstablishment", _connects.newFactory());
+    metrics->addFactory("EndpointLookup", _endpointLookups.newFactory());
+
+    map<string, MetricsMap InvocationMetrics::*> subMaps;
+    subMaps["Remote"] = &InvocationMetrics::remotes;
+    metrics->addFactory("Invocation", _invocations.newFactory(subMaps));
 }
 
 void
@@ -589,15 +664,15 @@ CommunicatorObserverI::setObserverUpdater(const ObserverUpdaterPtr& updater)
 }
 
 ObserverPtr
-CommunicatorObserverI::getConnectObserver(const Ice::EndpointInfoPtr& endpt, const string& connector)
+CommunicatorObserverI::getConnectionEstablishmentObserver(const Ice::EndpointInfoPtr& endpt, const string& connector)
 {
-    return _connects.getObserver(ConnectHelper(endpt, connector));
+    return _connects.getObserver(EndpointHelper("ConnectionEstablishment", endpt, connector));
 }
 
 ObserverPtr
 CommunicatorObserverI::getEndpointLookupObserver(const Ice::EndpointInfoPtr& endpt, const string& endpoint)
 {
-    return _endpointLookups.getObserver(ConnectHelper(endpt, endpoint));
+    return _endpointLookups.getObserver(EndpointHelper("EndpointLookup", endpt, endpoint));
 }
 
 ConnectionObserverPtr 
diff --git a/cpp/src/Ice/ObserverI.h b/cpp/src/Ice/ObserverI.h
index 903c0c90db8..211954987eb 100644
--- a/cpp/src/Ice/ObserverI.h
+++ b/cpp/src/Ice/ObserverI.h
@@ -55,8 +55,8 @@ public:
 
     virtual void setObserverUpdater(const Ice::Instrumentation::ObserverUpdaterPtr&);
  
-    virtual Ice::Instrumentation::ObserverPtr getConnectObserver(const Ice::EndpointInfoPtr&, 
-                                                                 const std::string&);
+    virtual Ice::Instrumentation::ObserverPtr getConnectionEstablishmentObserver(const Ice::EndpointInfoPtr&, 
+                                                                                 const std::string&);
  
     virtual Ice::Instrumentation::ObserverPtr getEndpointLookupObserver(const Ice::EndpointInfoPtr&, 
                                                                         const std::string&);