summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/AllocatableObjectCache.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2016-10-20 21:03:44 -0400
committerBernard Normier <bernard@zeroc.com>2016-10-20 21:03:44 -0400
commit3cb9c15995b828c52dba34d0a222f572d5bbc41b (patch)
tree87bad249c2ee04972be5f3c7635880cb0c556128 /cpp/src/IceGrid/AllocatableObjectCache.cpp
parentupdating IceBT to BlueZ 5 (diff)
downloadice-3cb9c15995b828c52dba34d0a222f572d5bbc41b.tar.bz2
ice-3cb9c15995b828c52dba34d0a222f572d5bbc41b.tar.xz
ice-3cb9c15995b828c52dba34d0a222f572d5bbc41b.zip
Added support for non-ASCII characters and universal character names
to stringified identities and proxies. This includes a new Ice.ToStringMode property.
Diffstat (limited to 'cpp/src/IceGrid/AllocatableObjectCache.cpp')
-rw-r--r--cpp/src/IceGrid/AllocatableObjectCache.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/IceGrid/AllocatableObjectCache.cpp b/cpp/src/IceGrid/AllocatableObjectCache.cpp
index ae3294bb51c..3a9799e1eac 100644
--- a/cpp/src/IceGrid/AllocatableObjectCache.cpp
+++ b/cpp/src/IceGrid/AllocatableObjectCache.cpp
@@ -134,7 +134,7 @@ AllocatableObjectCache::add(const ObjectInfo& info, const AllocatablePtr& parent
if(getImpl(id))
{
Ice::Error out(_communicator->getLogger());
- out << "can't add duplicate allocatable object `" << identityToString(id) << "'";
+ out << "can't add duplicate allocatable object `" << _communicator->identityToString(id) << "'";
return;
}
@@ -151,7 +151,7 @@ AllocatableObjectCache::add(const ObjectInfo& info, const AllocatablePtr& parent
if(_traceLevels && _traceLevels->object > 0)
{
Ice::Trace out(_traceLevels->logger, _traceLevels->objectCat);
- out << "added allocatable object `" << identityToString(id) << "'";
+ out << "added allocatable object `" << _communicator->identityToString(id) << "'";
}
}
@@ -177,7 +177,7 @@ AllocatableObjectCache::remove(const Ice::Identity& id)
if(!entry)
{
Ice::Error out(_communicator->getLogger());
- out << "can't remove unknown object `" << identityToString(id) << "'";
+ out << "can't remove unknown object `" << _communicator->identityToString(id) << "'";
}
removeImpl(id);
@@ -191,7 +191,7 @@ AllocatableObjectCache::remove(const Ice::Identity& id)
if(_traceLevels && _traceLevels->object > 0)
{
Ice::Trace out(_traceLevels->logger, _traceLevels->objectCat);
- out << "removed allocatable object `" << identityToString(id) << "'";
+ out << "removed allocatable object `" << _communicator->identityToString(id) << "'";
}
}