From 97554afcad548fcac64d399fd2e05af49ffcba12 Mon Sep 17 00:00:00 2001 From: Jose Date: Mon, 29 Feb 2016 18:04:18 +0100 Subject: Rework previous fix for 3.6 compatibility --- cpp/src/Ice/ServantManager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cpp/src/Ice/ServantManager.cpp') 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; } -- cgit v1.2.3