From c610b049047bc1ce3d6c04b1337b241862cbfdb3 Mon Sep 17 00:00:00 2001 From: Ramzi Sabra Date: Thu, 26 Mar 2020 08:52:48 +0200 Subject: [PATCH] StandardCharT is now char if only one symbol is provided --- src/include/units/symbol_text.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/include/units/symbol_text.h b/src/include/units/symbol_text.h index ed64b4cf..ac5086e1 100644 --- a/src/include/units/symbol_text.h +++ b/src/include/units/symbol_text.h @@ -14,7 +14,7 @@ struct basic_symbol_text { constexpr basic_symbol_text(StandardCharT s, char a) noexcept: standard_(s), ascii_(a) {} constexpr basic_symbol_text(const StandardCharT (&s)[N + 1]) noexcept: standard_(s), ascii_(s) {} constexpr basic_symbol_text(const basic_fixed_string& s) noexcept: standard_(s), ascii_(s) {} - constexpr basic_symbol_text(const StandardCharT (&s)[N + 1], const char (&a)[M + 1]) noexcept: standard_(s), ascii_(a) {} + constexpr basic_symbol_text(const StandardCharT (&s)[N + 1], const StandardCharT (&a)[M + 1]) noexcept: standard_(s), ascii_(a) {} constexpr basic_symbol_text(const basic_fixed_string& s, const basic_fixed_string& a) noexcept: standard_(s), ascii_(a) {} [[nodiscard]] constexpr auto& standard() { return standard_; } @@ -352,17 +352,16 @@ struct basic_symbol_text { }; -template -basic_symbol_text(StandardCharT) -> basic_symbol_text; +basic_symbol_text(char) -> basic_symbol_text; template basic_symbol_text(StandardCharT, char) -> basic_symbol_text; -template -basic_symbol_text(const StandardCharT (&)[N]) -> basic_symbol_text; +template +basic_symbol_text(const char (&)[N]) -> basic_symbol_text; -template -basic_symbol_text(const basic_fixed_string&) -> basic_symbol_text; +template +basic_symbol_text(const basic_fixed_string&) -> basic_symbol_text; template basic_symbol_text(const StandardCharT (&)[N], const char (&)[M]) -> basic_symbol_text;