diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-08-25 10:45:55 +0100 |
commit | 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch) | |
tree | c513fe68548b40365c1c2ebfe35c58ad431cdd77 /dev-libs/libfmt/files | |
parent | 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff) |
gentoo resync : 25.08.2020
Diffstat (limited to 'dev-libs/libfmt/files')
-rw-r--r-- | dev-libs/libfmt/files/libfmt-6.2.0-unsigned-char-strings-in-printf.patch | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/dev-libs/libfmt/files/libfmt-6.2.0-unsigned-char-strings-in-printf.patch b/dev-libs/libfmt/files/libfmt-6.2.0-unsigned-char-strings-in-printf.patch deleted file mode 100644 index 2ce27c83e622..000000000000 --- a/dev-libs/libfmt/files/libfmt-6.2.0-unsigned-char-strings-in-printf.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 7d01859ef16e6b65bc023ad8bebfedecb088bf81 Mon Sep 17 00:00:00 2001 -From: Victor Zverovich <viz@fb.com> -Date: Wed, 8 Apr 2020 12:32:34 -0700 -Subject: [PATCH] Fix handling of unsigned char strings in printf - ---- - include/fmt/core.h | 8 ++++++++ - test/printf-test.cc | 6 ++++++ - 2 files changed, 14 insertions(+) - -diff --git a/include/fmt/core.h b/include/fmt/core.h -index 6df2875ac..dc10722bf 100644 ---- a/include/fmt/core.h -+++ b/include/fmt/core.h -@@ -972,6 +972,14 @@ template <typename Context> struct arg_mapper { - static_assert(std::is_same<char_type, char>::value, "invalid string type"); - return reinterpret_cast<const char*>(val); - } -+ FMT_CONSTEXPR const char* map(signed char* val) { -+ const auto* const_val = val; -+ return map(const_val); -+ } -+ FMT_CONSTEXPR const char* map(unsigned char* val) { -+ const auto* const_val = val; -+ return map(const_val); -+ } - - FMT_CONSTEXPR const void* map(void* val) { return val; } - FMT_CONSTEXPR const void* map(const void* val) { return val; } -diff --git a/test/printf-test.cc b/test/printf-test.cc -index 5aaa27b13..545e02aab 100644 ---- a/test/printf-test.cc -+++ b/test/printf-test.cc -@@ -447,6 +447,12 @@ TEST(PrintfTest, String) { - EXPECT_PRINTF(L" (null)", L"%10s", null_wstr); - } - -+TEST(PrintfTest, UCharString) { -+ unsigned char str[] = "test"; -+ unsigned char* pstr = str; -+ EXPECT_EQ("test", fmt::sprintf("%s", pstr)); -+} -+ - TEST(PrintfTest, Pointer) { - int n; - void* p = &n; |