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/clucene | |
| 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/clucene')
| -rw-r--r-- | src/3rdparty/clucene/src/CLucene/debug/mem.h | 4 | ||||
| -rw-r--r-- | src/3rdparty/clucene/src/CLucene/util/VoidList.h | 9 | ||||
| -rw-r--r-- | src/3rdparty/clucene/src/CLucene/util/VoidMap.h | 9 |
3 files changed, 10 insertions, 12 deletions
diff --git a/src/3rdparty/clucene/src/CLucene/debug/mem.h b/src/3rdparty/clucene/src/CLucene/debug/mem.h index e15c3de..c208147 100644 --- a/src/3rdparty/clucene/src/CLucene/debug/mem.h +++ b/src/3rdparty/clucene/src/CLucene/debug/mem.h @@ -16,10 +16,10 @@ //Macro for creating new objects #if defined(LUCENE_ENABLE_MEMLEAKTRACKING) #define _CLNEW new(__FILE__, __LINE__) - #define LUCENE_BASE public CL_NS(debug)::LuceneBase + #define LUCENE_BASE public virtual CL_NS(debug)::LuceneBase #elif defined(LUCENE_ENABLE_REFCOUNT) #define _CLNEW new - #define LUCENE_BASE public CL_NS(debug)::LuceneBase + #define LUCENE_BASE public virtual CL_NS(debug)::LuceneBase #else #define _CLNEW new #define LUCENE_BASE public CL_NS(debug)::LuceneVoidBase diff --git a/src/3rdparty/clucene/src/CLucene/util/VoidList.h b/src/3rdparty/clucene/src/CLucene/util/VoidList.h index cd69088..b31baba 100644 --- a/src/3rdparty/clucene/src/CLucene/util/VoidList.h +++ b/src/3rdparty/clucene/src/CLucene/util/VoidList.h @@ -19,16 +19,15 @@ CL_NS_DEF(util) * A template to encapsulate various list type classes * @internal */ -template<typename _kt,typename _base,typename _valueDeletor> -class __CLList:public _base,LUCENE_BASE { +template<typename _kt,typename base,typename _valueDeletor> +class __CLList:public base,LUCENE_BASE { private: bool dv; - typedef _base base; public: DEFINE_MUTEX(THIS_LOCK) - typedef typename _base::const_iterator const_iterator; - typedef typename _base::iterator iterator; + typedef typename base::const_iterator const_iterator; + typedef typename base::iterator iterator; virtual ~__CLList(){ clear(); diff --git a/src/3rdparty/clucene/src/CLucene/util/VoidMap.h b/src/3rdparty/clucene/src/CLucene/util/VoidMap.h index b22b507..1153a01 100644 --- a/src/3rdparty/clucene/src/CLucene/util/VoidMap.h +++ b/src/3rdparty/clucene/src/CLucene/util/VoidMap.h @@ -19,19 +19,18 @@ CL_NS_DEF(util) * @internal */ template<typename _kt, typename _vt, - typename _base, + typename base, typename _KeyDeletor=CL_NS(util)::Deletor::Dummy, typename _ValueDeletor=CL_NS(util)::Deletor::Dummy> -class __CLMap:public _base,LUCENE_BASE { +class __CLMap: public base, LUCENE_BASE { private: bool dk; bool dv; - typedef _base base; public: DEFINE_MUTEX(THIS_LOCK) - typedef typename _base::iterator iterator; - typedef typename _base::const_iterator const_iterator; + typedef typename base::iterator iterator; + typedef typename base::const_iterator const_iterator; typedef CL_NS_STD(pair)<_kt, _vt> _pair; ///Default constructor for the __CLMap |