diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2023-07-17 17:11:37 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2023-07-17 23:21:02 +0200 |
| commit | 39927fa6a9744b89b8ddf3abed0fd905510a9675 (patch) | |
| tree | 5a1095866dabd703c47f50e0553a8a91defa984b /external | |
| parent | ca460e654a1ee17d755cff6943f07bfa88da9a27 (diff) | |
external/clucene: More uses of obsolete std::binary_function
...as seen at least when building against VS 2022 Preview 17.7.0 Preview 3.0 and
--with-latest-c++,
> workdir\UnpackedTarball\clucene\src\core\CLucene/util/_Arrays.h(128): error C2039: 'binary_function': is not a member of 'std'
> C:\PROGRA~1\MICROS~3\2022\Preview\VC\Tools\MSVC\1437~1.328\Include\vector(26): note: see declaration of 'std'
> workdir\UnpackedTarball\clucene\src\core\CLucene/util/_Arrays.h(153): note: see reference to class template instantiation 'lucene::util::CLListEquals<_kt,_comparator,class1,class2>' being compiled
etc.
Change-Id: Icea14fe0c0ad85501367ac6c81a3b8aada595383
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154551
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/clucene/patches/binary_function.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/external/clucene/patches/binary_function.patch b/external/clucene/patches/binary_function.patch index 5b6f8ece9bee..a7e4b867d0c7 100644 --- a/external/clucene/patches/binary_function.patch +++ b/external/clucene/patches/binary_function.patch @@ -1,3 +1,26 @@ +--- src/core/CLucene/search/BooleanQuery.cpp ++++ src/core/CLucene/search/BooleanQuery.cpp +@@ -25,7 +25,7 @@ + CL_NS_USE(util) + CL_NS_DEF(search) + +- class BooleanClause_Compare:public CL_NS_STD(binary_function)<const BooleanClause*,const BooleanClause*,bool> ++ class BooleanClause_Compare + { + public: + bool operator()( const BooleanClause* val1, const BooleanClause* val2 ) const { +--- src/core/CLucene/util/_Arrays.h ++++ src/core/CLucene/util/_Arrays.h +@@ -124,8 +124,7 @@ + + template <typename _kt, typename _comparator, + typename class1, typename class2> +- class CLListEquals: +- public CL_NS_STD(binary_function)<class1*,class2*,bool> ++ class CLListEquals + { + typedef typename class1::const_iterator _itr1; + typedef typename class2::const_iterator _itr2; --- src/core/CLucene/util/Equators.h +++ src/core/CLucene/util/Equators.h @@ -22,19 +22,19 @@ |