summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/InstrumentationI.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/Ice/InstrumentationI.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/Ice/InstrumentationI.cpp')
-rw-r--r--cpp/src/Ice/InstrumentationI.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/InstrumentationI.cpp b/cpp/src/Ice/InstrumentationI.cpp
index 64ff4f91e07..0f816647a11 100644
--- a/cpp/src/Ice/InstrumentationI.cpp
+++ b/cpp/src/Ice/InstrumentationI.cpp
@@ -334,7 +334,7 @@ public:
string
getIdentity() const
{
- return identityToString(_current.id);
+ return _current.adapter->getCommunicator()->identityToString(_current.id);
}
private:
@@ -443,7 +443,7 @@ public:
catch(const Exception&)
{
// Either a fixed proxy or the communicator is destroyed.
- os << identityToString(_proxy->ice_getIdentity());
+ os << _proxy->ice_getCommunicator()->identityToString(_proxy->ice_getIdentity());
os << " [" << _operation << ']';
}
}
@@ -474,7 +474,7 @@ public:
{
if(_proxy)
{
- return identityToString(_proxy->ice_getIdentity());
+ return _proxy->ice_getCommunicator()->identityToString(_proxy->ice_getIdentity());
}
else
{