diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2009-05-05 15:50:21 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2009-05-05 15:50:21 -0230 |
| commit | 9f82f9524eb7f9d296d0b78b48425617efdfe878 (patch) | |
| tree | 1c1426f4eea9bb937d80449718feafd2f45ca423 /cpp/src/IceGrid/DescriptorHelper.cpp | |
| parent | Bug 1594 - some more byte sequence optimizations (diff) | |
| download | ice-9f82f9524eb7f9d296d0b78b48425617efdfe878.tar.bz2 ice-9f82f9524eb7f9d296d0b78b48425617efdfe878.tar.xz ice-9f82f9524eb7f9d296d0b78b48425617efdfe878.zip | |
Bug 3624 - desupport HP
Diffstat (limited to 'cpp/src/IceGrid/DescriptorHelper.cpp')
| -rw-r--r-- | cpp/src/IceGrid/DescriptorHelper.cpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/cpp/src/IceGrid/DescriptorHelper.cpp b/cpp/src/IceGrid/DescriptorHelper.cpp index 5fb6b0f8f49..1692300df84 100644 --- a/cpp/src/IceGrid/DescriptorHelper.cpp +++ b/cpp/src/IceGrid/DescriptorHelper.cpp @@ -2712,14 +2712,8 @@ ApplicationHelper::update(const ApplicationUpdateDescriptor& updt) const NodeHelperDict::const_iterator q = _nodes.find(p->name); if(q != _nodes.end()) // Updated node { - // - // COMPILERBUG: AIX xlC (Visual Age 6, 64bit builds) - // requires the `desc' temporary here. We can't do the - // update call in the make_pair call directly (this - // results in a SEGFAULT at runtime). - // NodeDescriptor desc = q->second.update(*p, resolve); - def.nodes.insert(make_pair(p->name, desc)); + def.nodes.insert(make_pair(p->name, q->second.update(*p, resolve))); } else // New node { |