diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-12-07 12:31:05 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-12-07 12:31:05 +0000 |
| commit | 078d0ff0de6ee889f8ba97d370f9de33d4ee5cbf (patch) | |
| tree | 0028664c5f9523b7c621d8a9a83fa78a933a5764 /cpp/src | |
| parent | Improved FileIterator interface Changed patch() operation on the node to (diff) | |
| download | ice-078d0ff0de6ee889f8ba97d370f9de33d4ee5cbf.tar.bz2 ice-078d0ff0de6ee889f8ba97d370f9de33d4ee5cbf.tar.xz ice-078d0ff0de6ee889f8ba97d370f9de33d4ee5cbf.zip | |
Fix
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceGrid/AdminI.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/IceGrid/FileCache.cpp | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/AdminI.cpp b/cpp/src/IceGrid/AdminI.cpp index b59ce9ff5b9..3c680e2caf8 100644 --- a/cpp/src/IceGrid/AdminI.cpp +++ b/cpp/src/IceGrid/AdminI.cpp @@ -234,7 +234,7 @@ AdminI::~AdminI() } } } - catch(const Ice::LocalException& ex) + catch(const Ice::LocalException&) { } } diff --git a/cpp/src/IceGrid/FileCache.cpp b/cpp/src/IceGrid/FileCache.cpp index 4574af3731b..9dd062ce66f 100644 --- a/cpp/src/IceGrid/FileCache.cpp +++ b/cpp/src/IceGrid/FileCache.cpp @@ -45,7 +45,11 @@ FileCache::getOffsetFromEnd(const string& file, int originalCount) is.clear(); if(lastBlockOffset - blockSize > 0) { - is.seekg(lastBlockOffset - blockSize); +#ifdef _WIN32 + is.seekg(static_cast<int>(lastBlockOffset - blockSize)); +#else + is.seekg(static_cast<streampos>(lastBlockOffset - blockSize)); +#endif getline(is, line); // Ignore the first line as it's most likely not complete. } else |