external/clucene/patches/clucene-mixes-uptemplate-parameter-msvc-14.patch

   1 diff -ru clucene.org/src/core/CLucene/util/VoidMap.h clucene/src/core/CLucene/util/VoidMap.h
   2 --- src/core/CLucene/util/VoidMap.h     2015-07-24 20:11:28.892997236 +0200
   3 +++ src/core/CLucene/util/VoidMap.h     2015-07-24 20:21:17.290990623 +0200
   4 @@ -154,16 +154,16 @@
   5
   6   //a CLSet with CLHashMap traits
   7  template<typename _kt, typename _vt,
   8 -       typename _Compare,
   9 +       typename Compare,
  10         typename _EqualDummy,
  11         typename _KeyDeletor=CL_NS(util)::Deletor::Dummy,
  12         typename _ValueDeletor=CL_NS(util)::Deletor::Dummy>
  13  class CLUCENE_INLINE_EXPORT CLHashMap:public __CLMap<_kt,_vt,
  14 -       CL_NS_STD(map)<_kt,_vt, _Compare>,
  15 +       CL_NS_STD(map)<_kt,_vt, Compare>,
  16         _KeyDeletor,_ValueDeletor>
  17  {
  18 -       typedef typename CL_NS_STD(map)<_kt,_vt,_Compare> _base;
  19 -       typedef __CLMap<_kt, _vt, CL_NS_STD(map)<_kt,_vt, _Compare>,
  20 +       typedef typename CL_NS_STD(map)<_kt,_vt,Compare> _base;
  21 +       typedef __CLMap<_kt, _vt, CL_NS_STD(map)<_kt,_vt, Compare>,
  22                 _KeyDeletor,_ValueDeletor> _this;
  23  public:
  24         CLHashMap ( const bool deleteKey=false, const bool deleteValue=false )
  25 @@ -260,15 +260,15 @@
  26  //A collection that contains no duplicates
  27  //does not guarantee that the order will remain constant over time
  28  template<typename _kt, typename _vt,
  29 -       typename _Compare,
  30 +       typename Compare,
  31         typename _KeyDeletor=CL_NS(util)::Deletor::Dummy,
  32         typename _ValueDeletor=CL_NS(util)::Deletor::Dummy>
  33  class CLUCENE_INLINE_EXPORT CLSet:public __CLMap<_kt,_vt,
  34 -       CL_NS_STD(map)<_kt,_vt, _Compare>,
  35 +       CL_NS_STD(map)<_kt,_vt, Compare>,
  36         _KeyDeletor,_ValueDeletor>
  37  {
  38 -       typedef typename CL_NS_STD(map)<_kt,_vt,_Compare> _base;
  39 -       typedef __CLMap<_kt, _vt, CL_NS_STD(map)<_kt,_vt, _Compare>,
  40 +       typedef typename CL_NS_STD(map)<_kt,_vt,Compare> _base;
  41 +       typedef __CLMap<_kt, _vt, CL_NS_STD(map)<_kt,_vt, Compare>,
  42                 _KeyDeletor,_ValueDeletor> _this;
  43  public:
  44         CLSet ( const bool deleteKey=false, const bool deleteValue=false )
  45 @@ -294,7 +294,7 @@
  46
  47  //A collection that can contains duplicates
  48  template<typename _kt, typename _vt,
  49 -       typename _Compare,
  50 +       typename Compare,
  51         typename _KeyDeletor=CL_NS(util)::Deletor::Dummy,
  52         typename _ValueDeletor=CL_NS(util)::Deletor::Dummy>
  53  class CLUCENE_INLINE_EXPORT CLMultiMap:public __CLMap<_kt,_vt,