diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2005-01-24 17:28:02 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2005-01-24 17:28:02 +0000 |
| commit | fcd560e9fb2ddd60e4122407b0abfe69c850b2bc (patch) | |
| tree | 015a70f34ef4a74737d064345f9fcc8e6c6b3af0 /cpp/src | |
| parent | Better support for slow server activation and IcePack registry timeout. (diff) | |
| download | ice-fcd560e9fb2ddd60e4122407b0abfe69c850b2bc.tar.bz2 ice-fcd560e9fb2ddd60e4122407b0abfe69c850b2bc.tar.xz ice-fcd560e9fb2ddd60e4122407b0abfe69c850b2bc.zip | |
Win32 fixes
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IcePack/LocatorI.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/IcePack/ServerAdapterI.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/IcePack/LocatorI.cpp b/cpp/src/IcePack/LocatorI.cpp index 4a245b79d28..6c78c23f400 100644 --- a/cpp/src/IcePack/LocatorI.cpp +++ b/cpp/src/IcePack/LocatorI.cpp @@ -289,7 +289,7 @@ LocatorI::getDirectProxyException(const AdapterPrx& adapter, const string& id, c } } } - catch(const Ice::ObjectNotExistException& ex) + catch(const Ice::ObjectNotExistException&) { // // Expected if the adapter is destroyed, if that's the case, we remove it from the adapter registry. diff --git a/cpp/src/IcePack/ServerAdapterI.cpp b/cpp/src/IcePack/ServerAdapterI.cpp index 5ca0754d4fc..935ddaa1f03 100644 --- a/cpp/src/IcePack/ServerAdapterI.cpp +++ b/cpp/src/IcePack/ServerAdapterI.cpp @@ -176,7 +176,7 @@ ServerAdapterI::getDirectProxy(const Ice::Current& current) const AdapterNotActiveException ex; ServerState state = svr->getState(); ex.activatable = svr->getActivationMode() == OnDemand || state == Activating || state == Active; - ex.timeout = _waitTime.toMilliSeconds(); + ex.timeout = static_cast<int>(_waitTime.toMilliSeconds()); throw ex; } } |