summaryrefslogtreecommitdiff
path: root/cpp/src/IceStorm/Util.h
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2021-01-28 16:26:44 -0500
committerJoe George <joe@zeroc.com>2021-02-01 16:59:30 -0500
commit92a6531e409f2691d82591e185a92299d415fc0f (patch)
tree60c79e2a8f327b8f0b6ebc06b06f48a2e8086f6a /cpp/src/IceStorm/Util.h
parentPort Glacier2, IceBox, IceBridge, IceDB, IceXML, icegriddb (diff)
downloadice-92a6531e409f2691d82591e185a92299d415fc0f.tar.bz2
ice-92a6531e409f2691d82591e185a92299d415fc0f.tar.xz
ice-92a6531e409f2691d82591e185a92299d415fc0f.zip
IceGrid and IceStorm
Diffstat (limited to 'cpp/src/IceStorm/Util.h')
-rw-r--r--cpp/src/IceStorm/Util.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/cpp/src/IceStorm/Util.h b/cpp/src/IceStorm/Util.h
index 1ad63017219..22c1cbabccb 100644
--- a/cpp/src/IceStorm/Util.h
+++ b/cpp/src/IceStorm/Util.h
@@ -17,11 +17,12 @@ namespace IceStorm
// Forward declarations.
//
class Instance;
-typedef IceUtil::Handle<Instance> InstancePtr;
-typedef IceDB::Dbi<IceStorm::SubscriberRecordKey, IceStorm::SubscriberRecord, IceDB::IceContext, Ice::OutputStream>
- SubscriberMap;
-typedef IceDB::Dbi<std::string, IceStormElection::LogUpdate, IceDB::IceContext, Ice::OutputStream> LLUMap;
+using SubscriberMap = IceDB::Dbi<IceStorm::SubscriberRecordKey,
+ IceStorm::SubscriberRecord,
+ IceDB::IceContext,
+ Ice::OutputStream>;
+using LLUMap = IceDB::Dbi<std::string, IceStormElection::LogUpdate, IceDB::IceContext, Ice::OutputStream>;
const std::string lluDbKey = "_manager";
@@ -34,10 +35,10 @@ std::string
identityToTopicName(const Ice::Identity&);
Ice::Identity
-nameToIdentity(const IceStorm::InstancePtr&, const std::string&);
+nameToIdentity(const std::shared_ptr<IceStorm::Instance>&, const std::string&);
std::string
-describeEndpoints(const Ice::ObjectPrx&);
+describeEndpoints(const std::shared_ptr<Ice::ObjectPrx>&);
int
compareSubscriberRecordKey(const MDB_val* v1, const MDB_val* v2);