summaryrefslogtreecommitdiff
path: root/cpp/src/IceStorm/TopicManagerI.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/TopicManagerI.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/TopicManagerI.cpp')
-rw-r--r--cpp/src/IceStorm/TopicManagerI.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/IceStorm/TopicManagerI.cpp b/cpp/src/IceStorm/TopicManagerI.cpp
index 5c4ad1c6cbc..15696d70abc 100644
--- a/cpp/src/IceStorm/TopicManagerI.cpp
+++ b/cpp/src/IceStorm/TopicManagerI.cpp
@@ -421,14 +421,14 @@ TopicManagerImpl::observerInit(const LogUpdate& llu, const TopicContentSeq& cont
out << "init";
for(TopicContentSeq::const_iterator p = content.begin(); p != content.end(); ++p)
{
- out << " topic: " << _instance->communicator()->identityToString(p->id) << " subscribers: ";
+ out << " topic: " << identityToString(p->id) << " subscribers: ";
for(SubscriberRecordSeq::const_iterator q = p->records.begin(); q != p->records.end(); ++q)
{
if(q != p->records.begin())
{
out << ",";
}
- out << _instance->communicator()->identityToString(q->id);
+ out << identityToString(q->id);
if(traceLevels->topicMgr > 1)
{
out << " endpoints: " << IceStormInternal::describeEndpoints(q->obj);
@@ -803,7 +803,7 @@ TopicManagerImpl::installTopic(const string& name, const Ice::Identity& id, bool
if(create)
{
out << "creating new topic \"" << name << "\". id: "
- << _instance->communicator()->identityToString(id)
+ << identityToString(id)
<< " subscribers: ";
for(SubscriberRecordSeq::const_iterator q = subscribers.begin(); q != subscribers.end(); ++q)
{
@@ -813,7 +813,7 @@ TopicManagerImpl::installTopic(const string& name, const Ice::Identity& id, bool
}
if(traceLevels->topicMgr > 1)
{
- out << _instance->communicator()->identityToString(q->id)
+ out << identityToString(q->id)
<< " endpoints: " << IceStormInternal::describeEndpoints(q->obj);
}
}
@@ -821,7 +821,7 @@ TopicManagerImpl::installTopic(const string& name, const Ice::Identity& id, bool
else
{
out << "loading topic \"" << name << "\" from database. id: "
- << _instance->communicator()->identityToString(id)
+ << identityToString(id)
<< " subscribers: ";
for(SubscriberRecordSeq::const_iterator q = subscribers.begin(); q != subscribers.end(); ++q)
{
@@ -831,7 +831,7 @@ TopicManagerImpl::installTopic(const string& name, const Ice::Identity& id, bool
}
if(traceLevels->topicMgr > 1)
{
- out << _instance->communicator()->identityToString(q->id)
+ out << identityToString(q->id)
<< " endpoints: " << IceStormInternal::describeEndpoints(q->obj);
}
}