summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ServantManager.cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2016-02-29 15:56:29 +0100
committerJose <jose@zeroc.com>2016-02-29 15:56:29 +0100
commit05f2548dc1b12b4b5afd3406af3bd899c17f85be (patch)
tree0bc0ae4845afa929e74f2f1fcb9ee20057b3240f /cpp/src/Ice/ServantManager.cpp
parentICE-6843 - Check for php-config in the path (diff)
downloadice-05f2548dc1b12b4b5afd3406af3bd899c17f85be.tar.bz2
ice-05f2548dc1b12b4b5afd3406af3bd899c17f85be.tar.xz
ice-05f2548dc1b12b4b5afd3406af3bd899c17f85be.zip
ICE-6952 - identityToString/stringToIdentity non member functions
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 be20f45e704..2d95dc1027d 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 = _instance->identityToString(ident);
+ ex.id = Ice::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 = _instance->identityToString(ident);
+ ex.id = Ice::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 = _instance->identityToString(ident);
+ ex.id = Ice::identityToString(ident);
throw ex;
}