diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/IceGrid/DescriptorHelper.cpp | 4 | ||||
| -rw-r--r-- | cpp/test/Ice/location/locationC.dsp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/IceGrid/DescriptorHelper.cpp b/cpp/src/IceGrid/DescriptorHelper.cpp index 11f5f49bfcd..a8c0f95ccaa 100644 --- a/cpp/src/IceGrid/DescriptorHelper.cpp +++ b/cpp/src/IceGrid/DescriptorHelper.cpp @@ -1693,9 +1693,9 @@ NodeHelper::getPatchDirs(const string& patch, const Resolver& appResolve) const } } Ice::StringSeq strSeq; - for(set<string>::const_iterator p = directories.begin(); p != directories.end(); ++p) + for(set<string>::const_iterator p2 = directories.begin(); p2 != directories.end(); ++p2) { - strSeq.push_back(*p); + strSeq.push_back(*p2); } return make_pair(strSeq, servers); } diff --git a/cpp/test/Ice/location/locationC.dsp b/cpp/test/Ice/location/locationC.dsp index b0add104b66..d5af5f8fda0 100644 --- a/cpp/test/Ice/location/locationC.dsp +++ b/cpp/test/Ice/location/locationC.dsp @@ -124,7 +124,7 @@ USERDEP__TEST_="..\..\..\bin\slice2cpp.exe" "..\..\..\lib\slice.lib" InputPath=.\Test.ice
BuildCmds= \
- ..\..\..\bin\slice2cpp.exe Test.ice
+ ..\..\..\bin\slice2cpp.exe -I..\..\..\slice Test.ice
"Test.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)
|