diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2006-05-09 13:07:41 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2006-05-09 13:07:41 +0000 |
| commit | 197b6de9281b52d0b53c4b3fa3312e371b4469a9 (patch) | |
| tree | bae93f8155da0770f5dd45d12ef1160ee99aed54 /cpp/src/Ice/LocatorInfo.cpp | |
| parent | Added identityToString and stringToIdentity to Communicator (diff) | |
| download | ice-197b6de9281b52d0b53c4b3fa3312e371b4469a9.tar.bz2 ice-197b6de9281b52d0b53c4b3fa3312e371b4469a9.tar.xz ice-197b6de9281b52d0b53c4b3fa3312e371b4469a9.zip | |
Fixed proxy and identity t/from string functions to use string converters
Diffstat (limited to 'cpp/src/Ice/LocatorInfo.cpp')
| -rw-r--r-- | cpp/src/Ice/LocatorInfo.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cpp/src/Ice/LocatorInfo.cpp b/cpp/src/Ice/LocatorInfo.cpp index 153eda7de18..e72fb38f10e 100644 --- a/cpp/src/Ice/LocatorInfo.cpp +++ b/cpp/src/Ice/LocatorInfo.cpp @@ -16,7 +16,6 @@ #include <Ice/EndpointI.h> #include <Ice/Reference.h> #include <Ice/Functional.h> -#include <Ice/IdentityUtil.h> #include <iterator> using namespace std; @@ -375,7 +374,7 @@ IceInternal::LocatorInfo::getEndpoints(const IndirectReferencePtr& ref, int ttl, { NotRegisteredException ex(__FILE__, __LINE__); ex.kindOfObject = "object"; - ex.id = identityToString(ref->getIdentity()); + ex.id = ref->getInstance()->identityToString(ref->getIdentity()); throw ex; } catch(const NotRegisteredException&) @@ -391,7 +390,7 @@ IceInternal::LocatorInfo::getEndpoints(const IndirectReferencePtr& ref, int ttl, out << "couldn't contact the locator to retrieve adapter endpoints\n"; if(!ref) { - out << "object = " << identityToString(ref->getIdentity()) << "\n"; + out << "object = " << ref->getInstance()->identityToString(ref->getIdentity()) << "\n"; } else { @@ -493,7 +492,7 @@ IceInternal::LocatorInfo::trace(const string& msg, } else { - out << "object = " << identityToString(ref->getIdentity()) << '\n'; + out << "object = " << ref->getInstance()->identityToString(ref->getIdentity()) << '\n'; } const char* sep = endpoints.size() > 1 ? ":" : ""; |