diff options
| author | Bernard Normier <bernard@zeroc.com> | 2018-11-01 17:14:06 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2018-11-01 17:14:06 -0400 |
| commit | 3a763985c52246b1b804cdd7ee7bd49a82e76bd3 (patch) | |
| tree | e35b1b0bdf6715ed784d0c86482355528bee81ee /cpp/src/IceGrid/ServerI.cpp | |
| parent | Visual Studio and msbuild updates (diff) | |
| download | ice-3a763985c52246b1b804cdd7ee7bd49a82e76bd3.tar.bz2 ice-3a763985c52246b1b804cdd7ee7bd49a82e76bd3.tar.xz ice-3a763985c52246b1b804cdd7ee7bd49a82e76bd3.zip | |
Increase Visual Studio warning level to Level4
Fixes #223.
Diffstat (limited to 'cpp/src/IceGrid/ServerI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/ServerI.cpp | 7 |
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. } } |