mirror of
https://git.yoctoproject.org/poky
synced 2026-02-23 18:09:40 +01:00
351243a0ca
Its deprecated in upstream fmt as well. Moreover it helps compile with latest compiler (From OE-Core rev: 01ef766ada47cd845643c632160e1808fa237d1c) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
60 lines
2.0 KiB
Diff
60 lines
2.0 KiB
Diff
From 93987b1ce7d6f91387202495aac61026070597df Mon Sep 17 00:00:00 2001
|
|
From: Khem Raj <raj.khem@gmail.com>
|
|
Date: Sun, 15 Jan 2023 21:37:52 -0800
|
|
Subject: [PATCH] Deprecate u8string_view
|
|
|
|
Use basic_string_view instead
|
|
|
|
Upstream-Status: Backport [https://github.com/fmtlib/fmt/commit/dea7fde8b7d649923dd41b0766bdf076033c62a2]
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
---
|
|
include/spdlog/fmt/bundled/core.h | 3 ++-
|
|
include/spdlog/fmt/bundled/format.h | 15 ++-------------
|
|
2 files changed, 4 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/include/spdlog/fmt/bundled/core.h b/include/spdlog/fmt/bundled/core.h
|
|
index 50b79351..e8b029ef 100644
|
|
--- a/include/spdlog/fmt/bundled/core.h
|
|
+++ b/include/spdlog/fmt/bundled/core.h
|
|
@@ -1484,7 +1484,8 @@ FMT_API void vprint(wstring_view format_str, wformat_args args);
|
|
|
|
/**
|
|
\rst
|
|
- Prints formatted data to ``stdout``.
|
|
+ Formats ``args`` according to specifications in ``format_str`` and writes the
|
|
+ output to ``stdout``.
|
|
|
|
**Example**::
|
|
|
|
diff --git a/include/spdlog/fmt/bundled/format.h b/include/spdlog/fmt/bundled/format.h
|
|
index 1bb24a52..39426361 100644
|
|
--- a/include/spdlog/fmt/bundled/format.h
|
|
+++ b/include/spdlog/fmt/bundled/format.h
|
|
@@ -407,21 +407,10 @@ void basic_buffer<T>::append(const U *begin, const U *end) {
|
|
enum char8_t: unsigned char {};
|
|
#endif
|
|
|
|
-// A UTF-8 string view.
|
|
-class u8string_view : public basic_string_view<char8_t> {
|
|
- public:
|
|
- typedef char8_t char_type;
|
|
-
|
|
- u8string_view(const char *s):
|
|
- basic_string_view<char8_t>(reinterpret_cast<const char8_t*>(s)) {}
|
|
- u8string_view(const char *s, size_t count) FMT_NOEXCEPT:
|
|
- basic_string_view<char8_t>(reinterpret_cast<const char8_t*>(s), count) {}
|
|
-};
|
|
-
|
|
#if FMT_USE_USER_DEFINED_LITERALS
|
|
inline namespace literals {
|
|
-inline u8string_view operator"" _u(const char *s, std::size_t n) {
|
|
- return {s, n};
|
|
+inline basic_string_view<char8_t> operator"" _u(const char* s, std::size_t n) {
|
|
+ return {reinterpret_cast<const char8_t*>(s), n};
|
|
}
|
|
}
|
|
#endif
|
|
--
|
|
2.39.0
|
|
|