From 90d2ae88a9a79cf223cd5ca3b6fa9bb23c768794 Mon Sep 17 00:00:00 2001 From: Kim van der Riet Date: Thu, 7 Nov 2013 15:22:20 +0000 Subject: 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 --- qpid/cpp/src/qpid/linearstore/jrnl/RecoveryManager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'qpid/cpp/src') 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"); -- cgit v1.2.1