summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/DescriptorHelper.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2006-05-30 14:57:00 +0000
committerBernard Normier <bernard@zeroc.com>2006-05-30 14:57:00 +0000
commit12764f7f9f55ba85549116612c1635bd4ab4f559 (patch)
tree0795fac7a035675738442fa13a65e32c48070c0a /cpp/src/IceGrid/DescriptorHelper.cpp
parentFixed bug 971 and 983. (diff)
downloadice-12764f7f9f55ba85549116612c1635bd4ab4f559.tar.bz2
ice-12764f7f9f55ba85549116612c1635bd4ab4f559.tar.xz
ice-12764f7f9f55ba85549116612c1635bd4ab4f559.zip
VC8 build fixes
Diffstat (limited to 'cpp/src/IceGrid/DescriptorHelper.cpp')
-rw-r--r--cpp/src/IceGrid/DescriptorHelper.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/DescriptorHelper.cpp b/cpp/src/IceGrid/DescriptorHelper.cpp
index f489f2bb11e..cc83e568b65 100644
--- a/cpp/src/IceGrid/DescriptorHelper.cpp
+++ b/cpp/src/IceGrid/DescriptorHelper.cpp
@@ -781,8 +781,8 @@ Resolver::getProperties(const Ice::StringSeq& references, set<string>& resolved)
properties.insert(properties.end(), p.begin(), p.end());
}
- PropertyDescriptorSeq p = operator()(desc.properties);
- properties.insert(properties.end(), p.begin(), p.end());
+ PropertyDescriptorSeq pds = operator()(desc.properties);
+ properties.insert(properties.end(), pds.begin(), pds.end());
}
return properties;
}