diff options
| author | Jose <jose@zeroc.com> | 2014-04-18 18:31:48 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-04-18 18:31:48 +0200 |
| commit | e7333297345efda9379045495d17aadb571ddd50 (patch) | |
| tree | 5bfa86a78d29665e1ef50a9575b76114be1145e1 /cpp/src/IceGrid/Topics.h | |
| parent | Fixed replicaGroup test issue (diff) | |
| download | ice-e7333297345efda9379045495d17aadb571ddd50.tar.bz2 ice-e7333297345efda9379045495d17aadb571ddd50.tar.xz ice-e7333297345efda9379045495d17aadb571ddd50.zip | |
Fixed (ICE-4858) - Eliminate IceDB
Diffstat (limited to 'cpp/src/IceGrid/Topics.h')
| -rw-r--r-- | cpp/src/IceGrid/Topics.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cpp/src/IceGrid/Topics.h b/cpp/src/IceGrid/Topics.h index 65e25ba68eb..bfd1636428c 100644 --- a/cpp/src/IceGrid/Topics.h +++ b/cpp/src/IceGrid/Topics.h @@ -14,7 +14,6 @@ #include <IceStorm/IceStorm.h> #include <IceGrid/Internal.h> #include <IceGrid/Observer.h> -#include <IceGrid/DB.h> #include <set> namespace IceGrid @@ -115,7 +114,7 @@ class ApplicationObserverTopic : public ObserverTopic { public: - ApplicationObserverTopic(const IceStorm::TopicManagerPrx&, const ApplicationsWrapperPtr&); + ApplicationObserverTopic(const IceStorm::TopicManagerPrx&, const std::map<std::string, ApplicationInfo>&, Ice::Long); int applicationInit(Ice::Long, const ApplicationInfoSeq&); int applicationAdded(Ice::Long, const ApplicationInfo&); @@ -135,7 +134,7 @@ class AdapterObserverTopic : public ObserverTopic { public: - AdapterObserverTopic(const IceStorm::TopicManagerPrx&, const AdaptersWrapperPtr&); + AdapterObserverTopic(const IceStorm::TopicManagerPrx&, const std::map<std::string, AdapterInfo>&, Ice::Long); int adapterInit(Ice::Long, const AdapterInfoSeq&); int adapterAdded(Ice::Long, const AdapterInfo&); @@ -155,7 +154,7 @@ class ObjectObserverTopic : public ObserverTopic { public: - ObjectObserverTopic(const IceStorm::TopicManagerPrx&, const ObjectsWrapperPtr&); + ObjectObserverTopic(const IceStorm::TopicManagerPrx&, const std::map<Ice::Identity, ObjectInfo>&, Ice::Long); int objectInit(Ice::Long, const ObjectInfoSeq&); int objectAdded(Ice::Long, const ObjectInfo&); |