diff options
| author | Michi Henning <michi@zeroc.com> | 2007-10-16 16:04:22 +1000 |
|---|---|---|
| committer | Michi Henning <michi@zeroc.com> | 2007-10-16 16:04:22 +1000 |
| commit | 17bc57e6e22cffa7942d03c168afa278b0a4d7fd (patch) | |
| tree | ae9134b9e5b3c10d70b8f69f01fad365d32b9a94 /cpp/src/IceGrid/DescriptorBuilder.cpp | |
| parent | Finished implementation of custom sequence mapping. (diff) | |
| parent | Fixed bug #2098 (diff) | |
| download | ice-17bc57e6e22cffa7942d03c168afa278b0a4d7fd.tar.bz2 ice-17bc57e6e22cffa7942d03c168afa278b0a4d7fd.tar.xz ice-17bc57e6e22cffa7942d03c168afa278b0a4d7fd.zip | |
Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice
Diffstat (limited to 'cpp/src/IceGrid/DescriptorBuilder.cpp')
| -rw-r--r-- | cpp/src/IceGrid/DescriptorBuilder.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/cpp/src/IceGrid/DescriptorBuilder.cpp b/cpp/src/IceGrid/DescriptorBuilder.cpp index 27ae39bb7ff..365ef7bb65c 100644 --- a/cpp/src/IceGrid/DescriptorBuilder.cpp +++ b/cpp/src/IceGrid/DescriptorBuilder.cpp @@ -155,12 +155,6 @@ PropertySetDescriptorBuilder::PropertySetDescriptorBuilder() : { } -PropertySetDescriptorBuilder::PropertySetDescriptorBuilder(const PropertySetDescriptor& desc) : - _descriptor(desc), - _inPropertySetRef(false) -{ -} - void PropertySetDescriptorBuilder::setId(const string& id) { @@ -639,7 +633,7 @@ CommunicatorDescriptorBuilder::addProperty(const XmlAttributesHelper& attrs) PropertySetDescriptorBuilder* CommunicatorDescriptorBuilder::createPropertySet() const { - return new PropertySetDescriptorBuilder(_descriptor->propertySet); + return new PropertySetDescriptorBuilder(); } void @@ -804,7 +798,7 @@ ServiceInstanceDescriptorBuilder::ServiceInstanceDescriptorBuilder(const XmlAttr PropertySetDescriptorBuilder* ServiceInstanceDescriptorBuilder::createPropertySet() const { - return new PropertySetDescriptorBuilder(_descriptor.propertySet); + return new PropertySetDescriptorBuilder(); } void |