[Libreoffice-commits] core.git: external/clucene

[David Ostrovsky]

 external/clucene/UnpackedTarball_clucene.mk                               |    3 
 external/clucene/patches/clucene-mixes-uptemplate-parameter-msvc-14.patch |   53 ++++++++++
 2 files changed, 56 insertions(+)

New commits:
commit c26ebc6bd37b32808514635cf7c5f6434df7501d
Author: David Ostrovsky <david at ostrovsky.org>
Date:   Fri Jul 24 20:38:48 2015 +0200

    Fix clucene on MSVC 14.0
    
    Change-Id: I225d9c5eb1d9c9851b3f64f7c654cfede6297933
    Reviewed-on: https://gerrit.libreoffice.org/17339
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/external/clucene/UnpackedTarball_clucene.mk b/external/clucene/UnpackedTarball_clucene.mk
index 93defa2..fa4689d 100644
--- a/external/clucene/UnpackedTarball_clucene.mk
+++ b/external/clucene/UnpackedTarball_clucene.mk
@@ -26,6 +26,8 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,clucene,0))
 #  http://sourceforge.net/mailarchive/message.php?msg_id=32314782
 # clucene-asan.patch was proposed upstream, see
 #  http://sourceforge.net/mailarchive/message.php?msg_id=32367781
+# see msvc14.0 error report on:
+# https://connect.microsoft.com/VisualStudio/feedback/details/1424082/vs2015-rc-c-compiler-mixes-up-template-parameter-with-identical-named-inherited-typedef
 $(eval $(call gb_UnpackedTarball_add_patches,clucene,\
 	external/clucene/patches/clucene-debug.patch \
 	external/clucene/patches/clucene-multimap-put.patch \
@@ -37,6 +39,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,clucene,\
 	external/clucene/patches/clucene-ub.patch \
 	external/clucene/patches/clucene-mutex.patch \
 	external/clucene/patches/clucene-asan.patch \
+	external/clucene/patches/clucene-mixes-uptemplate-parameter-msvc-14.patch \
 ))
 
 ifneq ($(OS),WNT)
diff --git a/external/clucene/patches/clucene-mixes-uptemplate-parameter-msvc-14.patch b/external/clucene/patches/clucene-mixes-uptemplate-parameter-msvc-14.patch
new file mode 100644
index 0000000..0c9cd0a
--- /dev/null
+++ b/external/clucene/patches/clucene-mixes-uptemplate-parameter-msvc-14.patch
@@ -0,0 +1,53 @@
+diff -ru clucene.org/src/core/CLucene/util/VoidMap.h clucene/src/core/CLucene/util/VoidMap.h
+--- src/core/CLucene/util/VoidMap.h	2015-07-24 20:11:28.892997236 +0200
++++ src/core/CLucene/util/VoidMap.h	2015-07-24 20:21:17.290990623 +0200
+@@ -154,16 +154,16 @@
+ 
+  //a CLSet with CLHashMap traits
+ template<typename _kt, typename _vt,
+-	typename _Compare,
++	typename Compare,
+ 	typename _EqualDummy,
+ 	typename _KeyDeletor=CL_NS(util)::Deletor::Dummy,
+ 	typename _ValueDeletor=CL_NS(util)::Deletor::Dummy>
+ class CLUCENE_INLINE_EXPORT CLHashMap:public __CLMap<_kt,_vt,
+-	CL_NS_STD(map)<_kt,_vt, _Compare>,
++	CL_NS_STD(map)<_kt,_vt, Compare>,
+ 	_KeyDeletor,_ValueDeletor>
+ {
+-	typedef typename CL_NS_STD(map)<_kt,_vt,_Compare> _base;
+-	typedef __CLMap<_kt, _vt, CL_NS_STD(map)<_kt,_vt, _Compare>,
++	typedef typename CL_NS_STD(map)<_kt,_vt,Compare> _base;
++	typedef __CLMap<_kt, _vt, CL_NS_STD(map)<_kt,_vt, Compare>,
+ 		_KeyDeletor,_ValueDeletor> _this;
+ public:
+ 	CLHashMap ( const bool deleteKey=false, const bool deleteValue=false )
+@@ -260,15 +260,15 @@
+ //A collection that contains no duplicates
+ //does not guarantee that the order will remain constant over time
+ template<typename _kt, typename _vt,
+-	typename _Compare,
++	typename Compare,
+ 	typename _KeyDeletor=CL_NS(util)::Deletor::Dummy,
+ 	typename _ValueDeletor=CL_NS(util)::Deletor::Dummy>
+ class CLUCENE_INLINE_EXPORT CLSet:public __CLMap<_kt,_vt,
+-	CL_NS_STD(map)<_kt,_vt, _Compare>,
++	CL_NS_STD(map)<_kt,_vt, Compare>,
+ 	_KeyDeletor,_ValueDeletor>
+ {
+-	typedef typename CL_NS_STD(map)<_kt,_vt,_Compare> _base;
+-	typedef __CLMap<_kt, _vt, CL_NS_STD(map)<_kt,_vt, _Compare>,
++	typedef typename CL_NS_STD(map)<_kt,_vt,Compare> _base;
++	typedef __CLMap<_kt, _vt, CL_NS_STD(map)<_kt,_vt, Compare>,
+ 		_KeyDeletor,_ValueDeletor> _this;
+ public:
+ 	CLSet ( const bool deleteKey=false, const bool deleteValue=false )
+@@ -294,7 +294,7 @@
+ 
+ //A collection that can contains duplicates
+ template<typename _kt, typename _vt,
+-	typename _Compare,
++	typename Compare,
+ 	typename _KeyDeletor=CL_NS(util)::Deletor::Dummy,
+ 	typename _ValueDeletor=CL_NS(util)::Deletor::Dummy>
+ class CLUCENE_INLINE_EXPORT CLMultiMap:public __CLMap<_kt,_vt,