summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/IceGrid/NodeI.cpp2
-rwxr-xr-xcpp/src/IceGrid/icegridnode.dsp2
2 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/NodeI.cpp b/cpp/src/IceGrid/NodeI.cpp
index 8cfd5d9ec0d..ad89ae511b6 100644
--- a/cpp/src/IceGrid/NodeI.cpp
+++ b/cpp/src/IceGrid/NodeI.cpp
@@ -780,7 +780,7 @@ NodeI::checkConsistencyNoSync(const Ice::StringSeq& servers)
try
{
Ice::StringSeq::const_iterator p;
- for(p = contents.begin(); p != --contents.end(); ++p)
+ for(p = contents.begin(); p != contents.end()-1; ++p)
{
rename(_tmpDir + "/" + *(p + 1), _tmpDir + "/" + *p);
}
diff --git a/cpp/src/IceGrid/icegridnode.dsp b/cpp/src/IceGrid/icegridnode.dsp
index 894924006bf..c8965426ee1 100755
--- a/cpp/src/IceGrid/icegridnode.dsp
+++ b/cpp/src/IceGrid/icegridnode.dsp
@@ -390,7 +390,7 @@ SOURCE=.\dummy2.ice
InputPath=.\dummy2.ice
BuildCmds= \
- ..\..\bin\slice2freeze.exe --ice --include-dir IceGrid -I../../slice --dict "IceGrid::StringObjectProxiesDict,string,IceGrid::StringObjectProxyDict" StringObjectProxiesDict ../IceGrid/Internal.ice
+ ..\..\bin\slice2freeze.exe --ice --include-dir IceGrid -I../../slice -I.. --dict "IceGrid::StringObjectProxiesDict,string,IceGrid::StringObjectProxyDict" StringObjectProxiesDict ../IceGrid/Internal.ice
"StringObjectProxiesDict.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
$(BuildCmds)