summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ServantManager.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2016-02-29 18:04:18 +0100
committerJose <jose@zeroc.com>2016-02-29 18:04:18 +0100
commit97554afcad548fcac64d399fd2e05af49ffcba12 (patch)
tree6916a256775181b7674f39ad7b3f3eeaa1fdfa62 /cpp/src/Ice/ServantManager.cpp
parentICE-6952 - identityToString/stringToIdentity non member functions (diff)
downloadice-97554afcad548fcac64d399fd2e05af49ffcba12.tar.bz2
ice-97554afcad548fcac64d399fd2e05af49ffcba12.tar.xz
ice-97554afcad548fcac64d399fd2e05af49ffcba12.zip
Rework previous fix for 3.6 compatibility
Diffstat (limited to 'cpp/src/Ice/ServantManager.cpp')
-rw-r--r--cpp/src/Ice/ServantManager.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/ServantManager.cpp b/cpp/src/Ice/ServantManager.cpp
index 2d95dc1027d..be20f45e704 100644
--- a/cpp/src/Ice/ServantManager.cpp
+++ b/cpp/src/Ice/ServantManager.cpp
@@ -44,7 +44,7 @@ IceInternal::ServantManager::addServant(const ObjectPtr& object, const Identity&
{
AlreadyRegisteredException ex(__FILE__, __LINE__);
ex.kindOfObject = "servant";
- ex.id = Ice::identityToString(ident);
+ ex.id = _instance->identityToString(ident);
if(!facet.empty())
{
string fs = nativeToUTF8(facet, _instance->getStringConverter());
@@ -104,7 +104,7 @@ IceInternal::ServantManager::removeServant(const Identity& ident, const string&
{
NotRegisteredException ex(__FILE__, __LINE__);
ex.kindOfObject = "servant";
- ex.id = Ice::identityToString(ident);
+ ex.id = _instance->identityToString(ident);
if(!facet.empty())
{
string fs = nativeToUTF8(facet, _instance->getStringConverter());
@@ -178,7 +178,7 @@ IceInternal::ServantManager::removeAllFacets(const Identity& ident)
{
NotRegisteredException ex(__FILE__, __LINE__);
ex.kindOfObject = "servant";
- ex.id = Ice::identityToString(ident);
+ ex.id = _instance->identityToString(ident);
throw ex;
}