r22239 by jghali -

scribus-commit scribus-commit at lists.scribus.net
Mon Dec 4 23:31:57 UTC 2017


Author: jghali
Date: Mon Dec  4 23:31:57 2017
New Revision: 22239

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22239
Log:
fix build error with gcc

Modified:
    trunk/Scribus/scribus/scclocale.cpp

Modified: trunk/Scribus/scribus/scclocale.cpp
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22239&path=/trunk/Scribus/scribus/scclocale.cpp
==============================================================================
--- trunk/Scribus/scribus/scclocale.cpp	(original)
+++ trunk/Scribus/scribus/scclocale.cpp	Mon Dec  4 23:31:57 2017
@@ -185,7 +185,7 @@
 		std::istringstream sstream(str);
 		sstream.imbue(std::locale::classic());
 		sstream >> result;
-		bytesRead = sstream.eof() ? strlen(str) : sstream.tellg();
+		bytesRead = sstream.eof() ? strlen(str) : (std::streamoff) sstream.tellg();
 		*endptr = const_cast<char*>(str) + bytesRead;
 		return result;
 	}
@@ -196,7 +196,7 @@
 	std::istringstream sstream(str);
 	sstream.imbue(std::locale::classic());
 	sstream >> result;
-	bytesRead = sstream.eof() ? strlen(str) : sstream.tellg();
+	bytesRead = sstream.eof() ? strlen(str) : (std::streamoff) sstream.tellg();
 	*endptr = const_cast<char*>(str) + bytesRead;
 	return result;
 #elif defined(Q_OS_WIN)




More information about the scribus-commit mailing list