summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/ServerI.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/IceGrid/ServerI.cpp')
-rw-r--r--cpp/src/IceGrid/ServerI.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp
index 22e6cdf1c95..2a249101a62 100644
--- a/cpp/src/IceGrid/ServerI.cpp
+++ b/cpp/src/IceGrid/ServerI.cpp
@@ -2479,9 +2479,9 @@ ServerI::checkRevision(const string& replicaName, const string& uuid, int revisi
is.getline(line, 1024); // Ignore comments
is.getline(line, 1024);
is.getline(line, 1024);
- string ignore;
- is >> ignore >> descUUID;
- is >> ignore >> descRevision;
+ string ignored;
+ is >> ignored >> descUUID;
+ is >> ignored >> descRevision;
}
if(uuid != descUUID)
@@ -3175,7 +3175,6 @@ ServerI::getFilePath(const string& filename) const
else
{
throw FileNotAvailableException("unknown file");
- return ""; // Keep the compiler happy.
}
}