Clucene: Fixed MSVC2011 build.
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>
Mon, 25 Jun 2012 10:58:01 +0000 (12:58 +0200)
committerQt by Nokia <qt-info@nokia.com>
Mon, 25 Jun 2012 11:38:13 +0000 (13:38 +0200)
commit053cf8ccb7de0c72b9aea47937876a03c99fa938
treea959fc221277c80bee1a6a085ce8aa28bddba567
parent5a1eae5523c27a61b971b7a3d475a0c53cbea166
Clucene: Fixed MSVC2011 build.

This is basically taken from Qt 4.8 /
69f84b9514f8f22d27590ac890dbd20aec369702.

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: Ia733c3b51dafc5d22674cc3822e6305819582429
Initial-patch-by: Eugene Shcherbina <eugene@eshcher.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
src/assistant/3rdparty/clucene/src/CLucene/debug/mem.h
src/assistant/3rdparty/clucene/src/CLucene/util/VoidList.h
src/assistant/3rdparty/clucene/src/CLucene/util/VoidMap.h