diff options
Diffstat (limited to 'cppe/src')
| -rw-r--r-- | cppe/src/IceE/Instance.cpp | 6 | ||||
| -rwxr-xr-x | cppe/src/IceE/OutgoingConnectionFactory.h | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/cppe/src/IceE/Instance.cpp b/cppe/src/IceE/Instance.cpp index 0c9dcb8810a..5b54939578a 100644 --- a/cppe/src/IceE/Instance.cpp +++ b/cppe/src/IceE/Instance.cpp @@ -558,6 +558,12 @@ IceInternal::Instance::destroy() { _outgoingConnectionFactory->waitUntilFinished(); } +#else + if(_outgoingConnectionFactory) + { + _outgoingConnectionFactory->destroy(); + _outgoingConnectionFactory->waitUntilFinished(); + } #endif { diff --git a/cppe/src/IceE/OutgoingConnectionFactory.h b/cppe/src/IceE/OutgoingConnectionFactory.h index 2448da694ac..a29d398e829 100755 --- a/cppe/src/IceE/OutgoingConnectionFactory.h +++ b/cppe/src/IceE/OutgoingConnectionFactory.h @@ -15,7 +15,9 @@ #include <IceE/InstanceF.h> #include <IceE/ObjectAdapterF.h> #include <IceE/EndpointF.h> -#include <IceE/RouterF.h> +#ifndef ICEE_NO_ROUTER +# include <IceE/RouterF.h> +#endif #include <IceE/Mutex.h> #include <IceE/Monitor.h> #include <set> |