diff options
| author | Jesus Fernandez <jesus.fernandez@qt.io> | 2017-03-23 16:15:46 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-03-24 09:10:14 +0000 |
| commit | d1c43e44572f5b554467e5f1c2db4914b549b569 (patch) | |
| tree | 564cc159bc9a4fee25e64b43604fdac16399e35c /src/qml/memory | |
| parent | 24d0266ee45cf6a3c5b9142453966199702fbf90 (diff) | |
Fix possible loss of data warning
warning C4267: '=': conversion from 'size_t' to 'int', possible loss of data
Amends merge resolution of 24d0266ee45cf6a3c5b9142453966199702fbf90.
Change-Id: I55eca8d853bb957e5b4ea792036aaa0b2f122b38
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/memory')
| -rw-r--r-- | src/qml/memory/qv4mm.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/memory/qv4mm.cpp b/src/qml/memory/qv4mm.cpp index 180371c088..c025dd09a4 100644 --- a/src/qml/memory/qv4mm.cpp +++ b/src/qml/memory/qv4mm.cpp @@ -733,7 +733,7 @@ MemoryManager::MemoryManager(ExecutionEngine *engine) #ifdef MM_STATS static int allocationCount = 0; -static int lastAllocRequestedSlots = 0; +static size_t lastAllocRequestedSlots = 0; #endif Heap::Base *MemoryManager::allocString(std::size_t unmanagedSize) |