FYI:
-------- Forwarded Message --------
Subject: [Libreoffice-commits] core.git: external/clucene
Date: Wed, 17 Jun 2020 17:52:19 +0000 (UTC)
From: Stephan Bergmann (via logerrit) <loger...@kemper.freedesktop.org>
Reply-To: libreoff...@lists.freedesktop.org
To: libreoffice-comm...@lists.freedesktop.org
external/clucene/UnpackedTarball_clucene.mk | 1 +
external/clucene/patches/c++20.patch | 11 +++++++++++
2 files changed, 12 insertions(+)
New commits:
commit 5558256e777b00ac38f455081425fc5b1ee53375
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Wed Jun 17 17:34:39 2020 +0200
Commit: Stephan Bergmann <sberg...@redhat.com>
CommitDate: Wed Jun 17 19:51:38 2020 +0200
external/clucene: Adapt to C++20 CWG2237
...<http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#2237>
"Can a
template-id name a constructor?", as implemented by GCC 11 trunk since
<https://gcc.gnu.org/git/?p=gcc.git;a=commit;
h=4b38d56dbac6742b038551a36ec80200313123a1> "c++: C++20 DR 2237,
disallow
simple-template-id in cdtor."
Change-Id: I507fc5bde20fdf09b4e31a3db8a7554a473f1a9f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96549
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/external/clucene/UnpackedTarball_clucene.mk
b/external/clucene/UnpackedTarball_clucene.mk
index 1dc64a78faa3..1a373b48b49e 100644
--- a/external/clucene/UnpackedTarball_clucene.mk
+++ b/external/clucene/UnpackedTarball_clucene.mk
@@ -46,6 +46,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,clucene,\
external/clucene/patches/clucene-mixes-uptemplate-parameter-msvc-14.patch \
external/clucene/patches/ostream-wchar_t.patch \
external/clucene/patches/heap-buffer-overflow.patch \
+ external/clucene/patches/c++20.patch \
))
ifneq ($(OS),WNT)
diff --git a/external/clucene/patches/c++20.patch
b/external/clucene/patches/c++20.patch
new file mode 100644
index 000000000000..c982e861e1b4
--- /dev/null
+++ b/external/clucene/patches/c++20.patch
@@ -0,0 +1,11 @@
+--- src/core/CLucene/util/_bufferedstream.h
++++ src/core/CLucene/util/_bufferedstream.h
+@@ -68,7 +68,7 @@
+ void setMinBufSize(int32_t s) {
+ buffer.makeSpace(s);
+ }
+- BufferedStreamImpl<T>();
++ BufferedStreamImpl();
+ public:
+ int32_t read(const T*& start, int32_t min, int32_t max);
+ int64_t reset(int64_t pos);
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
_______________________________________________
CLucene-developers mailing list
CLucene-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/clucene-developers
