diff options
| author | Eugene Shcherbina <eugene@eshcher.com> | 2012-03-06 14:27:38 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-19 08:00:02 (GMT) |
| commit | 69f84b9514f8f22d27590ac890dbd20aec369702 (patch) | |
| tree | d831189e46ff5b457a52dca7ef23fc8bbd67b309 /src/3rdparty/des | |
| parent | 66d8e41cbf607ef3f43d525ed8ec4ed376a6fac2 (diff) | |
| download | Qt-69f84b9514f8f22d27590ac890dbd20aec369702.zip Qt-69f84b9514f8f22d27590ac890dbd20aec369702.tar.gz Qt-69f84b9514f8f22d27590ac890dbd20aec369702.tar.bz2 | |
Fixed MSVC2011 build
It consists of 2 fixes:
1. JavaScriptCore fix is relevant to changed ctor of the std::pair in
C++11. Due to that change some code has been broken. Fix makes using
std::pair compliant to both standards
2. Clucene is broken in MVS2011 due to changed stdext::hash_map which
is used as the ancestor in inner CLucene classes. It ended up with
names collision and double inheritance from the one base class.
Fix reflects that change.
Change-Id: I77a1fe4b137480b51c24267b7aacb5b688dbddb3
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Kervala <kervala@gmail.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Diffstat (limited to 'src/3rdparty/des')
0 files changed, 0 insertions, 0 deletions