diff options
| author | Jose <jose@zeroc.com> | 2016-02-29 18:04:18 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-02-29 18:04:18 +0100 |
| commit | 97554afcad548fcac64d399fd2e05af49ffcba12 (patch) | |
| tree | 6916a256775181b7674f39ad7b3f3eeaa1fdfa62 /cpp/src/Ice/Instance.h | |
| parent | ICE-6952 - identityToString/stringToIdentity non member functions (diff) | |
| download | ice-97554afcad548fcac64d399fd2e05af49ffcba12.tar.bz2 ice-97554afcad548fcac64d399fd2e05af49ffcba12.tar.xz ice-97554afcad548fcac64d399fd2e05af49ffcba12.zip | |
Rework previous fix for 3.6 compatibility
Diffstat (limited to 'cpp/src/Ice/Instance.h')
| -rw-r--r-- | cpp/src/Ice/Instance.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/cpp/src/Ice/Instance.h b/cpp/src/Ice/Instance.h index 40b766d14ee..a6e9182b136 100644 --- a/cpp/src/Ice/Instance.h +++ b/cpp/src/Ice/Instance.h @@ -113,6 +113,8 @@ public: bool collectObjects() const { return _collectObjects; } const ACMConfig& clientACM() const; const ACMConfig& serverACM() const; + Ice::Identity stringToIdentity(const std::string&) const; + std::string identityToString(const Ice::Identity&) const; Ice::ObjectPrx createAdmin(const Ice::ObjectAdapterPtr&, const Ice::Identity&); Ice::ObjectPrx getAdmin(); |