diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-10-17 11:28:48 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-10-17 11:28:48 +0200 |
| commit | e85fcf92f2af54b0add679e19262a42f92fedc92 (patch) | |
| tree | f65b3f5251addf661c63665ea5d7bc6a0b2e5a20 /cpp/src/IceGrid/ServerCache.h | |
| parent | Fixed (ICE-5752) - faultTolerance OS X 10.10 failures with SSL (diff) | |
| download | ice-e85fcf92f2af54b0add679e19262a42f92fedc92.tar.bz2 ice-e85fcf92f2af54b0add679e19262a42f92fedc92.tar.xz ice-e85fcf92f2af54b0add679e19262a42f92fedc92.zip | |
Fixed ICE-5518: allows saving application with no-restart when removing stopped server
Diffstat (limited to 'cpp/src/IceGrid/ServerCache.h')
| -rw-r--r-- | cpp/src/IceGrid/ServerCache.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/IceGrid/ServerCache.h b/cpp/src/IceGrid/ServerCache.h index d9b239d20e8..3429ebd4f59 100644 --- a/cpp/src/IceGrid/ServerCache.h +++ b/cpp/src/IceGrid/ServerCache.h @@ -37,7 +37,7 @@ class CheckUpdateResult : public IceUtil::Shared { public: - CheckUpdateResult(const std::string&, const std::string&, bool, const Ice::AsyncResultPtr&); + CheckUpdateResult(const std::string&, const std::string&, bool, bool, const Ice::AsyncResultPtr&); bool getResult(); @@ -75,7 +75,7 @@ public: void update(const ServerInfo&, bool); - void destroy(); + void destroy(bool); ServerInfo getInfo(bool = false) const; std::string getId() const; @@ -143,7 +143,7 @@ public: ServerEntryPtr add(const ServerInfo&, bool); ServerEntryPtr get(const std::string&) const; bool has(const std::string&) const; - ServerEntryPtr remove(const std::string&, bool = true); + ServerEntryPtr remove(const std::string&, bool = true, bool = false); void clear(const std::string&); |