diff options
| author | Kim van der Riet <kpvdr@apache.org> | 2013-11-07 15:22:20 +0000 |
|---|---|---|
| committer | Kim van der Riet <kpvdr@apache.org> | 2013-11-07 15:22:20 +0000 |
| commit | 90d2ae88a9a79cf223cd5ca3b6fa9bb23c768794 (patch) | |
| tree | d653e4e1e34ea34d03a1b37944acc3a94bf9ead5 /qpid/cpp/src | |
| parent | 2e25036e10d585bdc200c3f1e514d5c176667991 (diff) | |
| download | qpid-python-90d2ae88a9a79cf223cd5ca3b6fa9bb23c768794.tar.gz | |
QPID-4984: Minor fix for ambiguous comparison error on some compilers
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1539680 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/qpid/linearstore/jrnl/RecoveryManager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qpid/cpp/src/qpid/linearstore/jrnl/RecoveryManager.cpp b/qpid/cpp/src/qpid/linearstore/jrnl/RecoveryManager.cpp index a1cf30bae9..cba560750b 100644 --- a/qpid/cpp/src/qpid/linearstore/jrnl/RecoveryManager.cpp +++ b/qpid/cpp/src/qpid/linearstore/jrnl/RecoveryManager.cpp @@ -449,7 +449,7 @@ bool RecoveryManager::getNextRecordHeader() } } file_pos = inFileStream_.tellg(); - if (file_pos == -1) { + if (file_pos == std::streampos(-1)) { std::ostringstream oss; oss << "tellg() failure: fail=" << (inFileStream_.fail()?"T":"F") << " bad=" << (inFileStream_.bad()?"T":"F"); throw jexception(jerrno::JERR_RCVM_STREAMBAD, oss.str(), "RecoveryManager", "getNextRecordHeader"); @@ -616,7 +616,7 @@ void RecoveryManager::readJournalData(char* target, std::streamoff bytesRead = 0; while (bytesRead < readSize) { std::streampos file_pos = inFileStream_.tellg(); - if (file_pos == -1) { + if (file_pos == std::streampos(-1)) { std::ostringstream oss; oss << "tellg() failure: fail=" << (inFileStream_.fail()?"T":"F") << " bad=" << (inFileStream_.bad()?"T":"F"); throw jexception(jerrno::JERR_RCVM_STREAMBAD, oss.str(), "RecoveryManager", "readJournalData"); @@ -626,7 +626,7 @@ void RecoveryManager::readJournalData(char* target, if (thisReadSize < readSize) { getNextFile(false); file_pos = inFileStream_.tellg(); - if (file_pos == -1) { + if (file_pos == std::streampos(-1)) { std::ostringstream oss; oss << "tellg() failure: fail=" << (inFileStream_.fail()?"T":"F") << " bad=" << (inFileStream_.bad()?"T":"F"); throw jexception(jerrno::JERR_RCVM_STREAMBAD, oss.str(), "RecoveryManager", "readJournalData"); |