summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/Topics.h
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2006-09-20 11:54:20 +0000
committerBenoit Foucher <benoit@zeroc.com>2006-09-20 11:54:20 +0000
commit1ea8dd904580a2fba9d9cfbd03aa8ed062ae53b4 (patch)
treefa27771d0c6695f1cab4f6945ba036917bf9018c /cpp/src/IceGrid/Topics.h
parentNew Ice::initialize() overload for StringSeq. (diff)
downloadice-1ea8dd904580a2fba9d9cfbd03aa8ed062ae53b4.tar.bz2
ice-1ea8dd904580a2fba9d9cfbd03aa8ed062ae53b4.tar.xz
ice-1ea8dd904580a2fba9d9cfbd03aa8ed062ae53b4.zip
Removed null permission verifier well-known objects Various fixes for
replcia session establishment.
Diffstat (limited to 'cpp/src/IceGrid/Topics.h')
-rw-r--r--cpp/src/IceGrid/Topics.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/cpp/src/IceGrid/Topics.h b/cpp/src/IceGrid/Topics.h
index f8fc0312c44..56554537ce9 100644
--- a/cpp/src/IceGrid/Topics.h
+++ b/cpp/src/IceGrid/Topics.h
@@ -28,7 +28,7 @@ public:
ObserverTopic(const IceStorm::TopicManagerPrx&, const std::string&);
virtual ~ObserverTopic();
- void subscribe(const Ice::ObjectPrx&, const std::string& = std::string(), int = -1);
+ void subscribe(const Ice::ObjectPrx&, const std::string& = std::string());
void unsubscribe(const Ice::ObjectPrx&, const std::string& = std::string());
void destroy();
@@ -38,14 +38,13 @@ public:
protected:
- void waitForSyncedSubscribers(int);
+ void waitForSyncedSubscribers(int, const std::string& = std::string());
void updateSerial(int);
Ice::Context getContext(int) const;
Ice::LoggerPtr _logger;
IceStorm::TopicPrx _topic;
Ice::ObjectPrx _basePublisher;
- std::set<Ice::Identity> _waitForSubscribe;
int _serial;
std::set<std::string> _syncSubscribers;
@@ -148,6 +147,9 @@ public:
void objectUpdated(int, const ObjectInfo&);
void objectRemoved(int, const Ice::Identity&);
+ void objectsAddedOrUpdated(int, const ObjectInfoSeq&);
+ void objectsRemoved(int, const ObjectInfoSeq&);
+
virtual void initObserver(const Ice::ObjectPrx&);
private: