diff options
Diffstat (limited to 'cpp/src/IceStorm/Service.h')
| -rw-r--r-- | cpp/src/IceStorm/Service.h | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/cpp/src/IceStorm/Service.h b/cpp/src/IceStorm/Service.h index 11c7a80a2ad..84916bacf75 100644 --- a/cpp/src/IceStorm/Service.h +++ b/cpp/src/IceStorm/Service.h @@ -9,7 +9,7 @@ #include <IceStorm/IceStorm.h> // -// Automatically link with IceStormService[D|++11|++11D].lib +// Automatically link with IceStormService[D].lib // #if !defined(ICE_BUILDING_ICE_STORM_SERVICE) && defined(ICESTORM_SERVICE_API_EXPORTS) @@ -20,6 +20,7 @@ # pragma comment(lib, ICE_LIBNAME("IceStormService")) #endif +// These IceStorm APIs are exported because they are used by IceGrid #ifndef ICESTORM_SERVICE_API # if defined(ICE_STATIC_LIBS) # define ICESTORM_SERVICE_API /**/ @@ -30,30 +31,22 @@ # endif #endif -// This API is internal to Ice, and should not be used by external -// applications. +// This API is internal to Ice, and should not be used by external applications. namespace IceStormInternal { -class Service; -typedef ::IceInternal::Handle< IceStormInternal::Service> ServicePtr; - -class Service : public ::IceBox::Service +class Service : public IceBox::Service { public: - ICESTORM_SERVICE_API static ServicePtr create(const Ice::CommunicatorPtr&, - const Ice::ObjectAdapterPtr&, - const Ice::ObjectAdapterPtr&, - const std::string&, - const Ice::Identity&, - const std::string&); - - virtual void start(const std::string&, const Ice::CommunicatorPtr&, const Ice::StringSeq&) = 0; - - ICESTORM_SERVICE_API virtual IceStorm::TopicManagerPrx getTopicManager() const = 0; + ICESTORM_SERVICE_API static std::shared_ptr<Service> create(const std::shared_ptr<Ice::Communicator>&, + const std::shared_ptr<Ice::ObjectAdapter>&, + const std::shared_ptr<Ice::ObjectAdapter>&, + const std::string&, + const Ice::Identity&, + const std::string&); - virtual void stop() = 0; + ICESTORM_SERVICE_API virtual std::shared_ptr<IceStorm::TopicManagerPrx> getTopicManager() const = 0; }; }; |