diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2005-09-21 09:03:57 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2005-09-21 09:03:57 +0000 |
| commit | 4cf50fb1432dc7ec012e577fd52101520a94091a (patch) | |
| tree | 4b19a4ecc14d46b3c906bac44e5c8622d8963832 /cpp/src | |
| parent | Fix (diff) | |
| download | ice-4cf50fb1432dc7ec012e577fd52101520a94091a.tar.bz2 ice-4cf50fb1432dc7ec012e577fd52101520a94091a.tar.xz ice-4cf50fb1432dc7ec012e577fd52101520a94091a.zip | |
HP-UX fix
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceGrid/DescriptorBuilder.cpp | 8 | ||||
| -rw-r--r-- | cpp/src/IceGrid/DescriptorBuilder.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/IceGrid/DescriptorBuilder.cpp b/cpp/src/IceGrid/DescriptorBuilder.cpp index 87be414e92f..4b85a9d5a03 100644 --- a/cpp/src/IceGrid/DescriptorBuilder.cpp +++ b/cpp/src/IceGrid/DescriptorBuilder.cpp @@ -275,10 +275,10 @@ NodeDescriptorBuilder::createServer(const XmlAttributesHelper& attrs) return auto_ptr<ServerDescriptorBuilder>(new ServerDescriptorBuilder(attrs)); } -auto_ptr<IceBoxDescriptorBuilder> +auto_ptr<ServerDescriptorBuilder> NodeDescriptorBuilder::createIceBox(const XmlAttributesHelper& attrs) { - return auto_ptr<IceBoxDescriptorBuilder>(new IceBoxDescriptorBuilder(attrs)); + return auto_ptr<ServerDescriptorBuilder>(new IceBoxDescriptorBuilder(attrs)); } void @@ -341,14 +341,14 @@ TemplateDescriptorBuilder::createServer(const XmlAttributesHelper& attrs) return auto_ptr<ServerDescriptorBuilder>(new ServerDescriptorBuilder(attrs)); } -auto_ptr<IceBoxDescriptorBuilder> +auto_ptr<ServerDescriptorBuilder> TemplateDescriptorBuilder::createIceBox(const XmlAttributesHelper& attrs) { if(_serviceTemplate) { throw "<icebox> element can't be a child of <service-template>"; } - return auto_ptr<IceBoxDescriptorBuilder>(new IceBoxDescriptorBuilder(attrs)); + return auto_ptr<ServerDescriptorBuilder>(new IceBoxDescriptorBuilder(attrs)); } auto_ptr<ServiceDescriptorBuilder> diff --git a/cpp/src/IceGrid/DescriptorBuilder.h b/cpp/src/IceGrid/DescriptorBuilder.h index 82c154f2511..3ff779ba83c 100644 --- a/cpp/src/IceGrid/DescriptorBuilder.h +++ b/cpp/src/IceGrid/DescriptorBuilder.h @@ -96,7 +96,7 @@ public: NodeDescriptorBuilder(ApplicationDescriptorBuilder&, const XmlAttributesHelper&); std::auto_ptr<ServerDescriptorBuilder> createServer(const XmlAttributesHelper&); - std::auto_ptr<IceBoxDescriptorBuilder> createIceBox(const XmlAttributesHelper&); + std::auto_ptr<ServerDescriptorBuilder> createIceBox(const XmlAttributesHelper&); void addVariable(const XmlAttributesHelper&); void addServerInstance(const XmlAttributesHelper&); @@ -124,7 +124,7 @@ public: void setDescriptor(const CommunicatorDescriptorPtr&); std::auto_ptr<ServerDescriptorBuilder> createServer(const XmlAttributesHelper&); - std::auto_ptr<IceBoxDescriptorBuilder> createIceBox(const XmlAttributesHelper&); + std::auto_ptr<ServerDescriptorBuilder> createIceBox(const XmlAttributesHelper&); std::auto_ptr<ServiceDescriptorBuilder> createService(const XmlAttributesHelper&); const std::string& getId() const { return _id; } |