summaryrefslogtreecommitdiff
path: root/cpp/src/IceStorm/Subscriber.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2016-07-27 19:30:37 -0400
committerBernard Normier <bernard@zeroc.com>2016-07-27 19:30:37 -0400
commit883edab4361e58957796f25d5fc55cfb41f0f6ea (patch)
treefc90adc372b66bf0becf4c0912794c64af250a29 /cpp/src/IceStorm/Subscriber.cpp
parentICE-7242 - Cross test updates (diff)
downloadice-883edab4361e58957796f25d5fc55cfb41f0f6ea.tar.bz2
ice-883edab4361e58957796f25d5fc55cfb41f0f6ea.tar.xz
ice-883edab4361e58957796f25d5fc55cfb41f0f6ea.zip
Deprecate Communicator::stringToIdentity and identityToString
Diffstat (limited to 'cpp/src/IceStorm/Subscriber.cpp')
-rw-r--r--cpp/src/IceStorm/Subscriber.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/IceStorm/Subscriber.cpp b/cpp/src/IceStorm/Subscriber.cpp
index 4b53be621e1..a4b89d09e1b 100644
--- a/cpp/src/IceStorm/Subscriber.cpp
+++ b/cpp/src/IceStorm/Subscriber.cpp
@@ -546,7 +546,7 @@ Subscriber::create(
Ice::Identity perId;
perId.category = instance->instanceName();
perId.name = "topic." + rec.topicName + ".publish." +
- instance->communicator()->identityToString(rec.obj->ice_getIdentity());
+ identityToString(rec.obj->ice_getIdentity());
Ice::ObjectPrx proxy = instance->publishAdapter()->add(per, perId);
TraceLevelsPtr traceLevels = instance->traceLevels();
SubscriberPtr subscriber;
@@ -798,7 +798,7 @@ Subscriber::error(bool dec, const Ice::Exception& e)
if(_currentRetry == 0)
{
Ice::Warning warn(traceLevels->logger);
- warn << traceLevels->subscriberCat << ":" << _instance->communicator()->identityToString(_rec.id);
+ warn << traceLevels->subscriberCat << ":" << identityToString(_rec.id);
if(traceLevels->subscriber > 1)
{
warn << " endpoints: " << IceStormInternal::describeEndpoints(_rec.obj);
@@ -811,7 +811,7 @@ Subscriber::error(bool dec, const Ice::Exception& e)
if(traceLevels->subscriber > 0)
{
Ice::Trace out(traceLevels->logger, traceLevels->subscriberCat);
- out << _instance->communicator()->identityToString(_rec.id);
+ out << identityToString(_rec.id);
if(traceLevels->subscriber > 1)
{
out << " endpoints: " << IceStormInternal::describeEndpoints(_rec.obj);
@@ -839,7 +839,7 @@ Subscriber::error(bool dec, const Ice::Exception& e)
if(traceLevels->subscriber > 0)
{
Ice::Trace out(traceLevels->logger, traceLevels->subscriberCat);
- out << _instance->communicator()->identityToString(_rec.id);
+ out << identityToString(_rec.id);
if(traceLevels->subscriber > 1)
{
out << " endpoints: " << IceStormInternal::describeEndpoints(_rec.obj);