From ed5640d8b587fbcfed7dd7967f3de04b37a76f26 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Apr 2024 11:06:44 +0200 Subject: Adding upstream version 4:7.4.7. Signed-off-by: Daniel Baumann --- external/boost/boost.between.warning.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 external/boost/boost.between.warning.patch (limited to 'external/boost/boost.between.warning.patch') diff --git a/external/boost/boost.between.warning.patch b/external/boost/boost.between.warning.patch new file mode 100644 index 000000000..bb4535708 --- /dev/null +++ b/external/boost/boost.between.warning.patch @@ -0,0 +1,13 @@ +diff -ru boost.orig/boost/libs/locale/src/encoding/codepage.cpp boost/boost/libs/locale/src/encoding/codepage.cpp +--- foo/misc/boost.orig/libs/locale/src/encoding/codepage.cpp ++++ foo/misc/boost/libs/locale/src/encoding/codepage.cpp +@@ -58,6 +58,9 @@ + return cvt->convert(begin,end); + #endif + #endif ++ // ensures we get a sensible warning in boost's gettext results about a real mismatch. ++ if (to_charset && from_charset && !strcmp(to_charset, from_charset)) ++ return std::string(begin, end - begin); + throw invalid_charset_error(std::string(to_charset) + " or " + from_charset); + } + -- cgit v1.2.3