From 197b6de9281b52d0b53c4b3fa3312e371b4469a9 Mon Sep 17 00:00:00 2001
From: Dwayne Boone <dwayne@zeroc.com>
Date: Tue, 9 May 2006 13:07:41 +0000
Subject: Fixed proxy and identity t/from string functions to use string
 converters

---
 cpp/src/Ice/ServantManager.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'cpp/src/Ice/ServantManager.cpp')

diff --git a/cpp/src/Ice/ServantManager.cpp b/cpp/src/Ice/ServantManager.cpp
index 8fcee751d14..c4c623edcfe 100644
--- a/cpp/src/Ice/ServantManager.cpp
+++ b/cpp/src/Ice/ServantManager.cpp
@@ -10,7 +10,6 @@
 #include <Ice/ServantManager.h>
 #include <Ice/ServantLocator.h>
 #include <Ice/LocalException.h>
-#include <Ice/IdentityUtil.h>
 #include <Ice/LoggerUtil.h>
 #include <Ice/Instance.h>
 #include <IceUtil/StringUtil.h>
@@ -46,7 +45,7 @@ IceInternal::ServantManager::addServant(const ObjectPtr& object, const Identity&
 	{
 	    AlreadyRegisteredException ex(__FILE__, __LINE__);
 	    ex.kindOfObject = "servant";
-	    ex.id = identityToString(ident);
+	    ex.id = _instance->identityToString(ident);
 	    if(!facet.empty())
 	    {
 		ex.id += " -f " + IceUtil::escapeString(facet, "");
@@ -86,7 +85,7 @@ IceInternal::ServantManager::removeServant(const Identity& ident, const string&
     {
 	NotRegisteredException ex(__FILE__, __LINE__);
 	ex.kindOfObject = "servant";
-	ex.id = identityToString(ident);
+	ex.id = _instance->identityToString(ident);
 	if(!facet.empty())
 	{
 	    ex.id += " -f " + IceUtil::escapeString(facet, "");
@@ -130,7 +129,7 @@ IceInternal::ServantManager::removeAllFacets(const Identity& ident)
     {
 	NotRegisteredException ex(__FILE__, __LINE__);
 	ex.kindOfObject = "servant";
-	ex.id = identityToString(ident);
+	ex.id = _instance->identityToString(ident);
 	throw ex;
     }
 
-- 
cgit v1.2.3