diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2005-09-21 14:02:52 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2005-09-21 14:02:52 +0000 |
| commit | fed698d7a15486e1c01ee4e7eafe3da45d7cd803 (patch) | |
| tree | 5013a1127805e438bc76dc8f4b2f49a1c2461fea /cpp/src/IceGrid/ServerAdapterI.h | |
| parent | Fix (diff) | |
| download | ice-fed698d7a15486e1c01ee4e7eafe3da45d7cd803.tar.bz2 ice-fed698d7a15486e1c01ee4e7eafe3da45d7cd803.tar.xz ice-fed698d7a15486e1c01ee4e7eafe3da45d7cd803.zip | |
Improved the error message if you try to remove an object or adapter with
the admin interface and if that object or adapter was added with a
deployment descriptor.
Fixed a bug where trying to start a server managed by a node would fail if
this server was previously manually activated.
Simplified adapter direct proxy update if the adapter is an adapter that
wasn't added with a deployment descriptor.
Fixes to allow compilation on AIX.
Diffstat (limited to 'cpp/src/IceGrid/ServerAdapterI.h')
| -rw-r--r-- | cpp/src/IceGrid/ServerAdapterI.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/ServerAdapterI.h b/cpp/src/IceGrid/ServerAdapterI.h index 54240c879de..f0b2d9740ec 100644 --- a/cpp/src/IceGrid/ServerAdapterI.h +++ b/cpp/src/IceGrid/ServerAdapterI.h @@ -31,7 +31,7 @@ public: virtual void activate_async(const AMD_Adapter_activatePtr& cb, const Ice::Current&); virtual Ice::ObjectPrx getDirectProxy(const Ice::Current& = Ice::Current()) const; - virtual void setDirectProxy(const ::Ice::ObjectPrx&, const ::Ice::Current&); + virtual void setDirectProxy(const ::Ice::ObjectPrx&, const ::Ice::Current& = Ice::Current()); virtual void destroy(const ::Ice::Current&); void activationFailed(bool); |