Fixed HP-UX compiler warnings, new dependencies

1 files changed, 12 insertions, 6 deletions

diff --git a/cpp/src/IceGrid/DescriptorBuilder.cpp b/cpp/src/IceGrid/DescriptorBuilder.cpp
index 1a33cdd0c87..bc3dcc14a25 100644
--- a/cpp/src/IceGrid/DescriptorBuilder.cpp
+++ b/cpp/src/IceGrid/DescriptorBuilder.cpp
@@ -150,12 +150,6 @@ DescriptorBuilder::addVariable(const XmlAttributesHelper&)
     throw "the <variable> element can't be a child of this element";
 }
 
-PropertySetDescriptorBuilder*
-DescriptorBuilder::createPropertySet(const XmlAttributesHelper& attrs) const
-{
-    return new PropertySetDescriptorBuilder(attrs);
-}
-
 PropertySetDescriptorBuilder::PropertySetDescriptorBuilder(const XmlAttributesHelper& attrs) : 
     _id(attrs("id")),
     _inPropertySetRef(false)
@@ -331,6 +325,12 @@ ApplicationDescriptorBuilder::createServiceTemplate(const XmlAttributesHelper& a
     return new TemplateDescriptorBuilder(*this, attrs, true);
 }
 
+PropertySetDescriptorBuilder*
+ApplicationDescriptorBuilder::createPropertySet(const XmlAttributesHelper& attrs) const
+{
+    return new PropertySetDescriptorBuilder(attrs);
+}
+
 void
 ApplicationDescriptorBuilder::addNode(const string& name, const NodeDescriptor& desc)
 {
@@ -429,6 +429,12 @@ NodeDescriptorBuilder::createServerInstance(const XmlAttributesHelper& attrs)
     return new ServerInstanceDescriptorBuilder(attrs);
 }
 
+PropertySetDescriptorBuilder*
+NodeDescriptorBuilder::createPropertySet(const XmlAttributesHelper& attrs) const
+{
+    return new PropertySetDescriptorBuilder(attrs);
+}
+
 void
 NodeDescriptorBuilder::addVariable(const XmlAttributesHelper& attrs)
 {