summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Christian <andrew.christian@nokia.com>2011-12-13 11:44:56 -0500
committerJamey Hicks <jamey.hicks@nokia.com>2011-12-14 19:59:53 +0100
commitf98a7f10d295be310368c1822281a07f11da5f3d (patch)
tree2794c8877e9c5fa37cf99d419e414f400b6f4ae1
parent92a205c243dce1e7e7b022b27fb8fde7afcce93a (diff)
Fix type to compile on 64-bit machine
Change-Id: Ieda55f9196b58f73dcb81d3e866cef6a16e65fde Reviewed-by: Jamey Hicks <jamey.hicks@nokia.com>
-rw-r--r--src/qjsonparser.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qjsonparser.cpp b/src/qjsonparser.cpp
index e83a0b9..5644ed2 100644
--- a/src/qjsonparser.cpp
+++ b/src/qjsonparser.cpp
@@ -117,7 +117,7 @@ QtJson::JsonDocument QJsonParser::parse()
qDebug() << ">>>>> parser begin";
#endif
// allocate some space
- dataLength = qMax(end - json, 256);
+ dataLength = qMax(end - json, (ptrdiff_t) 256);
data = (char *)malloc(dataLength);
// fill in Header data