diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/Reference.cpp | 13 | ||||
| -rw-r--r-- | cpp/src/IceGrid/FileCache.cpp | 6 |
2 files changed, 16 insertions, 3 deletions
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp index 13712887d3d..9846f91e86b 100644 --- a/cpp/src/Ice/Reference.cpp +++ b/cpp/src/Ice/Reference.cpp @@ -496,30 +496,35 @@ ReferencePtr IceInternal::FixedReference::changeSecure(bool) const { throw FixedProxyException(__FILE__, __LINE__); + return 0; // Keep the compiler happy. } ReferencePtr IceInternal::FixedReference::changePreferSecure(bool) const { throw FixedProxyException(__FILE__, __LINE__); + return 0; // Keep the compiler happy. } ReferencePtr IceInternal::FixedReference::changeRouter(const RouterPrx&) const { throw FixedProxyException(__FILE__, __LINE__); + return 0; // Keep the compiler happy. } ReferencePtr IceInternal::FixedReference::changeLocator(const LocatorPrx&) const { throw FixedProxyException(__FILE__, __LINE__); + return 0; // Keep the compiler happy. } ReferencePtr IceInternal::FixedReference::changeCollocationOptimization(bool) const { throw FixedProxyException(__FILE__, __LINE__); + return 0; // Keep the compiler happy. } ReferencePtr @@ -529,48 +534,56 @@ IceInternal::FixedReference::changeCompress(bool) const // that gets its default from the fixed connection this reference // refers to. This should be changable with changeCompress(). throw FixedProxyException(__FILE__, __LINE__); + return 0; // Keep the compiler happy. } ReferencePtr IceInternal::FixedReference::changeTimeout(int) const { throw FixedProxyException(__FILE__, __LINE__); + return 0; // Keep the compiler happy. } ReferencePtr IceInternal::FixedReference::changeConnectionId(const string&) const { throw FixedProxyException(__FILE__, __LINE__); + return 0; // Keep the compiler happy. } ReferencePtr IceInternal::FixedReference::changeLocatorCacheTimeout(int) const { throw FixedProxyException(__FILE__, __LINE__); + return 0; // Keep the compiler happy. } ReferencePtr IceInternal::FixedReference::changeAdapterId(const string& newAdapterId) const { throw FixedProxyException(__FILE__, __LINE__); + return 0; // Keep the compiler happy. } ReferencePtr IceInternal::FixedReference::changeEndpoints(const vector<EndpointIPtr>& newEndpoints) const { throw FixedProxyException(__FILE__, __LINE__); + return 0; // Keep the compiler happy. } ReferencePtr IceInternal::FixedReference::changeCacheConnection(bool) const { throw FixedProxyException(__FILE__, __LINE__); + return 0; // Keep the compiler happy. } ReferencePtr IceInternal::FixedReference::changeEndpointSelection(EndpointSelectionType) const { throw FixedProxyException(__FILE__, __LINE__); + return 0; // Keep the compiler happy. } void diff --git a/cpp/src/IceGrid/FileCache.cpp b/cpp/src/IceGrid/FileCache.cpp index b555281482f..8f83b830400 100644 --- a/cpp/src/IceGrid/FileCache.cpp +++ b/cpp/src/IceGrid/FileCache.cpp @@ -47,7 +47,7 @@ FileCache::getOffsetFromEnd(const string& file, int originalCount) // read. // is.clear(); - if(lastBlockOffset - blockSize > 0) + if(lastBlockOffset - blockSize > streamoff(0)) { is.seekg(lastBlockOffset - blockSize); getline(is, line); // Ignore the first line as it's most likely not complete. @@ -66,7 +66,7 @@ FileCache::getOffsetFromEnd(const string& file, int originalCount) // deque<string> lines; int count = originalCount - totalCount; // Number of lines left to find. - while(is.good() && is.tellg() < lastBlockOffset) + while(is.good() && is.tellg() < streamoff(lastBlockOffset)) { getline(is, line); @@ -81,7 +81,7 @@ FileCache::getOffsetFromEnd(const string& file, int originalCount) } } - if(lastBlockOffset - blockSize < 0) + if(lastBlockOffset - blockSize < streamoff(0)) { break; // We're done if the block started at the begining of the file. } |