diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2009-10-07 18:18:37 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2009-10-07 18:18:37 +0200 |
| commit | 5fc2dc27228263e4c56ba3a49852ab3f8c724299 (patch) | |
| tree | a1340491094705a1e604a3df22ec4dad0c8d1a8e /cpp/src/IceGrid/Topics.h | |
| parent | Bug 4251 - add IceUtil::Time double initializers (diff) | |
| download | ice-5fc2dc27228263e4c56ba3a49852ab3f8c724299.tar.bz2 ice-5fc2dc27228263e4c56ba3a49852ab3f8c724299.tar.xz ice-5fc2dc27228263e4c56ba3a49852ab3f8c724299.zip | |
- Bug 4286: added support for IceStorm/IceGrid database plugins
- Fixed IceGrid database code to first save to the database and then
do state changes.
Diffstat (limited to 'cpp/src/IceGrid/Topics.h')
| -rw-r--r-- | cpp/src/IceGrid/Topics.h | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/cpp/src/IceGrid/Topics.h b/cpp/src/IceGrid/Topics.h index c8e12562b16..f1a306070bf 100644 --- a/cpp/src/IceGrid/Topics.h +++ b/cpp/src/IceGrid/Topics.h @@ -14,15 +14,6 @@ #include <IceStorm/IceStorm.h> #include <IceGrid/Internal.h> #include <IceGrid/Observer.h> -#ifdef QTSQL -# include <IceGrid/SqlStringApplicationInfoDict.h> -# include <IceGrid/SqlStringAdapterInfoDict.h> -# include <IceGrid/SqlIdentityObjectInfoDict.h> -#else -# include <IceGrid/StringApplicationInfoDict.h> -# include <IceGrid/StringAdapterInfoDict.h> -# include <IceGrid/IdentityObjectInfoDict.h> -#endif #include <set> namespace IceGrid @@ -110,7 +101,7 @@ class ApplicationObserverTopic : public ObserverTopic { public: - ApplicationObserverTopic(const IceStorm::TopicManagerPrx&, const StringApplicationInfoDict&); + ApplicationObserverTopic(const IceStorm::TopicManagerPrx&, const std::map<std::string, ApplicationInfo>&); int applicationInit(int, const ApplicationInfoSeq&); int applicationAdded(int, const ApplicationInfo&); @@ -130,7 +121,7 @@ class AdapterObserverTopic : public ObserverTopic { public: - AdapterObserverTopic(const IceStorm::TopicManagerPrx&, const StringAdapterInfoDict&); + AdapterObserverTopic(const IceStorm::TopicManagerPrx&, const std::map<std::string, AdapterInfo>&); int adapterInit(const AdapterInfoSeq&); int adapterAdded(const AdapterInfo&); @@ -150,7 +141,7 @@ class ObjectObserverTopic : public ObserverTopic { public: - ObjectObserverTopic(const IceStorm::TopicManagerPrx&, const IdentityObjectInfoDict&); + ObjectObserverTopic(const IceStorm::TopicManagerPrx&, const std::map<Ice::Identity, ObjectInfo>&); int objectInit(const ObjectInfoSeq&); int objectAdded(const ObjectInfo&); |