Fix failing assertion with MSVC in debug builds in various tests
authorSimon Hausmann <simon.hausmann@digia.com>
Wed, 26 Jun 2013 11:25:07 +0000 (13:25 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Wed, 26 Jun 2013 13:46:04 +0000 (15:46 +0200)
commit8c0b5be80215a23d2236d2ad2d1681aa80499cc8
treef010e10977b0a1951eeb36a4b2132e2be6d4cdc7
parentb24bf4fc0c728e380c953ed3dfb5613d9547b13a
Fix failing assertion with MSVC in debug builds in various tests

We re-implemented Vector::begin() and end() by means of dereferencing the return
value from std::begin() and then taking the address of it. That causes a failing
assertion in MSVC's STL (rightly so!). We did this only to avoid modifying
the original YarrJIT.cpp code.

This patch instead simplifies our Vector.h stub again and just fixes the two
small occurrences in YarrJIT.cpp where it expects vector->begin() to return a
pointer instead of an iterator.

Change-Id: I2ad137be91ea969ccb310333dffa8d98e5825f8f
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
src/3rdparty/masm/masm.pri
src/3rdparty/masm/stubs/wtf/Vector.h
src/3rdparty/masm/yarr/YarrJIT.cpp