mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-19 03:52:17 +00:00
c1436fa4e5
. fix built using Clang in C++11 mode and libc++ (-std=c++11 -stdlib=libc++); . incorporate a patch that fixes an assert bug in IceStrom; . adopt new-style options; While I'm here: . adopt new-style headers; . remove indefinite article form COMMENT; . remove library versions from LIB_DEPENDS. PR: ports/171643 Submitted by: Michael Gmelin <freebsd@grem.de> (maintainer)
21 lines
598 B
C++
21 lines
598 B
C++
--- cpp.orig/src/IceGrid/FileCache.cpp 2011-06-15 21:43:58.000000000 +0200
|
|
+++ cpp/src/IceGrid/FileCache.cpp 2012-09-10 11:43:58.000000000 +0200
|
|
@@ -195,15 +195,12 @@ FileCache::read(const string& file, Ice::Long offset, int size, Ice::Long& newOf
|
|
|
|
totalSize += lineSize;
|
|
lines.push_back(line);
|
|
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
|
|
- if(is.eof())
|
|
+
|
|
+ if(is.eof() || is.fail())
|
|
{
|
|
newOffset += line.size();
|
|
}
|
|
else
|
|
-#else
|
|
- if(!is.fail())
|
|
-#endif
|
|
{
|
|
newOffset = is.tellg();
|
|
}
|