diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-02-18 10:08:24 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-02-23 19:48:54 +0000 |
| commit | 4d417c7fbf8b9e00e260951e29cba16072272cc5 (patch) | |
| tree | e195039ddbe3c47e40e994b0a4a447645663c6b1 | |
| parent | 5d4fd80e1e5290ccfe7ef216420a457f57d64705 (diff) | |
Fix MSVC 64 bit warnings about loss of data when converting from 'size_t' to 'int'.
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>
| -rw-r--r-- | src/qml/jsruntime/qv4arraybuffer.cpp | 2 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4persistent.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4arraybuffer.cpp b/src/qml/jsruntime/qv4arraybuffer.cpp index b7232c1a28..e42fcdc4fd 100644 --- a/src/qml/jsruntime/qv4arraybuffer.cpp +++ b/src/qml/jsruntime/qv4arraybuffer.cpp @@ -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); } diff --git a/src/qml/jsruntime/qv4persistent.cpp b/src/qml/jsruntime/qv4persistent.cpp index dfa9346140..88dc1946b8 100644 --- a/src/qml/jsruntime/qv4persistent.cpp +++ b/src/qml/jsruntime/qv4persistent.cpp @@ -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; |