diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceGrid/DescriptorHelper.cpp | 4 | ||||
| -rw-r--r-- | cpp/src/IceGrid/FileUserAccountMapperI.cpp | 1 |
2 files changed, 3 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; } diff --git a/cpp/src/IceGrid/FileUserAccountMapperI.cpp b/cpp/src/IceGrid/FileUserAccountMapperI.cpp index 9d29e56582a..77c44297642 100644 --- a/cpp/src/IceGrid/FileUserAccountMapperI.cpp +++ b/cpp/src/IceGrid/FileUserAccountMapperI.cpp @@ -7,6 +7,7 @@ // // ********************************************************************** +#include <IceUtil/DisableWarnings.h> #include <IceGrid/FileUserAccountMapperI.h> #include <fstream> |