diff options
| author | Joe George <joe@zeroc.com> | 2021-01-28 16:26:44 -0500 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2021-02-01 16:59:30 -0500 |
| commit | 92a6531e409f2691d82591e185a92299d415fc0f (patch) | |
| tree | 60c79e2a8f327b8f0b6ebc06b06f48a2e8086f6a /cpp/src/IceStorm/Util.cpp | |
| parent | Port Glacier2, IceBox, IceBridge, IceDB, IceXML, icegriddb (diff) | |
| download | ice-92a6531e409f2691d82591e185a92299d415fc0f.tar.bz2 ice-92a6531e409f2691d82591e185a92299d415fc0f.tar.xz ice-92a6531e409f2691d82591e185a92299d415fc0f.zip | |
IceGrid and IceStorm
Diffstat (limited to 'cpp/src/IceStorm/Util.cpp')
| -rw-r--r-- | cpp/src/IceStorm/Util.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/cpp/src/IceStorm/Util.cpp b/cpp/src/IceStorm/Util.cpp index 7eebdf80173..e8487cca3be 100644 --- a/cpp/src/IceStorm/Util.cpp +++ b/cpp/src/IceStorm/Util.cpp @@ -32,24 +32,20 @@ IceStormInternal::identityToTopicName(const Ice::Identity& id) } Ice::Identity -IceStormInternal::nameToIdentity(const InstancePtr& instance, const string& name) +IceStormInternal::nameToIdentity(const shared_ptr<Instance>& instance, const string& name) { - // Identity is instanceName>/topic.<topicname> - Ice::Identity id; - id.category = instance->instanceName(); - id.name = "topic." + name; - - return id; + // Identity is <instanceName>/topic.<topicname> + return { "topic." + name, instance->instanceName() }; } string -IceStormInternal::describeEndpoints(const Ice::ObjectPrx& proxy) +IceStormInternal::describeEndpoints(const shared_ptr<Ice::ObjectPrx>& proxy) { ostringstream os; if(proxy) { Ice::EndpointSeq endpoints = proxy->ice_getEndpoints(); - for(Ice::EndpointSeq::const_iterator i = endpoints.begin(); i != endpoints.end(); ++i) + for(auto i = endpoints.cbegin(); i != endpoints.cend(); ++i) { if(i != endpoints.begin()) { |