summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/DescriptorBuilder.h
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/IceGrid/DescriptorBuilder.h')
-rw-r--r--cpp/src/IceGrid/DescriptorBuilder.h71
1 files changed, 28 insertions, 43 deletions
diff --git a/cpp/src/IceGrid/DescriptorBuilder.h b/cpp/src/IceGrid/DescriptorBuilder.h
index f58cf8e7a0e..02e9c397da3 100644
--- a/cpp/src/IceGrid/DescriptorBuilder.h
+++ b/cpp/src/IceGrid/DescriptorBuilder.h
@@ -10,13 +10,6 @@
#include <IceGrid/Descriptor.h>
#include <set>
-#ifdef __SUNPRO_CC
-//
-// We hide some init functions on purpose in classes below
-//
-# pragma error_messages(off,hidef)
-#endif
-
namespace IceGrid
{
@@ -24,7 +17,7 @@ class XmlAttributesHelper
{
public:
- XmlAttributesHelper(const IceXML::Attributes&, const Ice::LoggerPtr&, const std::string&, int);
+ XmlAttributesHelper(const IceXML::Attributes&, const std::shared_ptr<Ice::Logger>&, const std::string&, int);
void checkUnknownAttributes();
bool contains(const std::string&) const;
@@ -39,7 +32,7 @@ public:
private:
const IceXML::Attributes& _attributes;
- const Ice::LoggerPtr _logger;
+ const std::shared_ptr<Ice::Logger> _logger;
const std::string _filename;
const int _line;
@@ -52,7 +45,7 @@ class DescriptorBuilder
{
public:
- virtual ~DescriptorBuilder() { }
+ virtual ~DescriptorBuilder() = default;
virtual void addVariable(const XmlAttributesHelper&);
};
@@ -89,10 +82,10 @@ class ApplicationDescriptorBuilder : public DescriptorBuilder
{
public:
- ApplicationDescriptorBuilder(const Ice::CommunicatorPtr&, const XmlAttributesHelper&,
- const std::map<std::string, std::string>&);
- ApplicationDescriptorBuilder(const Ice::CommunicatorPtr&, const ApplicationDescriptor&, const XmlAttributesHelper&,
+ ApplicationDescriptorBuilder(const std::shared_ptr<Ice::Communicator>&, const XmlAttributesHelper&,
const std::map<std::string, std::string>&);
+ ApplicationDescriptorBuilder(const std::shared_ptr<Ice::Communicator>&, const ApplicationDescriptor&,
+ const XmlAttributesHelper&, const std::map<std::string, std::string>&);
const ApplicationDescriptor& getDescriptor() const;
@@ -117,11 +110,11 @@ public:
bool isOverride(const std::string&);
- const Ice::CommunicatorPtr& getCommunicator() const { return _communicator; }
+ const std::shared_ptr<Ice::Communicator>& getCommunicator() const { return _communicator; }
private:
- Ice::CommunicatorPtr _communicator;
+ std::shared_ptr<Ice::Communicator> _communicator;
ApplicationDescriptor _descriptor;
std::map<std::string, std::string> _overrides;
};
@@ -157,7 +150,7 @@ public:
virtual PropertySetDescriptorBuilder* createPropertySet(const XmlAttributesHelper&) const;
void addVariable(const XmlAttributesHelper&);
- void addServer(const ServerDescriptorPtr&);
+ void addServer(const std::shared_ptr<ServerDescriptor>&);
void addServerInstance(const ServerInstanceDescriptor&);
void addPropertySet(const std::string&, const PropertySetDescriptor&);
void setDescription(const std::string&);
@@ -185,7 +178,7 @@ public:
virtual ServiceDescriptorBuilder* createService(const XmlAttributesHelper&);
void addParameter(const XmlAttributesHelper&);
- void setDescriptor(const CommunicatorDescriptorPtr&);
+ void setDescriptor(const std::shared_ptr<CommunicatorDescriptor>&);
const std::string& getId() const { return _id; }
const TemplateDescriptor& getDescriptor() const { return _descriptor; }
@@ -202,9 +195,9 @@ class CommunicatorDescriptorBuilder : public DescriptorBuilder
{
public:
- CommunicatorDescriptorBuilder(const Ice::CommunicatorPtr&);
+ CommunicatorDescriptorBuilder(const std::shared_ptr<Ice::Communicator>&);
- void init(const CommunicatorDescriptorPtr&, const XmlAttributesHelper&);
+ void init(const std::shared_ptr<CommunicatorDescriptor>&, const XmlAttributesHelper&);
virtual void finish();
virtual void setDescription(const std::string&);
@@ -214,9 +207,6 @@ public:
virtual void setAdapterDescription(const std::string&);
virtual void addObject(const XmlAttributesHelper&);
virtual void addAllocatable(const XmlAttributesHelper&);
- virtual void addDbEnv(const XmlAttributesHelper&);
- virtual void addDbEnvProperty(const XmlAttributesHelper&);
- virtual void setDbEnvDescription(const std::string&);
virtual void addLog(const XmlAttributesHelper&);
virtual PropertySetDescriptorBuilder* createPropertySet() const;
@@ -226,11 +216,11 @@ protected:
void addProperty(PropertyDescriptorSeq&, const std::string&, const std::string&);
PropertyDescriptorSeq _hiddenProperties;
- Ice::CommunicatorPtr _communicator;
+ std::shared_ptr<Ice::Communicator> _communicator;
private:
- CommunicatorDescriptorPtr _descriptor;
+ std::shared_ptr<CommunicatorDescriptor> _descriptor;
};
class ServiceInstanceDescriptorBuilder : public DescriptorBuilder
@@ -252,65 +242,60 @@ class ServerDescriptorBuilder : public CommunicatorDescriptorBuilder
{
public:
- ServerDescriptorBuilder(const Ice::CommunicatorPtr&, const XmlAttributesHelper&);
- ServerDescriptorBuilder(const Ice::CommunicatorPtr&);
+ ServerDescriptorBuilder(const std::shared_ptr<Ice::Communicator>&, const XmlAttributesHelper&);
+ ServerDescriptorBuilder(const std::shared_ptr<Ice::Communicator>&);
- void init(const ServerDescriptorPtr&, const XmlAttributesHelper&);
+ void init(const std::shared_ptr<ServerDescriptor>&, const XmlAttributesHelper&);
virtual ServiceDescriptorBuilder* createService(const XmlAttributesHelper&);
virtual ServiceInstanceDescriptorBuilder* createServiceInstance(const XmlAttributesHelper&);
virtual void addOption(const std::string&);
virtual void addEnv(const std::string&);
- virtual void addService(const ServiceDescriptorPtr&);
+ virtual void addService(const std::shared_ptr<ServiceDescriptor>&);
virtual void addServiceInstance(const ServiceInstanceDescriptor&);
- const ServerDescriptorPtr& getDescriptor() const { return _descriptor; }
+ const std::shared_ptr<ServerDescriptor>& getDescriptor() const { return _descriptor; }
private:
- ServerDescriptorPtr _descriptor;
+ std::shared_ptr<ServerDescriptor> _descriptor;
};
class IceBoxDescriptorBuilder : public ServerDescriptorBuilder
{
public:
- IceBoxDescriptorBuilder(const Ice::CommunicatorPtr&, const XmlAttributesHelper&);
+ IceBoxDescriptorBuilder(const std::shared_ptr<Ice::Communicator>&, const XmlAttributesHelper&);
- void init(const IceBoxDescriptorPtr&, const XmlAttributesHelper&);
+ void init(const std::shared_ptr<IceBoxDescriptor>&, const XmlAttributesHelper&);
virtual ServiceDescriptorBuilder* createService(const XmlAttributesHelper&);
virtual ServiceInstanceDescriptorBuilder* createServiceInstance(const XmlAttributesHelper&);
virtual void addAdapter(const XmlAttributesHelper&);
- virtual void addDbEnv(const XmlAttributesHelper&);
virtual void addServiceInstance(const ServiceInstanceDescriptor&);
- virtual void addService(const ServiceDescriptorPtr&);
+ virtual void addService(const std::shared_ptr<ServiceDescriptor>&);
private:
- IceBoxDescriptorPtr _descriptor;
+ std::shared_ptr<IceBoxDescriptor> _descriptor;
};
class ServiceDescriptorBuilder : public CommunicatorDescriptorBuilder
{
public:
- ServiceDescriptorBuilder(const Ice::CommunicatorPtr&, const XmlAttributesHelper&);
- void init(const ServiceDescriptorPtr&, const XmlAttributesHelper&);
+ ServiceDescriptorBuilder(const std::shared_ptr<Ice::Communicator>&, const XmlAttributesHelper&);
+ void init(const std::shared_ptr<ServiceDescriptor>&, const XmlAttributesHelper&);
- const ServiceDescriptorPtr& getDescriptor() const { return _descriptor; }
+ const std::shared_ptr<ServiceDescriptor>& getDescriptor() const { return _descriptor; }
private:
- ServiceDescriptorPtr _descriptor;
+ std::shared_ptr<ServiceDescriptor> _descriptor;
};
}
-#ifdef __SUNPRO_CC
-# pragma error_messages(default,hidef)
-#endif
-
#endif
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 19:31:06 +0000