aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2013-11-25 15:01:12 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-11-26 09:46:20 +0100
commit93304429cf127c384864a0f893d84dee4ae22296 (patch)
tree1d69891e1fc1c53f63f42318d813321837987342 /src
parentf449534020adc8623ebfced5daae331ef56c4421 (diff)
Fix MSVC-64-warning about shift word size.
jsruntime\qv4mm.cpp(301) : warning C4334: '<<' : result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?). Change-Id: I6a4ca024d43776e16a323fdb8c35a339b74e6c09 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/qml/jsruntime/qv4mm.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4mm.cpp b/src/qml/jsruntime/qv4mm.cpp
index 9cac0cf90c..6f1e48681c 100644
--- a/src/qml/jsruntime/qv4mm.cpp
+++ b/src/qml/jsruntime/qv4mm.cpp
@@ -298,7 +298,7 @@ Managed *MemoryManager::alloc(std::size_t size)
uint shift = ++m_d->nChunks[pos];
if (shift > 10)
shift = 10;
- std::size_t allocSize = CHUNK_SIZE*(1 << shift);
+ std::size_t allocSize = CHUNK_SIZE*(size_t(1) << shift);
allocSize = roundUpToMultipleOf(WTF::pageSize(), allocSize);
Data::Chunk allocation;
allocation.memory = PageAllocation::allocate(allocSize, OSAllocator::JSGCHeapPages);