summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cpp/include/Ice/Direct.h2
-rw-r--r--cpp/include/Ice/DispatchInterceptor.h6
-rw-r--r--cpp/include/Ice/Object.h39
-rw-r--r--cpp/src/Ice/.depend12
-rw-r--r--cpp/src/Ice/Incoming.cpp76
-rw-r--r--cpp/src/Ice/IncomingAsync.cpp5
-rw-r--r--cpp/src/Ice/Object.cpp4
-rw-r--r--cpp/src/Ice/Outgoing.cpp39
-rw-r--r--cpp/src/Ice/OutgoingAsync.cpp49
-rw-r--r--cpp/src/Ice/Proxy.cpp151
-rw-r--r--cpp/src/Ice/ReplyStatus.h29
-rw-r--r--cpp/src/Ice/TraceUtil.cpp41
-rw-r--r--cpp/src/slice2cpp/Gen.cpp26
-rw-r--r--cpp/test/Ice/interceptor/AMDInterceptorI.cpp16
-rw-r--r--cpp/test/Ice/interceptor/AMDInterceptorI.h8
-rw-r--r--cpp/test/Ice/interceptor/Client.cpp28
-rw-r--r--cpp/test/Ice/interceptor/InterceptorI.cpp8
-rw-r--r--cpp/test/Ice/interceptor/InterceptorI.h6
18 files changed, 341 insertions, 204 deletions
diff --git a/cpp/include/Ice/Direct.h b/cpp/include/Ice/Direct.h
index a720167b6a6..16b56dcb6b2 100644
--- a/cpp/include/Ice/Direct.h
+++ b/cpp/include/Ice/Direct.h
@@ -30,7 +30,7 @@ public:
virtual bool isCollocated();
virtual const Ice::Current& getCurrent();
- virtual DispatchStatus run(Ice::Object*) { return DispatchOK; } // = 0;
+ virtual Ice::DispatchStatus run(Ice::Object*) = 0;
void throwUserException();
diff --git a/cpp/include/Ice/DispatchInterceptor.h b/cpp/include/Ice/DispatchInterceptor.h
index 1eebc73e992..b7e1228d68b 100644
--- a/cpp/include/Ice/DispatchInterceptor.h
+++ b/cpp/include/Ice/DispatchInterceptor.h
@@ -19,13 +19,13 @@ class ICE_API DispatchInterceptor : public virtual Object
{
public:
- virtual IceInternal::DispatchStatus
+ virtual DispatchStatus
dispatch(Request&) = 0;
- virtual IceInternal::DispatchStatus
+ virtual DispatchStatus
__dispatch(IceInternal::Incoming&, const Current&);
- virtual IceInternal::DispatchStatus
+ virtual DispatchStatus
__collocDispatch(IceInternal::Direct&);
};
diff --git a/cpp/include/Ice/Object.h b/cpp/include/Ice/Object.h
index 3b4e8390c26..653874b626e 100644
--- a/cpp/include/Ice/Object.h
+++ b/cpp/include/Ice/Object.h
@@ -26,23 +26,18 @@ class Incoming;
class BasicStream;
class Direct;
+}
+
+namespace Ice
+{
+
enum DispatchStatus
{
DispatchOK,
DispatchUserException,
- DispatchObjectNotExist,
- DispatchFacetNotExist,
- DispatchOperationNotExist,
- DispatchUnknownLocalException,
- DispatchUnknownUserException,
- DispatchUnknownException,
- DispatchAsync // "Pseudo dispatch status", used internally only to indicate async dispatch.
+ DispatchAsync
};
-}
-
-namespace Ice
-{
class ICE_API DispatchInterceptorAsyncCallback : public virtual IceUtil::Shared
{
@@ -81,16 +76,16 @@ public:
virtual Int ice_hash() const;
virtual bool ice_isA(const std::string&, const Current& = Current()) const;
- IceInternal::DispatchStatus ___ice_isA(IceInternal::Incoming&, const Current&);
+ DispatchStatus ___ice_isA(IceInternal::Incoming&, const Current&);
virtual void ice_ping(const Current& = Current()) const;
- IceInternal::DispatchStatus ___ice_ping(IceInternal::Incoming&, const Current&);
+ DispatchStatus ___ice_ping(IceInternal::Incoming&, const Current&);
virtual std::vector< std::string> ice_ids(const Current& = Current()) const;
- IceInternal::DispatchStatus ___ice_ids(IceInternal::Incoming&, const Current&);
+ DispatchStatus ___ice_ids(IceInternal::Incoming&, const Current&);
virtual const std::string& ice_id(const Current& = Current()) const;
- IceInternal::DispatchStatus ___ice_id(IceInternal::Incoming&, const Current&);
+ DispatchStatus ___ice_id(IceInternal::Incoming&, const Current&);
virtual Int ice_operationAttributes(const std::string&) const;
@@ -103,9 +98,9 @@ public:
static std::string __all[];
- virtual IceInternal::DispatchStatus ice_dispatch(Ice::Request&, const DispatchInterceptorAsyncCallbackPtr& = 0);
- virtual IceInternal::DispatchStatus __dispatch(IceInternal::Incoming&, const Current&);
- virtual IceInternal::DispatchStatus __collocDispatch(IceInternal::Direct&);
+ virtual DispatchStatus ice_dispatch(Ice::Request&, const DispatchInterceptorAsyncCallbackPtr& = 0);
+ virtual DispatchStatus __dispatch(IceInternal::Incoming&, const Current&);
+ virtual DispatchStatus __collocDispatch(IceInternal::Direct&);
virtual void __write(IceInternal::BasicStream*) const;
virtual void __read(IceInternal::BasicStream*, bool);
@@ -130,7 +125,7 @@ public:
// Returns true if ok, false if user exception.
virtual bool ice_invoke(const std::vector<Byte>&, std::vector<Byte>&, const Current&) = 0;
- virtual IceInternal::DispatchStatus __dispatch(IceInternal::Incoming&, const Current&);
+ virtual DispatchStatus __dispatch(IceInternal::Incoming&, const Current&);
};
class ICE_API BlobjectArray : virtual public Object
@@ -139,7 +134,7 @@ public:
// Returns true if ok, false if user exception.
virtual bool ice_invoke(const std::pair<const Byte*, const Byte*>&, std::vector<Byte>&, const Current&) = 0;
- virtual IceInternal::DispatchStatus __dispatch(IceInternal::Incoming&, const Current&);
+ virtual DispatchStatus __dispatch(IceInternal::Incoming&, const Current&);
};
class ICE_API BlobjectAsync : virtual public Object
@@ -148,7 +143,7 @@ public:
// Returns true if ok, false if user exception.
virtual void ice_invoke_async(const AMD_Object_ice_invokePtr&, const std::vector<Byte>&, const Current&) = 0;
- virtual IceInternal::DispatchStatus __dispatch(IceInternal::Incoming&, const Current&);
+ virtual DispatchStatus __dispatch(IceInternal::Incoming&, const Current&);
};
class ICE_API BlobjectArrayAsync : virtual public Object
@@ -158,7 +153,7 @@ public:
// Returns true if ok, false if user exception.
virtual void ice_invoke_async(const AMD_Array_Object_ice_invokePtr&, const std::pair<const Byte*, const Byte*>&,
const Current&) = 0;
- virtual IceInternal::DispatchStatus __dispatch(IceInternal::Incoming&, const Current&);
+ virtual DispatchStatus __dispatch(IceInternal::Incoming&, const Current&);
};
ICE_API void ice_writeObject(const OutputStreamPtr&, const ObjectPtr&);
diff --git a/cpp/src/Ice/.depend b/cpp/src/Ice/.depend
index 42c27d84c46..f423cf3ce7b 100644
--- a/cpp/src/Ice/.depend
+++ b/cpp/src/Ice/.depend
@@ -29,10 +29,10 @@ Identity$(OBJEXT): Identity.cpp ../../include/Ice/Identity.h ../../include/Ice/L
IdentityUtil$(OBJEXT): IdentityUtil.cpp ../../include/Ice/IdentityUtil.h ../../include/Ice/Identity.h ../../include/Ice/LocalObjectF.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/LocalException.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/StreamF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/BuiltinSequences.h ../../include/IceUtil/StringUtil.h
ImplicitContextI$(OBJEXT): ImplicitContextI.cpp ../Ice/ImplicitContextI.h ../../include/Ice/ImplicitContext.h ../../include/Ice/LocalObjectF.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalException.h ../../include/Ice/BuiltinSequences.h ../../include/IceUtil/StaticMutex.h
ImplicitContext$(OBJEXT): ImplicitContext.cpp ../../include/Ice/ImplicitContext.h ../../include/Ice/LocalObjectF.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalException.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/Ice/StringConverter.h ../../include/IceUtil/Unicode.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/IceUtil/Iterator.h ../../include/IceUtil/ScopedArray.h ../../include/IceUtil/DisableWarnings.h
-IncomingAsync$(OBJEXT): IncomingAsync.cpp ../../include/Ice/IncomingAsync.h ../../include/Ice/IncomingAsyncF.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Incoming.h ../../include/Ice/InstanceF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/LocalObject.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/ServantManagerF.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/Ice/StringConverter.h ../../include/IceUtil/Unicode.h ../../include/Ice/Object.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/Current.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../../include/Ice/ServantLocator.h ../Ice/ConnectionI.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/IceUtil/Thread.h ../../include/Ice/Connection.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/TransceiverF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/ThreadPoolF.h ../../include/Ice/LocalException.h ../../include/Ice/BuiltinSequences.h ../Ice/Instance.h ../../include/IceUtil/RecMutex.h ../../include/Ice/StatsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/PluginF.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../Ice/SharedContext.h ../Ice/ImplicitContextI.h ../../include/Ice/ImplicitContext.h ../../include/Ice/Properties.h ../../include/IceUtil/StaticMutex.h
-Incoming$(OBJEXT): Incoming.cpp ../../include/Ice/Incoming.h ../../include/Ice/InstanceF.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ConnectionIF.h ../../include/Ice/LocalObject.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/ServantManagerF.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/Ice/StringConverter.h ../../include/IceUtil/Unicode.h ../../include/Ice/Object.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../../include/Ice/IncomingAsync.h ../Ice/IncomingRequest.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/FacetMap.h ../../include/Ice/ServantLocator.h ../Ice/ServantManager.h ../Ice/ConnectionI.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/IceUtil/Thread.h ../../include/Ice/Connection.h ../../include/Ice/ConnectionFactoryF.h ../Ice/TransceiverF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/ThreadPoolF.h ../../include/Ice/LocalException.h ../../include/Ice/BuiltinSequences.h ../Ice/Instance.h ../../include/IceUtil/RecMutex.h ../../include/Ice/StatsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/PluginF.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../Ice/SharedContext.h ../Ice/ImplicitContextI.h ../../include/Ice/ImplicitContext.h ../../include/Ice/Properties.h ../../include/Ice/LoggerUtil.h ../../include/IceUtil/StringUtil.h
+IncomingAsync$(OBJEXT): IncomingAsync.cpp ../../include/Ice/IncomingAsync.h ../../include/Ice/IncomingAsyncF.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Incoming.h ../../include/Ice/InstanceF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/LocalObject.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/ServantManagerF.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/Ice/StringConverter.h ../../include/IceUtil/Unicode.h ../../include/Ice/Object.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/Current.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../../include/Ice/ServantLocator.h ../Ice/ConnectionI.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/IceUtil/Thread.h ../../include/Ice/Connection.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/TransceiverF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/ThreadPoolF.h ../../include/Ice/LocalException.h ../../include/Ice/BuiltinSequences.h ../Ice/Instance.h ../../include/IceUtil/RecMutex.h ../../include/Ice/StatsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/PluginF.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../Ice/SharedContext.h ../Ice/ImplicitContextI.h ../../include/Ice/ImplicitContext.h ../../include/Ice/Properties.h ../Ice/ReplyStatus.h ../../include/IceUtil/StaticMutex.h
+Incoming$(OBJEXT): Incoming.cpp ../../include/Ice/Incoming.h ../../include/Ice/InstanceF.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ConnectionIF.h ../../include/Ice/LocalObject.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/ServantManagerF.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/Ice/StringConverter.h ../../include/IceUtil/Unicode.h ../../include/Ice/Object.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../../include/Ice/IncomingAsync.h ../Ice/IncomingRequest.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/FacetMap.h ../../include/Ice/ServantLocator.h ../Ice/ServantManager.h ../Ice/ConnectionI.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/IceUtil/Thread.h ../../include/Ice/Connection.h ../../include/Ice/ConnectionFactoryF.h ../Ice/TransceiverF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/ThreadPoolF.h ../../include/Ice/LocalException.h ../../include/Ice/BuiltinSequences.h ../Ice/Instance.h ../../include/IceUtil/RecMutex.h ../../include/Ice/StatsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/PluginF.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../Ice/SharedContext.h ../Ice/ImplicitContextI.h ../../include/Ice/ImplicitContext.h ../../include/Ice/Properties.h ../../include/Ice/LoggerUtil.h ../Ice/ReplyStatus.h ../../include/IceUtil/StringUtil.h
Initialize$(OBJEXT): Initialize.cpp ../../include/IceUtil/DisableWarnings.h ../../include/IceUtil/ArgVector.h ../../include/IceUtil/Config.h ../Ice/GC.h ../../include/Ice/Config.h ../../include/IceUtil/Thread.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../Ice/CommunicatorI.h ../../include/IceUtil/RecMutex.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/Handle.h ../../include/Ice/ProxyHandle.h ../../include/Ice/Initialize.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/PropertiesF.h ../../include/Ice/InstanceF.h ../../include/Ice/LoggerF.h ../../include/Ice/StreamF.h ../../include/Ice/StatsF.h ../../include/Ice/StringConverter.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/Communicator.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ImplicitContextF.h ../Ice/PropertiesI.h ../../include/Ice/Properties.h ../../include/Ice/LocalException.h ../Ice/StreamI.h ../../include/Ice/Stream.h ../../include/Ice/BasicStream.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/IceUtil/Unicode.h ../Ice/LoggerI.h ../../include/Ice/Logger.h
-Instance$(OBJEXT): Instance.cpp ../../include/IceUtil/DisableWarnings.h ../Ice/Instance.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../../include/IceUtil/RecMutex.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/StatsF.h ../Ice/TraceLevelsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../../include/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/PluginF.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../../include/Ice/StreamF.h ../../include/Ice/StringConverter.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../Ice/SharedContext.h ../Ice/ImplicitContextI.h ../../include/Ice/ImplicitContext.h ../../include/Ice/LocalException.h ../Ice/TraceLevels.h ../Ice/DefaultsAndOverrides.h ../Ice/RouterInfo.h ../../include/Ice/RouterF.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Router.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/IceUtil/Unicode.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../Ice/LocatorInfo.h ../../include/Ice/LocatorF.h ../../include/Ice/Locator.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/ProcessF.h ../Ice/ReferenceFactory.h ../Ice/Reference.h ../Ice/ProxyFactory.h ../Ice/ThreadPool.h ../../include/IceUtil/Thread.h ../Ice/EventHandlerF.h ../Ice/ConnectionFactory.h ../Ice/AcceptorF.h ../Ice/TransceiverF.h ../Ice/EventHandler.h ../Ice/ConnectionMonitor.h ../Ice/ObjectFactoryManager.h ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/FacetMap.h ../../include/Ice/Process.h ../../include/Ice/Properties.h ../Ice/LoggerI.h ../../include/Ice/Logger.h ../Ice/Network.h ../Ice/EndpointFactoryManager.h ../../include/Ice/EndpointFactoryF.h ../Ice/TcpEndpointI.h ../Ice/EndpointI.h ../Ice/ConnectorF.h ../../include/Ice/EndpointFactory.h ../Ice/UdpEndpointI.h ../../include/Ice/DynamicLibrary.h ../Ice/PluginManagerI.h ../../include/Ice/Plugin.h ../../include/IceUtil/StringUtil.h ../Ice/SysLoggerI.h
+Instance$(OBJEXT): Instance.cpp ../../include/IceUtil/DisableWarnings.h ../Ice/Instance.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../../include/IceUtil/RecMutex.h ../../include/Ice/InstanceF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/StatsF.h ../Ice/TraceLevelsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../../include/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/PluginF.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../../include/Ice/StreamF.h ../../include/Ice/StringConverter.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../Ice/SharedContext.h ../Ice/ImplicitContextI.h ../../include/Ice/ImplicitContext.h ../../include/Ice/LocalException.h ../Ice/TraceLevels.h ../Ice/DefaultsAndOverrides.h ../Ice/RouterInfo.h ../../include/Ice/RouterF.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Router.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/IceUtil/Unicode.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../Ice/LocatorInfo.h ../../include/Ice/LocatorF.h ../../include/Ice/Locator.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/IncomingAsync.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/ProcessF.h ../Ice/ReferenceFactory.h ../Ice/Reference.h ../Ice/ProxyFactory.h ../Ice/ThreadPool.h ../../include/IceUtil/Thread.h ../Ice/EventHandlerF.h ../Ice/ConnectionFactory.h ../Ice/AcceptorF.h ../Ice/TransceiverF.h ../Ice/EventHandler.h ../Ice/ConnectionMonitor.h ../Ice/ObjectFactoryManager.h ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/FacetMap.h ../../include/Ice/Process.h ../Ice/PropertiesI.h ../../include/Ice/Properties.h ../Ice/LoggerI.h ../../include/Ice/Logger.h ../Ice/Network.h ../Ice/EndpointFactoryManager.h ../../include/Ice/EndpointFactoryF.h ../Ice/TcpEndpointI.h ../Ice/EndpointI.h ../Ice/ConnectorF.h ../../include/Ice/EndpointFactory.h ../Ice/UdpEndpointI.h ../../include/Ice/DynamicLibrary.h ../Ice/PluginManagerI.h ../../include/Ice/Plugin.h ../../include/Ice/LoggerUtil.h ../../include/IceUtil/StringUtil.h ../Ice/SysLoggerI.h
LocalException$(OBJEXT): LocalException.cpp ../../include/Ice/LocalException.h ../../include/Ice/LocalObjectF.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/Ice/StringConverter.h ../../include/IceUtil/Unicode.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/IceUtil/Iterator.h ../../include/IceUtil/ScopedArray.h ../../include/IceUtil/DisableWarnings.h
LocalObject$(OBJEXT): LocalObject.cpp ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h
LocatorInfo$(OBJEXT): LocatorInfo.cpp ../Ice/LocatorInfo.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Time.h ../Ice/LocatorInfoF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/LocatorF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Locator.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/Ice/StringConverter.h ../../include/IceUtil/Unicode.h ../../include/Ice/OutgoingAsync.h ../../include/IceUtil/RecMutex.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/IncomingAsync.h ../../include/Ice/Direct.h ../../include/Ice/UserExceptionFactory.h ../../include/Ice/FactoryTable.h ../../include/Ice/FactoryTableDef.h ../../include/IceUtil/StaticMutex.h ../../include/Ice/UserExceptionFactoryF.h ../../include/Ice/ProcessF.h ../../include/Ice/LocalException.h ../../include/Ice/BuiltinSequences.h ../Ice/Instance.h ../../include/Ice/StatsF.h ../Ice/TraceLevelsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/ReferenceFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../../include/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/PluginF.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../../include/Ice/LoggerF.h ../Ice/SharedContext.h ../Ice/ImplicitContextI.h ../../include/Ice/ImplicitContext.h ../Ice/TraceLevels.h ../../include/Ice/LoggerUtil.h ../Ice/EndpointI.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../Ice/Reference.h ../../include/Ice/RouterF.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h
@@ -47,8 +47,8 @@ ObjectAdapter$(OBJEXT): ObjectAdapter.cpp ../../include/Ice/ObjectAdapter.h ../.
ObjectFactoryManager$(OBJEXT): ObjectFactoryManager.cpp ../Ice/ObjectFactoryManager.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../Ice/ObjectFactoryManagerF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/ObjectFactory.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h ../../include/Ice/LocalException.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/BuiltinSequences.h
ObjectFactory$(OBJEXT): ObjectFactory.cpp ../../include/Ice/ObjectFactory.h ../../include/Ice/LocalObjectF.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/Ice/StringConverter.h ../../include/IceUtil/Unicode.h ../../include/Ice/Object.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../../include/IceUtil/Iterator.h ../../include/IceUtil/ScopedArray.h ../../include/IceUtil/DisableWarnings.h
Object$(OBJEXT): Object.cpp ../../include/Ice/Object.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Shared.h ../../include/Ice/GCShared.h ../../include/Ice/Config.h ../../include/Ice/GCCountMap.h ../../include/Ice/ObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ProxyF.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../../include/Ice/Incoming.h ../../include/Ice/InstanceF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/Ice/StringConverter.h ../../include/IceUtil/Unicode.h ../../include/Ice/IncomingAsync.h ../Ice/IncomingRequest.h ../../include/Ice/Direct.h ../../include/Ice/ReferenceF.h ../../include/Ice/LocalException.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Stream.h
-OutgoingAsync$(OBJEXT): OutgoingAsync.cpp ../../include/Ice/OutgoingAsync.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Config.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/IceUtil/RecMutex.h ../../include/Ice/OutgoingAsyncF.h ../../include/IceUtil/Shared.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ReferenceF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/LocalObject.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Current.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/IceUtil/Mutex.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/StreamF.h ../Ice/ConnectionI.h ../../include/IceUtil/Thread.h ../../include/Ice/Connection.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ConnectionFactoryF.h ../../include/Ice/InstanceF.h ../Ice/TransceiverF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/ThreadPoolF.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/Ice/StringConverter.h ../../include/IceUtil/Unicode.h ../Ice/Reference.h ../Ice/ReferenceFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/SharedContext.h ../Ice/Instance.h ../../include/Ice/StatsF.h ../Ice/DefaultsAndOverridesF.h ../../include/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/PluginF.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../../include/Ice/BuiltinSequences.h ../Ice/ImplicitContextI.h ../../include/Ice/ImplicitContext.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/LoggerUtil.h ../Ice/LocatorInfo.h ../Ice/ProxyFactory.h ../Ice/RouterInfo.h ../../include/Ice/Outgoing.h
-Outgoing$(OBJEXT): Outgoing.cpp ../../include/Ice/Outgoing.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/ConnectionIF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ReferenceF.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Exception.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/Ice/StringConverter.h ../../include/IceUtil/Unicode.h ../../include/Ice/Current.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/StreamF.h ../Ice/ConnectionI.h ../../include/IceUtil/Thread.h ../../include/Ice/Connection.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/TransceiverF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/ThreadPoolF.h ../Ice/Reference.h ../../include/IceUtil/RecMutex.h ../Ice/ReferenceFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/SharedContext.h ../../include/Ice/LocalException.h ../../include/Ice/BuiltinSequences.h ../Ice/Instance.h ../../include/Ice/StatsF.h ../Ice/DefaultsAndOverridesF.h ../../include/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/PluginF.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../Ice/ImplicitContextI.h ../../include/Ice/ImplicitContext.h
+OutgoingAsync$(OBJEXT): OutgoingAsync.cpp ../../include/Ice/OutgoingAsync.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Config.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/IceUtil/RecMutex.h ../../include/Ice/OutgoingAsyncF.h ../../include/IceUtil/Shared.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ReferenceF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/LocalObject.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Current.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/IceUtil/Mutex.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/StreamF.h ../Ice/ConnectionI.h ../../include/IceUtil/Thread.h ../../include/Ice/Connection.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ConnectionFactoryF.h ../../include/Ice/InstanceF.h ../Ice/TransceiverF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/ThreadPoolF.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/Ice/StringConverter.h ../../include/IceUtil/Unicode.h ../Ice/Reference.h ../Ice/ReferenceFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/SharedContext.h ../Ice/Instance.h ../../include/Ice/StatsF.h ../Ice/DefaultsAndOverridesF.h ../../include/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/PluginF.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../../include/Ice/BuiltinSequences.h ../Ice/ImplicitContextI.h ../../include/Ice/ImplicitContext.h ../../include/Ice/LocalException.h ../../include/Ice/Properties.h ../../include/Ice/LoggerUtil.h ../Ice/LocatorInfo.h ../Ice/ProxyFactory.h ../Ice/RouterInfo.h ../../include/Ice/Outgoing.h ../Ice/ReplyStatus.h
+Outgoing$(OBJEXT): Outgoing.cpp ../../include/Ice/Outgoing.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/ConnectionIF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/LocalObject.h ../../include/IceUtil/Shared.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ReferenceF.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Exception.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/Ice/StringConverter.h ../../include/IceUtil/Unicode.h ../../include/Ice/Current.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/StreamF.h ../Ice/ConnectionI.h ../../include/IceUtil/Thread.h ../../include/Ice/Connection.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/ConnectionFactoryF.h ../Ice/TransceiverF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/LoggerF.h ../Ice/TraceLevelsF.h ../Ice/EventHandler.h ../Ice/EventHandlerF.h ../Ice/ThreadPoolF.h ../Ice/Reference.h ../../include/IceUtil/RecMutex.h ../Ice/ReferenceFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/SharedContext.h ../../include/Ice/LocalException.h ../../include/Ice/BuiltinSequences.h ../Ice/Instance.h ../../include/Ice/StatsF.h ../Ice/DefaultsAndOverridesF.h ../../include/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/PluginF.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../Ice/ImplicitContextI.h ../../include/Ice/ImplicitContext.h ../Ice/ReplyStatus.h
PluginManagerI$(OBJEXT): PluginManagerI.cpp ../Ice/PluginManagerI.h ../../include/Ice/Plugin.h ../../include/Ice/LocalObjectF.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/InstanceF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/LoggerF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../../include/Ice/DynamicLibrary.h ../../include/Ice/Communicator.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/StatsF.h ../../include/Ice/PropertiesF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/PluginF.h ../../include/Ice/ImplicitContextF.h ../../include/Ice/Properties.h ../../include/Ice/LoggerUtil.h ../../include/Ice/Initialize.h ../../include/Ice/StringConverter.h ../../include/Ice/LocalException.h
Plugin$(OBJEXT): Plugin.cpp ../../include/Ice/Plugin.h ../../include/Ice/LocalObjectF.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/UndefSysMacros.h ../../include/IceUtil/Iterator.h ../../include/IceUtil/ScopedArray.h ../../include/IceUtil/DisableWarnings.h
Process$(OBJEXT): Process.cpp ../../include/Ice/Process.h ../../include/Ice/LocalObjectF.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/Outgoing.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/Ice/BasicStream.h ../../include/Ice/InstanceF.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/Ice/StringConverter.h ../../include/IceUtil/Unicode.h ../../include/Ice/OutgoingAsync.h ../../include/IceUtil/RecMutex.h ../../include/Ice/Incoming.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Direct.h ../../include/Ice/LocalException.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/ObjectFactory.h ../../include/IceUtil/Iterator.h ../../include/IceUtil/ScopedArray.h ../../include/IceUtil/DisableWarnings.h
@@ -79,7 +79,7 @@ TcpEndpointI$(OBJEXT): TcpEndpointI.cpp ../Ice/TcpEndpointI.h ../Ice/EndpointI.h
TcpTransceiver$(OBJEXT): TcpTransceiver.cpp ../Ice/TcpTransceiver.h ../../include/Ice/InstanceF.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/StatsF.h ../Ice/Transceiver.h ../Ice/TransceiverF.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/RecMutex.h ../../include/Ice/CommunicatorF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../../include/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/PluginF.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../../include/Ice/StreamF.h ../../include/Ice/StringConverter.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../Ice/SharedContext.h ../Ice/ImplicitContextI.h ../../include/Ice/ImplicitContext.h ../../include/Ice/LocalException.h ../Ice/TraceLevels.h ../../include/Ice/LoggerUtil.h ../../include/Ice/Stats.h ../../include/Ice/Buffer.h ../Ice/Network.h
ThreadPool$(OBJEXT): ThreadPool.cpp ../../include/IceUtil/DisableWarnings.h ../Ice/ThreadPool.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../../include/IceUtil/Monitor.h ../../include/IceUtil/Cond.h ../../include/IceUtil/Time.h ../../include/IceUtil/Thread.h ../../include/IceUtil/Handle.h ../Ice/ThreadPoolF.h ../../include/Ice/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/InstanceF.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/PropertiesF.h ../Ice/EventHandlerF.h ../Ice/EventHandler.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/Ice/StringConverter.h ../../include/IceUtil/Unicode.h ../Ice/Network.h ../../include/Ice/LocalException.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/BuiltinSequences.h ../Ice/Instance.h ../../include/IceUtil/RecMutex.h ../../include/Ice/StatsF.h ../Ice/TraceLevelsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ConnectionFactoryF.h ../../include/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/PluginF.h ../../include/Ice/Initialize.h ../Ice/SharedContext.h ../Ice/ImplicitContextI.h ../../include/Ice/ImplicitContext.h ../../include/Ice/LoggerUtil.h ../../include/Ice/Functional.h ../../include/IceUtil/Functional.h ../Ice/ObjectAdapterFactory.h ../Ice/ObjectAdapterI.h ../../include/Ice/ObjectAdapter.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../../include/Ice/ServantLocatorF.h ../../include/Ice/RouterF.h ../../include/Ice/LocatorF.h ../../include/Ice/FacetMap.h ../../include/Ice/ServantManagerF.h ../../include/Ice/Process.h ../../include/Ice/Outgoing.h ../../include/Ice/OutgoingAsync.h ../../include/Ice/Incoming.h ../../include/Ice/Direct.h ../../include/Ice/Properties.h
TraceLevels$(OBJEXT): TraceLevels.cpp ../Ice/TraceLevels.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../Ice/TraceLevelsF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/PropertiesF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/Properties.h ../../include/Ice/Proxy.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/BuiltinSequences.h
-TraceUtil$(OBJEXT): TraceUtil.cpp ../../include/IceUtil/StaticMutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../../include/IceUtil/StringUtil.h ../Ice/TraceUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/IceUtil/Shared.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/UndefSysMacros.h ../Ice/TraceLevelsF.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/RecMutex.h ../../include/Ice/InstanceF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/StatsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../../include/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/PluginF.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../../include/Ice/StreamF.h ../../include/Ice/StringConverter.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../Ice/SharedContext.h ../Ice/ImplicitContextI.h ../../include/Ice/ImplicitContext.h ../../include/Ice/LocalException.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../Ice/TraceLevels.h ../../include/Ice/Logger.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/IceUtil/Unicode.h
+TraceUtil$(OBJEXT): TraceUtil.cpp ../../include/IceUtil/StaticMutex.h ../../include/IceUtil/Config.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/IceUtil/Exception.h ../../include/IceUtil/StringUtil.h ../Ice/TraceUtil.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/IceUtil/Shared.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/UndefSysMacros.h ../Ice/TraceLevelsF.h ../Ice/Instance.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/RecMutex.h ../../include/Ice/InstanceF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/StatsF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../../include/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/PluginF.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../../include/Ice/StreamF.h ../../include/Ice/StringConverter.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../Ice/SharedContext.h ../Ice/ImplicitContextI.h ../../include/Ice/ImplicitContext.h ../../include/Ice/LocalException.h ../../include/Ice/Object.h ../../include/Ice/IncomingAsyncF.h ../Ice/TraceLevels.h ../../include/Ice/Logger.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/IceUtil/Unicode.h ../Ice/ReplyStatus.h
Transceiver$(OBJEXT): Transceiver.cpp ../Ice/Transceiver.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../Ice/TransceiverF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h
UdpEndpointI$(OBJEXT): UdpEndpointI.cpp ../Ice/UdpEndpointI.h ../Ice/EndpointI.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/Endpoint.h ../../include/Ice/LocalObjectF.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/EndpointIF.h ../../include/Ice/InstanceF.h ../Ice/TransceiverF.h ../Ice/ConnectorF.h ../Ice/AcceptorF.h ../../include/Ice/EndpointFactory.h ../../include/Ice/EndpointFactoryF.h ../Ice/Network.h ../Ice/UdpTransceiver.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/StatsF.h ../Ice/Transceiver.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../../include/Ice/BasicStream.h ../../include/Ice/ObjectFactoryF.h ../../include/Ice/Buffer.h ../../include/Ice/Protocol.h ../../include/Ice/StringConverter.h ../../include/IceUtil/Unicode.h ../../include/Ice/LocalException.h ../../include/Ice/Proxy.h ../../include/Ice/ProxyFactoryF.h ../../include/Ice/ConnectionIF.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../../include/Ice/StreamF.h ../../include/Ice/CommunicatorF.h ../../include/Ice/BuiltinSequences.h ../Ice/Instance.h ../../include/IceUtil/RecMutex.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../../include/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/PluginF.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../Ice/SharedContext.h ../Ice/ImplicitContextI.h ../../include/Ice/ImplicitContext.h ../Ice/DefaultsAndOverrides.h
UdpTransceiver$(OBJEXT): UdpTransceiver.cpp ../Ice/UdpTransceiver.h ../../include/Ice/InstanceF.h ../../include/IceUtil/Shared.h ../../include/IceUtil/Config.h ../../include/Ice/Handle.h ../../include/IceUtil/Handle.h ../../include/IceUtil/Exception.h ../../include/Ice/Config.h ../../include/Ice/ProxyHandle.h ../Ice/TraceLevelsF.h ../../include/Ice/LoggerF.h ../../include/Ice/LocalObjectF.h ../../include/Ice/ProxyF.h ../../include/Ice/ObjectF.h ../../include/Ice/GCCountMap.h ../../include/Ice/GCShared.h ../../include/Ice/Exception.h ../../include/Ice/LocalObject.h ../../include/Ice/UndefSysMacros.h ../../include/Ice/StatsF.h ../Ice/Transceiver.h ../Ice/TransceiverF.h ../../include/IceUtil/Mutex.h ../../include/IceUtil/Lock.h ../../include/IceUtil/ThreadException.h ../Ice/Instance.h ../../include/IceUtil/RecMutex.h ../../include/Ice/CommunicatorF.h ../Ice/DefaultsAndOverridesF.h ../Ice/RouterInfoF.h ../Ice/LocatorInfoF.h ../Ice/ReferenceFactoryF.h ../../include/Ice/ProxyFactoryF.h ../Ice/ThreadPoolF.h ../../include/Ice/ConnectionFactoryF.h ../../include/Ice/ConnectionMonitorF.h ../Ice/ObjectFactoryManagerF.h ../../include/Ice/ObjectAdapterFactoryF.h ../Ice/EndpointFactoryManagerF.h ../../include/Ice/DynamicLibraryF.h ../../include/Ice/PluginF.h ../../include/Ice/Initialize.h ../../include/Ice/PropertiesF.h ../../include/Ice/StreamF.h ../../include/Ice/StringConverter.h ../../include/Ice/BuiltinSequences.h ../../include/Ice/Proxy.h ../../include/Ice/ConnectionIF.h ../../include/Ice/EndpointIF.h ../../include/Ice/Endpoint.h ../../include/Ice/ObjectAdapterF.h ../../include/Ice/ReferenceF.h ../../include/Ice/OutgoingAsyncF.h ../../include/Ice/Current.h ../../include/Ice/ConnectionF.h ../../include/Ice/Identity.h ../Ice/SharedContext.h ../Ice/ImplicitContextI.h ../../include/Ice/ImplicitContext.h ../../include/Ice/LocalException.h ../Ice/TraceLevels.h ../../include/Ice/LoggerUtil.h ../../include/Ice/Stats.h ../../include/Ice/Buffer.h ../Ice/Network.h ../../include/Ice/Properties.h
diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp
index 9ce268cc550..d9df8439f36 100644
--- a/cpp/src/Ice/Incoming.cpp
+++ b/cpp/src/Ice/Incoming.cpp
@@ -20,6 +20,7 @@
#include <Ice/Properties.h>
#include <Ice/LoggerUtil.h>
#include <Ice/Protocol.h>
+#include <Ice/ReplyStatus.h>
#include <IceUtil/StringUtil.h>
using namespace std;
@@ -122,18 +123,18 @@ IceInternal::IncomingBase::__handleException(const Ice::Exception& ex)
if(_response)
{
_os.endWriteEncaps();
- _os.b.resize(headerSize + 4); // Dispatch status position.
+ _os.b.resize(headerSize + 4); // Reply status position.
if(dynamic_cast<ObjectNotExistException*>(&ex))
{
- _os.write(static_cast<Byte>(DispatchObjectNotExist));
+ _os.write(replyObjectNotExist);
}
else if(dynamic_cast<FacetNotExistException*>(&ex))
{
- _os.write(static_cast<Byte>(DispatchFacetNotExist));
+ _os.write(replyFacetNotExist);
}
else if(dynamic_cast<OperationNotExistException*>(&ex))
{
- _os.write(static_cast<Byte>(DispatchOperationNotExist));
+ _os.write(replyOperationNotExist);
}
else
{
@@ -173,8 +174,8 @@ IceInternal::IncomingBase::__handleException(const Ice::Exception& ex)
if(_response)
{
_os.endWriteEncaps();
- _os.b.resize(headerSize + 4); // Dispatch status position.
- _os.write(static_cast<Byte>(DispatchUnknownLocalException));
+ _os.b.resize(headerSize + 4); // Reply status position.
+ _os.write(replyUnknownLocalException);
_os.write(ex.unknown, false);
_connection->sendResponse(&_os, _compress);
}
@@ -193,8 +194,8 @@ IceInternal::IncomingBase::__handleException(const Ice::Exception& ex)
if(_response)
{
_os.endWriteEncaps();
- _os.b.resize(headerSize + 4); // Dispatch status position.
- _os.write(static_cast<Byte>(DispatchUnknownUserException));
+ _os.b.resize(headerSize + 4); // Reply status position.
+ _os.write(replyUnknownUserException);
_os.write(ex.unknown, false);
_connection->sendResponse(&_os, _compress);
}
@@ -213,8 +214,8 @@ IceInternal::IncomingBase::__handleException(const Ice::Exception& ex)
if(_response)
{
_os.endWriteEncaps();
- _os.b.resize(headerSize + 4); // Dispatch status position.
- _os.write(static_cast<Byte>(DispatchUnknownException));
+ _os.b.resize(headerSize + 4); // Reply status position.
+ _os.write(replyUnknownException);
_os.write(ex.unknown, false);
_connection->sendResponse(&_os, _compress);
}
@@ -233,8 +234,8 @@ IceInternal::IncomingBase::__handleException(const Ice::Exception& ex)
if(_response)
{
_os.endWriteEncaps();
- _os.b.resize(headerSize + 4); // Dispatch status position.
- _os.write(static_cast<Byte>(DispatchUnknownLocalException));
+ _os.b.resize(headerSize + 4); // Reply status position.
+ _os.write(replyUnknownLocalException);
ostringstream str;
str << ex;
_os.write(str.str(), false);
@@ -255,8 +256,8 @@ IceInternal::IncomingBase::__handleException(const Ice::Exception& ex)
if(_response)
{
_os.endWriteEncaps();
- _os.b.resize(headerSize + 4); // Dispatch status position.
- _os.write(static_cast<Byte>(DispatchUnknownUserException));
+ _os.b.resize(headerSize + 4); // Reply status position.
+ _os.write(replyUnknownUserException);
ostringstream str;
str << ex;
_os.write(str.str(), false);
@@ -277,8 +278,8 @@ IceInternal::IncomingBase::__handleException(const Ice::Exception& ex)
if(_response)
{
_os.endWriteEncaps();
- _os.b.resize(headerSize + 4); // Dispatch status position.
- _os.write(static_cast<Byte>(DispatchUnknownException));
+ _os.b.resize(headerSize + 4); // Reply status position.
+ _os.write(replyUnknownException);
ostringstream str;
str << ex;
_os.write(str.str(), false);
@@ -302,8 +303,8 @@ IceInternal::IncomingBase::__handleException(const std::exception& ex)
if(_response)
{
_os.endWriteEncaps();
- _os.b.resize(headerSize + 4); // Dispatch status position.
- _os.write(static_cast<Byte>(DispatchUnknownException));
+ _os.b.resize(headerSize + 4); // Reply status position.
+ _os.write(replyUnknownException);
ostringstream str;
str << "std::exception: " << ex.what();
_os.write(str.str(), false);
@@ -326,8 +327,8 @@ IceInternal::IncomingBase::__handleException()
if(_response)
{
_os.endWriteEncaps();
- _os.b.resize(headerSize + 4); // Dispatch status position.
- _os.write(static_cast<Byte>(DispatchUnknownException));
+ _os.b.resize(headerSize + 4); // Reply status position.
+ _os.write(replyUnknownException);
string reason = "unknown c++ exception";
_os.write(reason, false);
_connection->sendResponse(&_os, _compress);
@@ -461,13 +462,15 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager)
if(_response)
{
- assert(_os.b.size() == headerSize + 4); // Dispatch status position.
+ assert(_os.b.size() == headerSize + 4); // Reply status position.
_os.write(static_cast<Byte>(0));
_os.startWriteEncaps();
}
// Initialize status to some value, to keep the compiler happy.
- DispatchStatus status = DispatchOK;
+ Ice::Byte replyStatus = replyOK;
+
+ DispatchStatus dispatchStatus = DispatchOK;
//
// Don't put the code above into the try block below. Exceptions
@@ -499,21 +502,25 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager)
{
if(servantManager && servantManager->hasServant(_current.id))
{
- status = DispatchFacetNotExist;
+ replyStatus = replyFacetNotExist;
}
else
{
- status = DispatchObjectNotExist;
+ replyStatus = replyObjectNotExist;
}
}
else
{
- status = _servant->__dispatch(*this, _current);
+ dispatchStatus = _servant->__dispatch(*this, _current);
+ if(dispatchStatus == DispatchUserException)
+ {
+ replyStatus = replyUserException;
+ }
}
}
catch(...)
{
- if(_locator && _servant && status != DispatchAsync)
+ if(_locator && _servant && dispatchStatus != DispatchAsync)
{
_locator->finished(_current, _servant, _cookie);
}
@@ -521,7 +528,7 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager)
throw;
}
- if(_locator && _servant && status != DispatchAsync)
+ if(_locator && _servant && dispatchStatus != DispatchAsync)
{
_locator->finished(_current, _servant, _cookie);
}
@@ -557,7 +564,7 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager)
// DispatchAsync is "pseudo dispatch status", used internally only
// to indicate async dispatch.
//
- if(status == DispatchAsync)
+ if(dispatchStatus == DispatchAsync)
{
//
// If this was an asynchronous dispatch, we're done here.
@@ -569,14 +576,13 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager)
{
_os.endWriteEncaps();
- if(status != DispatchOK && status != DispatchUserException)
+ if(replyStatus != replyOK && replyStatus != replyUserException)
{
- assert(status == DispatchObjectNotExist ||
- status == DispatchFacetNotExist ||
- status == DispatchOperationNotExist);
+ assert(replyStatus == replyObjectNotExist ||
+ replyStatus == replyFacetNotExist);
- _os.b.resize(headerSize + 4); // Dispatch status position.
- _os.write(static_cast<Byte>(status));
+ _os.b.resize(headerSize + 4); // Reply status position.
+ _os.write(replyStatus);
_current.id.__write(&_os);
@@ -596,7 +602,7 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager)
}
else
{
- *(_os.b.begin() + headerSize + 4) = static_cast<Byte>(status); // Dispatch status position.
+ *(_os.b.begin() + headerSize + 4) = replyStatus; // Reply status position.
}
_connection->sendResponse(&_os, _compress);
diff --git a/cpp/src/Ice/IncomingAsync.cpp b/cpp/src/Ice/IncomingAsync.cpp
index 92412a9759f..70a9218e6fc 100644
--- a/cpp/src/Ice/IncomingAsync.cpp
+++ b/cpp/src/Ice/IncomingAsync.cpp
@@ -15,6 +15,7 @@
#include <Ice/Protocol.h>
#include <Ice/Instance.h>
#include <Ice/Properties.h>
+#include <Ice/ReplyStatus.h>
#include <IceUtil/StaticMutex.h>
using namespace std;
@@ -74,11 +75,11 @@ IceInternal::IncomingAsync::__response(bool ok)
if(ok)
{
- *(_os.b.begin() + headerSize + 4) = static_cast<Byte>(DispatchOK);
+ *(_os.b.begin() + headerSize + 4) = replyOK;
}
else
{
- *(_os.b.begin() + headerSize + 4) = static_cast<Byte>(DispatchUserException);
+ *(_os.b.begin() + headerSize + 4) = replyUserException;
}
_connection->sendResponse(&_os, _compress);
diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp
index 18bc62cf633..5295d6033ed 100644
--- a/cpp/src/Ice/Object.cpp
+++ b/cpp/src/Ice/Object.cpp
@@ -201,7 +201,7 @@ Ice::Object::__dispatch(Incoming& in, const Current& current)
if(r.first == r.second)
{
- return DispatchOperationNotExist;
+ throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
}
switch(r.first - __all)
@@ -225,7 +225,7 @@ Ice::Object::__dispatch(Incoming& in, const Current& current)
}
assert(false);
- return DispatchOperationNotExist;
+ throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
}
DispatchStatus
diff --git a/cpp/src/Ice/Outgoing.cpp b/cpp/src/Ice/Outgoing.cpp
index 0d1e125ec8d..d2c70989e72 100644
--- a/cpp/src/Ice/Outgoing.cpp
+++ b/cpp/src/Ice/Outgoing.cpp
@@ -15,6 +15,7 @@
#include <Ice/LocalException.h>
#include <Ice/Protocol.h>
#include <Ice/Instance.h>
+#include <Ice/ReplyStatus.h>
using namespace std;
using namespace Ice;
@@ -321,12 +322,12 @@ IceInternal::Outgoing::finished(BasicStream& is)
assert(_state <= StateInProgress);
_is.swap(is);
- Byte status;
- _is.read(status);
+ Byte replyStatus;
+ _is.read(replyStatus);
- switch(static_cast<DispatchStatus>(status))
+ switch(replyStatus)
{
- case DispatchOK:
+ case replyOK:
{
//
// Input and output parameters are always sent in an
@@ -338,7 +339,7 @@ IceInternal::Outgoing::finished(BasicStream& is)
break;
}
- case DispatchUserException:
+ case replyUserException:
{
//
// Input and output parameters are always sent in an
@@ -350,9 +351,9 @@ IceInternal::Outgoing::finished(BasicStream& is)
break;
}
- case DispatchObjectNotExist:
- case DispatchFacetNotExist:
- case DispatchOperationNotExist:
+ case replyObjectNotExist:
+ case replyFacetNotExist:
+ case replyOperationNotExist:
{
//
// Don't read the exception members directly into the
@@ -381,21 +382,21 @@ IceInternal::Outgoing::finished(BasicStream& is)
_is.read(operation, false);
RequestFailedException* ex;
- switch(static_cast<DispatchStatus>(status))
+ switch(replyStatus)
{
- case DispatchObjectNotExist:
+ case replyObjectNotExist:
{
ex = new ObjectNotExistException(__FILE__, __LINE__);
break;
}
- case DispatchFacetNotExist:
+ case replyFacetNotExist:
{
ex = new FacetNotExistException(__FILE__, __LINE__);
break;
}
- case DispatchOperationNotExist:
+ case replyOperationNotExist:
{
ex = new OperationNotExistException(__FILE__, __LINE__);
break;
@@ -418,9 +419,9 @@ IceInternal::Outgoing::finished(BasicStream& is)
break;
}
- case DispatchUnknownException:
- case DispatchUnknownLocalException:
- case DispatchUnknownUserException:
+ case replyUnknownException:
+ case replyUnknownLocalException:
+ case replyUnknownUserException:
{
//
// Don't read the exception members directly into the
@@ -431,21 +432,21 @@ IceInternal::Outgoing::finished(BasicStream& is)
_is.read(unknown, false);
UnknownException* ex;
- switch(static_cast<DispatchStatus>(status))
+ switch(replyStatus)
{
- case DispatchUnknownException:
+ case replyUnknownException:
{
ex = new UnknownException(__FILE__, __LINE__);
break;
}
- case DispatchUnknownLocalException:
+ case replyUnknownLocalException:
{
ex = new UnknownLocalException(__FILE__, __LINE__);
break;
}
- case DispatchUnknownUserException:
+ case replyUnknownUserException:
{
ex = new UnknownUserException(__FILE__, __LINE__);
break;
diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp
index 065ebe7c334..88f51469587 100644
--- a/cpp/src/Ice/OutgoingAsync.cpp
+++ b/cpp/src/Ice/OutgoingAsync.cpp
@@ -20,6 +20,7 @@
#include <Ice/RouterInfo.h>
#include <Ice/Outgoing.h> // For LocalExceptionWrapper.
#include <Ice/Protocol.h>
+#include <Ice/ReplyStatus.h>
#include <Ice/ImplicitContextI.h>
using namespace std;
@@ -47,28 +48,26 @@ IceInternal::OutgoingAsync::__finished(BasicStream& is)
{
IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(_monitor);
- DispatchStatus status;
+ Ice::Byte replyStatus;
try
{
- __is->swap(is);
-
- Byte b;
- __is->read(b);
- status = static_cast<DispatchStatus>(b);
+ __is->swap(is);
+ __is->read(replyStatus);
+
- switch(status)
+ switch(replyStatus)
{
- case DispatchOK:
- case DispatchUserException:
+ case replyOK:
+ case replyUserException:
{
__is->startReadEncaps();
break;
}
- case DispatchObjectNotExist:
- case DispatchFacetNotExist:
- case DispatchOperationNotExist:
+ case replyObjectNotExist:
+ case replyFacetNotExist:
+ case replyOperationNotExist:
{
Identity ident;
ident.__read(__is);
@@ -92,21 +91,21 @@ IceInternal::OutgoingAsync::__finished(BasicStream& is)
__is->read(operation, false);
auto_ptr<RequestFailedException> ex;
- switch(static_cast<DispatchStatus>(status))
+ switch(replyStatus)
{
- case DispatchObjectNotExist:
+ case replyObjectNotExist:
{
ex.reset(new ObjectNotExistException(__FILE__, __LINE__));
break;
}
- case DispatchFacetNotExist:
+ case replyFacetNotExist:
{
ex.reset(new FacetNotExistException(__FILE__, __LINE__));
break;
}
- case DispatchOperationNotExist:
+ case replyOperationNotExist:
{
ex.reset(new OperationNotExistException(__FILE__, __LINE__));
break;
@@ -125,29 +124,29 @@ IceInternal::OutgoingAsync::__finished(BasicStream& is)
ex->ice_throw();
}
- case DispatchUnknownException:
- case DispatchUnknownLocalException:
- case DispatchUnknownUserException:
+ case replyUnknownException:
+ case replyUnknownLocalException:
+ case replyUnknownUserException:
{
string unknown;
__is->read(unknown, false);
auto_ptr<UnknownException> ex;
- switch(static_cast<DispatchStatus>(status))
+ switch(replyStatus)
{
- case DispatchUnknownException:
+ case replyUnknownException:
{
ex.reset(new UnknownException(__FILE__, __LINE__));
break;
}
- case DispatchUnknownLocalException:
+ case replyUnknownLocalException:
{
ex.reset(new UnknownLocalException(__FILE__, __LINE__));
break;
}
- case DispatchUnknownUserException:
+ case replyUnknownUserException:
{
ex.reset(new UnknownUserException(__FILE__, __LINE__));
break;
@@ -176,11 +175,11 @@ IceInternal::OutgoingAsync::__finished(BasicStream& is)
return;
}
- assert(status == DispatchOK || status == DispatchUserException);
+ assert(replyStatus == replyOK || replyStatus == replyUserException);
try
{
- __response(status == DispatchOK);
+ __response(replyStatus == replyOK);
}
catch(const Exception& ex)
{
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
index d6437698838..b4b52b5b155 100644
--- a/cpp/src/Ice/Proxy.cpp
+++ b/cpp/src/Ice/Proxy.cpp
@@ -1311,16 +1311,42 @@ IceDelegateM::Ice::Object::setup(const ReferencePtr& ref)
bool
IceDelegateD::Ice::Object::ice_isA(const string& __id, const Context* context)
-{
+{
+ class DirectI : public Direct
+ {
+ public:
+
+ DirectI(bool& __result, const string& __id, const Current& __current) :
+ Direct(__current),
+ _result(__result),
+ _id(__id)
+ {
+ }
+
+ virtual ICE_API ::Ice::DispatchStatus
+ run(::Ice::Object* object)
+ {
+ _result = object->ice_isA(_id, _current);
+ return DispatchOK;
+ }
+
+ private:
+
+ bool& _result;
+ const string& _id;
+ };
+
Current __current;
__initCurrent(__current, "ice_isA", ::Ice::Nonmutating, context);
- while(true)
+ bool __result;
+
+ try
{
- Direct __direct(__current);
- bool __ret;
+ DirectI __direct(__result, __id, __current);
+
try
{
- __ret = __direct.servant()->ice_isA(__id, __current);
+ __direct.servant()->__collocDispatch(__direct);
}
catch(...)
{
@@ -1328,22 +1354,44 @@ IceDelegateD::Ice::Object::ice_isA(const string& __id, const Context* context)
throw;
}
__direct.destroy();
- return __ret;
}
- return false; // To keep the Visual C++ compiler happy.
+ catch(const LocalException& __ex)
+ {
+ throw LocalExceptionWrapper(__ex, false);
+ }
+ return __result;
}
void
IceDelegateD::Ice::Object::ice_ping(const ::Ice::Context* context)
{
+ class DirectI : public Direct
+ {
+ public:
+
+ DirectI(const Current& __current) :
+ Direct(__current)
+ {
+ }
+
+ virtual ICE_API ::Ice::DispatchStatus
+ run(::Ice::Object* object)
+ {
+ object->ice_ping(_current);
+ return DispatchOK;
+ }
+ };
+
Current __current;
__initCurrent(__current, "ice_ping", ::Ice::Nonmutating, context);
- while(true)
+
+ try
{
- Direct __direct(__current);
+ DirectI __direct(__current);
+
try
{
- __direct.servant()->ice_ping(__current);
+ __direct.servant()->__collocDispatch(__direct);
}
catch(...)
{
@@ -1351,22 +1399,49 @@ IceDelegateD::Ice::Object::ice_ping(const ::Ice::Context* context)
throw;
}
__direct.destroy();
- return;
+ }
+ catch(const LocalException& __ex)
+ {
+ throw LocalExceptionWrapper(__ex, false);
}
}
vector<string>
IceDelegateD::Ice::Object::ice_ids(const ::Ice::Context* context)
{
+ class DirectI : public Direct
+ {
+ public:
+
+ DirectI(vector<string>& __result, const Current& __current) :
+ Direct(__current),
+ _result(__result)
+ {
+ }
+
+ virtual ICE_API ::Ice::DispatchStatus
+ run(::Ice::Object* object)
+ {
+ _result = object->ice_ids(_current);
+ return DispatchOK;
+ }
+
+ private:
+
+ vector<string>& _result;
+ };
+
Current __current;
__initCurrent(__current, "ice_ids", ::Ice::Nonmutating, context);
- while(true)
+ vector<string> __result;
+
+ try
{
- Direct __direct(__current);
- vector<string> __ret;
+ DirectI __direct(__result, __current);
+
try
{
- __ret = __direct.servant()->ice_ids(__current);
+ __direct.servant()->__collocDispatch(__direct);
}
catch(...)
{
@@ -1374,23 +1449,50 @@ IceDelegateD::Ice::Object::ice_ids(const ::Ice::Context* context)
throw;
}
__direct.destroy();
- return __ret;
}
- return vector<string>(); // To keep the Visual C++ compiler happy.
+ catch(const LocalException& __ex)
+ {
+ throw LocalExceptionWrapper(__ex, false);
+ }
+ return __result;
}
string
IceDelegateD::Ice::Object::ice_id(const ::Ice::Context* context)
{
+ class DirectI : public Direct
+ {
+ public:
+
+ DirectI(string& __result, const Current& __current) :
+ Direct(__current),
+ _result(__result)
+ {
+ }
+
+ virtual ICE_API ::Ice::DispatchStatus
+ run(::Ice::Object* object)
+ {
+ _result = object->ice_id(_current);
+ return DispatchOK;
+ }
+
+ private:
+
+ string& _result;
+ };
+
Current __current;
__initCurrent(__current, "ice_id", ::Ice::Nonmutating, context);
- while(true)
+ string __result;
+
+ try
{
- Direct __direct(__current);
- string __ret;
+ DirectI __direct(__result, __current);
+
try
{
- __ret = __direct.servant()->ice_id(__current);
+ __direct.servant()->__collocDispatch(__direct);
}
catch(...)
{
@@ -1398,9 +1500,12 @@ IceDelegateD::Ice::Object::ice_id(const ::Ice::Context* context)
throw;
}
__direct.destroy();
- return __ret;
}
- return string(); // To keep the Visual C++ compiler happy.
+ catch(const LocalException& __ex)
+ {
+ throw LocalExceptionWrapper(__ex, false);
+ }
+ return __result;
}
bool
diff --git a/cpp/src/Ice/ReplyStatus.h b/cpp/src/Ice/ReplyStatus.h
new file mode 100644
index 00000000000..8a091f43279
--- /dev/null
+++ b/cpp/src/Ice/ReplyStatus.h
@@ -0,0 +1,29 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICE_REQUEST_STATUS_H
+#define ICE_REQUEST_STATUS_H
+
+#include <Ice/Config.h>
+
+namespace IceInternal
+{
+
+static const Ice::Byte replyOK = 0;
+static const Ice::Byte replyUserException = 1;
+static const Ice::Byte replyObjectNotExist = 2;
+static const Ice::Byte replyFacetNotExist = 3;
+static const Ice::Byte replyOperationNotExist = 4;
+static const Ice::Byte replyUnknownLocalException = 5;
+static const Ice::Byte replyUnknownUserException = 6;
+static const Ice::Byte replyUnknownException = 7;
+
+}
+
+#endif
diff --git a/cpp/src/Ice/TraceUtil.cpp b/cpp/src/Ice/TraceUtil.cpp
index cc89bf153ee..cb371f4e35a 100644
--- a/cpp/src/Ice/TraceUtil.cpp
+++ b/cpp/src/Ice/TraceUtil.cpp
@@ -17,6 +17,7 @@
#include <Ice/Logger.h>
#include <Ice/BasicStream.h>
#include <Ice/Protocol.h>
+#include <Ice/ReplyStatus.h>
#include <set>
using namespace std;
@@ -292,42 +293,42 @@ IceInternal::traceReply(const char* heading, const BasicStream& str, const Logge
stream.read(requestId);
s << "\nrequest id = " << requestId;
- Byte status;
- stream.read(status);
- s << "\nreply status = " << static_cast<int>(status) << ' ';
- switch(static_cast<DispatchStatus>(status))
+ Byte replyStatus;
+ stream.read(replyStatus);
+ s << "\nreply status = " << static_cast<int>(replyStatus) << ' ';
+ switch(replyStatus)
{
- case DispatchOK:
+ case replyOK:
{
s << "(ok)";
break;
}
- case DispatchUserException:
+ case replyUserException:
{
s << "(user exception)";
break;
}
- case DispatchObjectNotExist:
- case DispatchFacetNotExist:
- case DispatchOperationNotExist:
+ case replyObjectNotExist:
+ case replyFacetNotExist:
+ case replyOperationNotExist:
{
- switch(static_cast<DispatchStatus>(status))
+ switch(replyStatus)
{
- case DispatchObjectNotExist:
+ case replyObjectNotExist:
{
s << "(object not exist)";
break;
}
- case DispatchFacetNotExist:
+ case replyFacetNotExist:
{
s << "(facet not exist)";
break;
}
- case DispatchOperationNotExist:
+ case replyOperationNotExist:
{
s << "(operation not exist)";
break;
@@ -344,25 +345,25 @@ IceInternal::traceReply(const char* heading, const BasicStream& str, const Logge
break;
}
- case DispatchUnknownException:
- case DispatchUnknownLocalException:
- case DispatchUnknownUserException:
+ case replyUnknownException:
+ case replyUnknownLocalException:
+ case replyUnknownUserException:
{
- switch(static_cast<DispatchStatus>(status))
+ switch(replyStatus)
{
- case DispatchUnknownException:
+ case replyUnknownException:
{
s << "(unknown exception)";
break;
}
- case DispatchUnknownLocalException:
+ case replyUnknownLocalException:
{
s << "(unknown local exception)";
break;
}
- case DispatchUnknownUserException:
+ case replyUnknownUserException:
{
s << "(unknown user exception)";
break;
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index 91aa2cfb134..67af4cfc80d 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -2554,7 +2554,7 @@ Slice::Gen::DelegateDVisitor::visitOperation(const OperationPtr& p)
//
// run
//
- C << nl << nl << "virtual " << _dllExport << "::IceInternal::DispatchStatus";
+ C << nl << nl << "virtual " << _dllExport << "::Ice::DispatchStatus";
C << nl << "run(::Ice::Object* object)";
C << sb;
C << nl << thisPointer << " servant = dynamic_cast< " << thisPointer << ">(object);";
@@ -2580,7 +2580,7 @@ Slice::Gen::DelegateDVisitor::visitOperation(const OperationPtr& p)
C << "_result = ";
}
C << "servant->" << name << spar << argMembers << epar << ';';
- C << nl << "return ::IceInternal::DispatchOK;";
+ C << nl << "return ::Ice::DispatchOK;";
if(!throws.empty())
{
@@ -2599,7 +2599,7 @@ Slice::Gen::DelegateDVisitor::visitOperation(const OperationPtr& p)
C << nl << "catch(const " << fixKwd((*i)->scoped()) << "& e)";
C << sb;
C << nl << "setUserException(e);";
- C << nl << "return ::IceInternal::DispatchUserException;";
+ C << nl << "return ::Ice::DispatchUserException;";
C << eb;
}
}
@@ -2650,7 +2650,7 @@ Slice::Gen::DelegateDVisitor::visitOperation(const OperationPtr& p)
C << sb;
if(!throws.empty())
{
- C << nl << "if(__direct.servant()->__collocDispatch(__direct) == ::IceInternal::DispatchUserException)";
+ C << nl << "if(__direct.servant()->__collocDispatch(__direct) == ::Ice::DispatchUserException)";
C << sb;
C << nl << "__direct.throwUserException();";
C << eb;
@@ -3103,7 +3103,7 @@ Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDefPtr& p)
H << sp;
H << nl
- << "virtual ::IceInternal::DispatchStatus __dispatch(::IceInternal::Incoming&, const ::Ice::Current&);";
+ << "virtual ::Ice::DispatchStatus __dispatch(::IceInternal::Incoming&, const ::Ice::Current&);";
string flatName = p->flattenedScope() + p->name() + "_all";
C << sp;
@@ -3120,7 +3120,7 @@ Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDefPtr& p)
}
C << eb << ';';
C << sp;
- C << nl << "::IceInternal::DispatchStatus" << nl << scoped.substr(2)
+ C << nl << "::Ice::DispatchStatus" << nl << scoped.substr(2)
<< "::__dispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)";
C << sb;
@@ -3129,7 +3129,7 @@ Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDefPtr& p)
<< ", current.operation);";
C << nl << "if(r.first == r.second)";
C << sb;
- C << nl << "return ::IceInternal::DispatchOperationNotExist;";
+ C << nl << "throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);";
C << eb;
C << sp;
C << nl << "switch(r.first - " << flatName << ')';
@@ -3145,7 +3145,7 @@ Slice::Gen::ObjectVisitor::visitClassDefEnd(const ClassDefPtr& p)
C << eb;
C << sp;
C << nl << "assert(false);";
- C << nl << "return ::IceInternal::DispatchOperationNotExist;";
+ C << nl << "throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);";
C << eb;
@@ -3564,11 +3564,11 @@ Slice::Gen::ObjectVisitor::visitOperation(const OperationPtr& p)
if(!cl->isLocal())
{
- H << nl << "::IceInternal::DispatchStatus ___" << name
+ H << nl << "::Ice::DispatchStatus ___" << name
<< "(::IceInternal::Incoming&, const ::Ice::Current&)" << (isConst ? " const" : "") << ';';
C << sp;
- C << nl << "::IceInternal::DispatchStatus" << nl << scope.substr(2) << "___" << name
+ C << nl << "::Ice::DispatchStatus" << nl << scope.substr(2) << "___" << name
<< "(::IceInternal::Incoming&";
if(!paramList.empty() || !p->throws().empty() || ret || amd)
{
@@ -3637,11 +3637,11 @@ Slice::Gen::ObjectVisitor::visitOperation(const OperationPtr& p)
C << nl << "catch(const " << fixKwd((*r)->scoped()) << "& __ex)";
C << sb;
C << nl << "__os->write(__ex);";
- C << nl << "return ::IceInternal::DispatchUserException;";
+ C << nl << "return ::Ice::DispatchUserException;";
C << eb;
}
}
- C << nl << "return ::IceInternal::DispatchOK;";
+ C << nl << "return ::Ice::DispatchOK;";
}
else
{
@@ -3675,7 +3675,7 @@ Slice::Gen::ObjectVisitor::visitOperation(const OperationPtr& p)
C << sb;
C << nl << "__cb->ice_exception();";
C << eb;
- C << nl << "return ::IceInternal::DispatchAsync;";
+ C << nl << "return ::Ice::DispatchAsync;";
}
C << eb;
}
diff --git a/cpp/test/Ice/interceptor/AMDInterceptorI.cpp b/cpp/test/Ice/interceptor/AMDInterceptorI.cpp
index 5387f799bdc..22162b6da0e 100644
--- a/cpp/test/Ice/interceptor/AMDInterceptorI.cpp
+++ b/cpp/test/Ice/interceptor/AMDInterceptorI.cpp
@@ -14,13 +14,13 @@
AMDInterceptorI::AMDInterceptorI(const Ice::ObjectPtr& servant) :
InterceptorI(servant),
_defaultCb(new DispatchInterceptorAsyncCallbackI(*this)),
- _actualStatus(IceInternal::DispatchAsync)
+ _actualStatus(Ice::DispatchAsync)
{
}
-IceInternal::DispatchStatus
+Ice::DispatchStatus
AMDInterceptorI::dispatch(Ice::Request& request)
{
class CallbackI : public Ice::DispatchInterceptorAsyncCallback
@@ -69,7 +69,7 @@ AMDInterceptorI::dispatch(Ice::Request& request)
for(int i = 0; i < 10; ++i)
{
_lastStatus = _servant->ice_dispatch(request, cb);
- test(_lastStatus == IceInternal::DispatchAsync);
+ test(_lastStatus == Ice::DispatchAsync);
}
current.ctx["retry"] = "no";
@@ -80,7 +80,7 @@ AMDInterceptorI::dispatch(Ice::Request& request)
}
void
-AMDInterceptorI::setActualStatus(IceInternal::DispatchStatus status)
+AMDInterceptorI::setActualStatus(Ice::DispatchStatus status)
{
IceUtil::Mutex::Lock lock(_mutex);
_actualStatus = status;
@@ -91,10 +91,10 @@ AMDInterceptorI::setActualStatus(const IceUtil::Exception& e)
{
IceUtil::Mutex::Lock lock(_mutex);
_exception.reset(e.ice_clone());
- _actualStatus = IceInternal::DispatchAsync;
+ _actualStatus = Ice::DispatchAsync;
}
-IceInternal::DispatchStatus
+Ice::DispatchStatus
AMDInterceptorI::getActualStatus() const
{
IceUtil::Mutex::Lock lock(_mutex);
@@ -113,7 +113,7 @@ AMDInterceptorI::clear()
{
InterceptorI::clear();
IceUtil::Mutex::Lock lock(_mutex);
- _actualStatus = IceInternal::DispatchAsync;
+ _actualStatus = Ice::DispatchAsync;
_exception.reset();
}
@@ -126,7 +126,7 @@ DispatchInterceptorAsyncCallbackI::DispatchInterceptorAsyncCallbackI(AMDIntercep
bool
DispatchInterceptorAsyncCallbackI::response(bool ok)
{
- _interceptor.setActualStatus(ok ? IceInternal::DispatchOK : IceInternal::DispatchUserException);
+ _interceptor.setActualStatus(ok ? Ice::DispatchOK : Ice::DispatchUserException);
return true;
}
diff --git a/cpp/test/Ice/interceptor/AMDInterceptorI.h b/cpp/test/Ice/interceptor/AMDInterceptorI.h
index 448bfeac6fe..36aa30f4638 100644
--- a/cpp/test/Ice/interceptor/AMDInterceptorI.h
+++ b/cpp/test/Ice/interceptor/AMDInterceptorI.h
@@ -19,20 +19,20 @@ public:
AMDInterceptorI(const Ice::ObjectPtr&);
- virtual IceInternal::DispatchStatus dispatch(Ice::Request&);
+ virtual Ice::DispatchStatus dispatch(Ice::Request&);
virtual void clear();
- IceInternal::DispatchStatus getActualStatus() const;
+ Ice::DispatchStatus getActualStatus() const;
IceUtil::Exception* getException() const;
- void setActualStatus(IceInternal::DispatchStatus);
+ void setActualStatus(Ice::DispatchStatus);
void setActualStatus(const IceUtil::Exception&);
private:
Ice::DispatchInterceptorAsyncCallbackPtr _defaultCb;
- IceInternal::DispatchStatus _actualStatus;
+ Ice::DispatchStatus _actualStatus;
std::auto_ptr<IceUtil::Exception> _exception;
IceUtil::Mutex _mutex;
diff --git a/cpp/test/Ice/interceptor/Client.cpp b/cpp/test/Ice/interceptor/Client.cpp
index 10528ffc4e0..38bf7de0385 100644
--- a/cpp/test/Ice/interceptor/Client.cpp
+++ b/cpp/test/Ice/interceptor/Client.cpp
@@ -84,12 +84,12 @@ Client::run(const Test::MyObjectPrx& prx, const InterceptorIPtr& interceptor)
test(interceptor->getLastOperation().empty());
test(prx->add(33, 12) == 45);
test(interceptor->getLastOperation() == "add");
- test(interceptor->getLastStatus() == IceInternal::DispatchOK);
+ test(interceptor->getLastStatus() == Ice::DispatchOK);
cout << "ok" << endl;
cout << "testing retry..." << flush;
test(prx->addWithRetry(33, 12) == 45);
test(interceptor->getLastOperation() == "addWithRetry");
- test(interceptor->getLastStatus() == IceInternal::DispatchOK);
+ test(interceptor->getLastStatus() == Ice::DispatchOK);
cout << "ok" << endl;
cout << "testing user exception..." << flush;
try
@@ -102,7 +102,7 @@ Client::run(const Test::MyObjectPrx& prx, const InterceptorIPtr& interceptor)
// expected
}
test(interceptor->getLastOperation() == "badAdd");
- test(interceptor->getLastStatus() == IceInternal::DispatchUserException);
+ test(interceptor->getLastStatus() == Ice::DispatchUserException);
cout << "ok" << endl;
cout << "testing ONE..." << flush;
@@ -140,7 +140,7 @@ Client::run(const Test::MyObjectPrx& prx, const InterceptorIPtr& interceptor)
cout << "testing simple AMD..." << flush;
test(prx->amdAdd(33, 12) == 45);
test(interceptor->getLastOperation() == "amdAdd");
- test(interceptor->getLastStatus() == IceInternal::DispatchAsync);
+ test(interceptor->getLastStatus() == Ice::DispatchAsync);
cout << "ok" << endl;
}
return 0;
@@ -153,14 +153,14 @@ Client::runAmd(const Test::MyObjectPrx& prx, const AMDInterceptorIPtr& intercept
test(interceptor->getLastOperation().empty());
test(prx->amdAdd(33, 12) == 45);
test(interceptor->getLastOperation() == "amdAdd");
- test(interceptor->getLastStatus() == IceInternal::DispatchAsync);
- test(interceptor->getActualStatus() == IceInternal::DispatchOK);
+ test(interceptor->getLastStatus() == Ice::DispatchAsync);
+ test(interceptor->getActualStatus() == Ice::DispatchOK);
cout << "ok" << endl;
cout << "testing retry..." << flush;
test(prx->amdAddWithRetry(33, 12) == 45);
test(interceptor->getLastOperation() == "amdAddWithRetry");
- test(interceptor->getLastStatus() == IceInternal::DispatchAsync);
- test(interceptor->getActualStatus() == IceInternal::DispatchOK);
+ test(interceptor->getLastStatus() == Ice::DispatchAsync);
+ test(interceptor->getActualStatus() == Ice::DispatchOK);
cout << "ok" << endl;
cout << "testing user exception..." << flush;
try
@@ -173,8 +173,8 @@ Client::runAmd(const Test::MyObjectPrx& prx, const AMDInterceptorIPtr& intercept
// expected
}
test(interceptor->getLastOperation() == "amdBadAdd");
- test(interceptor->getLastStatus() == IceInternal::DispatchAsync);
- test(interceptor->getActualStatus() == IceInternal::DispatchUserException);
+ test(interceptor->getLastStatus() == Ice::DispatchAsync);
+ test(interceptor->getActualStatus() == Ice::DispatchUserException);
cout << "ok" << endl;
cout << "testing ONE..." << flush;
interceptor->clear();
@@ -188,8 +188,8 @@ Client::runAmd(const Test::MyObjectPrx& prx, const AMDInterceptorIPtr& intercept
// expected
}
test(interceptor->getLastOperation() == "amdNotExistAdd");
- test(interceptor->getLastStatus() == IceInternal::DispatchAsync);
- test(interceptor->getActualStatus() == IceInternal::DispatchAsync);
+ test(interceptor->getLastStatus() == Ice::DispatchAsync);
+ test(interceptor->getActualStatus() == Ice::DispatchAsync);
test(dynamic_cast<Ice::ObjectNotExistException*>(interceptor->getException()) != 0);
cout << "ok" << endl;
cout << "testing system exception..." << flush;
@@ -204,8 +204,8 @@ Client::runAmd(const Test::MyObjectPrx& prx, const AMDInterceptorIPtr& intercept
test(!prx->ice_isCollocationOptimized());
}
test(interceptor->getLastOperation() == "amdBadSystemAdd");
- test(interceptor->getLastStatus() == IceInternal::DispatchAsync);
- test(interceptor->getActualStatus() == IceInternal::DispatchAsync);
+ test(interceptor->getLastStatus() == Ice::DispatchAsync);
+ test(interceptor->getActualStatus() == Ice::DispatchAsync);
test(dynamic_cast<Ice::InitializationException*>(interceptor->getException()) != 0);
cout << "ok" << endl;
return 0;
diff --git a/cpp/test/Ice/interceptor/InterceptorI.cpp b/cpp/test/Ice/interceptor/InterceptorI.cpp
index 19150e5bbfa..ddd6402737b 100644
--- a/cpp/test/Ice/interceptor/InterceptorI.cpp
+++ b/cpp/test/Ice/interceptor/InterceptorI.cpp
@@ -13,12 +13,12 @@
InterceptorI::InterceptorI(const Ice::ObjectPtr& servant) :
_servant(servant),
- _lastStatus(IceInternal::DispatchAsync)
+ _lastStatus(Ice::DispatchAsync)
{
}
-IceInternal::DispatchStatus
+Ice::DispatchStatus
InterceptorI::dispatch(Ice::Request& request)
{
Ice::Current& current = const_cast<Ice::Current&>(request.getCurrent());
@@ -48,7 +48,7 @@ InterceptorI::dispatch(Ice::Request& request)
return _lastStatus;
}
-IceInternal::DispatchStatus
+Ice::DispatchStatus
InterceptorI::getLastStatus() const
{
return _lastStatus;
@@ -63,6 +63,6 @@ InterceptorI::getLastOperation() const
void
InterceptorI::clear()
{
- _lastStatus = IceInternal::DispatchAsync;
+ _lastStatus = Ice::DispatchAsync;
_lastOperation = "";
}
diff --git a/cpp/test/Ice/interceptor/InterceptorI.h b/cpp/test/Ice/interceptor/InterceptorI.h
index c43f4ec626c..cc771cb1e74 100644
--- a/cpp/test/Ice/interceptor/InterceptorI.h
+++ b/cpp/test/Ice/interceptor/InterceptorI.h
@@ -19,9 +19,9 @@ public:
InterceptorI(const Ice::ObjectPtr&);
- virtual IceInternal::DispatchStatus dispatch(Ice::Request& request);
+ virtual Ice::DispatchStatus dispatch(Ice::Request& request);
- IceInternal::DispatchStatus getLastStatus() const;
+ Ice::DispatchStatus getLastStatus() const;
const std::string& getLastOperation() const;
virtual void clear();
@@ -29,7 +29,7 @@ public:
protected:
const Ice::ObjectPtr _servant;
std::string _lastOperation;
- IceInternal::DispatchStatus _lastStatus;
+ Ice::DispatchStatus _lastStatus;
};
typedef IceUtil::Handle<InterceptorI> InterceptorIPtr;
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 20:27:01 +0000