diff options
| author | Jose <jose@zeroc.com> | 2012-08-08 18:52:08 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-08-08 18:52:08 +0200 |
| commit | 0dd3bcb062c3aaf9ffb8ca56b58c13d5dc714545 (patch) | |
| tree | 8067c6695cc5e9672582a904409846e38ffba593 /cpp/src/IcePatch2/FileServerI.cpp | |
| parent | Fixed python & ruby compilation error caused by OutputStream::format removal (diff) | |
| download | ice-0dd3bcb062c3aaf9ffb8ca56b58c13d5dc714545.tar.bz2 ice-0dd3bcb062c3aaf9ffb8ca56b58c13d5dc714545.tar.xz ice-0dd3bcb062c3aaf9ffb8ca56b58c13d5dc714545.zip | |
remove VC6 support
Diffstat (limited to 'cpp/src/IcePatch2/FileServerI.cpp')
| -rwxr-xr-x | cpp/src/IcePatch2/FileServerI.cpp | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/cpp/src/IcePatch2/FileServerI.cpp b/cpp/src/IcePatch2/FileServerI.cpp index daec1f2216a..5076329b757 100755 --- a/cpp/src/IcePatch2/FileServerI.cpp +++ b/cpp/src/IcePatch2/FileServerI.cpp @@ -105,13 +105,7 @@ IcePatch2::FileServerI::getFileCompressed_async(const AMD_FileServer_getFileComp return; } - if( -#if defined(_MSC_VER) && (_MSC_VER >= 1400) - _lseek(fd, static_cast<off_t>(pos), SEEK_SET) -#else - lseek(fd, static_cast<off_t>(pos), SEEK_SET) -#endif - != static_cast<off_t>(pos)) + if(_lseek(fd, static_cast<off_t>(pos), SEEK_SET) != static_cast<off_t>(pos)) { IceUtilInternal::close(fd); @@ -127,13 +121,7 @@ IcePatch2::FileServerI::getFileCompressed_async(const AMD_FileServer_getFileComp IceUtil::ScopedArray<Byte> bytes(new Byte[num]); #ifdef _WIN32 int r; - if((r = -#if defined(_MSC_VER) && (_MSC_VER >= 1400) - _read(fd, bytes.get(), static_cast<unsigned int>(num)) -#else - read(fd, bytes.get(), static_cast<unsigned int>(num)) -#endif - ) == -1) + if((r = _read(fd, bytes.get(), static_cast<unsigned int>(num))) == -1) #else ssize_t r; if((r = read(fd, bytes.get(), static_cast<size_t>(num))) == -1) |