diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-16 10:35:21 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-05-16 10:35:21 +0200 |
| commit | cf2bf011ae0f33bed963d088f8267746a3369c4c (patch) | |
| tree | 12c244d7bbb9d1a75a15632292aa14bafeea0c42 /src/qml/jsruntime/qv4memberdata.cpp | |
| parent | 3fff03048a48aa7ead6e888165b2ae5a118d675c (diff) | |
| parent | 039071ea5e93d93deb0103e7c9488198dcce55d6 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I192cb06f3b92869699cb3e072f2c6c1e8dbb1ef4
Diffstat (limited to 'src/qml/jsruntime/qv4memberdata.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4memberdata.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4memberdata.cpp b/src/qml/jsruntime/qv4memberdata.cpp index f327c85001..ffebe1b5da 100644 --- a/src/qml/jsruntime/qv4memberdata.cpp +++ b/src/qml/jsruntime/qv4memberdata.cpp @@ -72,8 +72,8 @@ Heap::MemberData *MemberData::allocate(ExecutionEngine *e, uint n, Heap::MemberD // The above code can overflow in a number of interesting ways. All of those are unsigned, // and therefore defined behavior. Still, apply some sane bounds. - if (alloc > std::numeric_limits<int>::max()) - alloc = std::numeric_limits<int>::max(); + if (alloc > size_t(std::numeric_limits<int>::max())) + alloc = size_t(std::numeric_limits<int>::max()); Heap::MemberData *m; if (old) { |