Fix MSVC 64 bit warnings about loss of data when converting from 'size_t' to 'int'.
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Wed, 18 Feb 2015 09:08:24 +0000 (10:08 +0100)
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Mon, 23 Feb 2015 19:48:54 +0000 (19:48 +0000)
jsruntime\qv4arraybuffer.cpp(94) : warning C4267: '=' : conversion from 'size_t' to 'int', possible loss of data
jsruntime\qv4persistent.cpp(53) : warning C4267: 'initializing' : conversion from 'size_t' to 'const int', possible loss of data

Change-Id: I6ccef9a64ecfb53b18204b35e17421c0a5ac955b
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
src/qml/jsruntime/qv4arraybuffer.cpp
src/qml/jsruntime/qv4persistent.cpp

index b7232c1..e42fcdc 100644 (file)
@@ -91,7 +91,7 @@ Heap::ArrayBuffer::ArrayBuffer(ExecutionEngine *e, size_t length)
         e->throwRangeError(QStringLiteral("ArrayBuffer: out of memory"));
         return;
     }
-    data->size = length;
+    data->size = int(length);
     memset(data->data(), 0, length + 1);
 }
 
index dfa9346..88dc194 100644 (file)
@@ -50,7 +50,7 @@ struct Header {
     int freeList;
 };
 
-static const int kEntriesPerPage = (WTF::pageSize() - sizeof(Header)) / sizeof(Value);
+static const int kEntriesPerPage = int((WTF::pageSize() - sizeof(Header)) / sizeof(Value));
 
 struct Page {
     Header header;