AuroraMiddleware/fmtlegacy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

change type naming and fix sfinae bug

Browse Source
This commit is contained in:
XZiar 2018-10-26 20:32:24 -07:00 committed by Victor Zverovich
parent b98e8301d5
commit 2dea780fbd
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/fmt/core.h
View File

@ -472,10 +472,10 @@ struct compile_string {};
template <typename S> template <typename S>
struct is_compile_string : std::is_base_of<compile_string, S> {}; struct is_compile_string : std::is_base_of<compile_string, S> {};
template <typename S, typename Enable = std::enable_if<is_compile_string<S>::value>> template <typename S, typename Enable = typename std::enable_if<is_compile_string<S>::value>::type>
inline auto to_string_view(const S &s) -> basic_string_view<typename S::Char> { inline auto to_string_view(const S &s) -> basic_string_view<typename S::char_type> {
typedef typename S::Char Char; typedef typename S::char_type char_type;
return basic_string_view<Char>{s.data(), s.size() - 1}; return basic_string_view<char_type>{s.data(), s.size() - 1};
} }
template <typename Context> template <typename Context>

12
include/fmt/format.h
View File

@ -2243,10 +2243,10 @@ FMT_CONSTEXPR bool check_format_string(
template <typename... Args, typename String> template <typename... Args, typename String>
typename std::enable_if<is_compile_string<String>::value>::type typename std::enable_if<is_compile_string<String>::value>::type
check_format_string(String format_str) { check_format_string(String format_str) {
typedef typename String::Char Char; typedef typename String::char_type char_type;
FMT_CONSTEXPR_DECL bool invalid_format = FMT_CONSTEXPR_DECL bool invalid_format =
internal::check_format_string<Char, internal::error_handler, Args...>( internal::check_format_string<char_type, internal::error_handler, Args...>(
basic_string_view<Char>(format_str.data(), format_str.size())); basic_string_view<char_type>(format_str.data(), format_str.size()));
(void)invalid_format; (void)invalid_format;
} }
@ -3598,10 +3598,10 @@ FMT_END_NAMESPACE
#define FMT_STRING(s) [] { \ #define FMT_STRING(s) [] { \
typedef typename std::decay<decltype(s)>::type pointer; \ typedef typename std::decay<decltype(s)>::type pointer; \
struct S : fmt::compile_string { \ struct S : fmt::compile_string { \
typedef typename std::remove_cv<std::remove_pointer<pointer>::type>::type Char;\ typedef typename std::remove_cv<std::remove_pointer<pointer>::type>::type char_type;\
static FMT_CONSTEXPR pointer data() { return s; } \ static FMT_CONSTEXPR pointer data() { return s; } \
static FMT_CONSTEXPR size_t size() { return sizeof(s) / sizeof(Char); } \ static FMT_CONSTEXPR size_t size() { return sizeof(s) / sizeof(char_type); } \
explicit operator fmt::basic_string_view<Char>() const { return s; } \ explicit operator fmt::basic_string_view<char_type>() const { return s; } \
}; \ }; \
return S{}; \ return S{}; \
}() }()

4
test/format-test.cc
View File

@ -2380,8 +2380,8 @@ TEST(FormatTest, VFormatTo) {
fmt::vformat_to(std::back_inserter(w), L"{}", wargs); fmt::vformat_to(std::back_inserter(w), L"{}", wargs);
EXPECT_EQ(L"42", w); EXPECT_EQ(L"42", w);
w.clear(); w.clear();
fmt::vformat_to(std::back_inserter(w), FMT_STRING(L"{}"), args); fmt::vformat_to(std::back_inserter(w), FMT_STRING(L"{}"), wargs);
EXPECT_EQ("42", w); EXPECT_EQ(L"42", w);
} }
#endif // FMT_USE_CONSTEXPR #endif // FMT_USE_CONSTEXPR