External/fmt
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix byte formatting with FMT_COMPILE, use __cpp_lib_byte macro

Browse Source
This commit is contained in:
Alexey Ochapov 2020-12-22 23:49:35 +03:00
parent cc4a9951eb
commit 0e89adaa66
No known key found for this signature in database
GPG Key ID: 9DC52E8F031B8DA8
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/fmt/format.h
View File

@ -2112,8 +2112,14 @@ FMT_CONSTEXPR OutputIt write(OutputIt out, T value) {
}
template <typename Char, typename OutputIt, typename T,
#ifdef __cpp_lib_byte
FMT_ENABLE_IF(std::is_enum<T>::value &&
!std::is_same<T, Char>::value &&
!std::is_same<T, std::byte>::value)>
#else
FMT_ENABLE_IF(std::is_enum<T>::value &&
!std::is_same<T, Char>::value)>
#endif
FMT_CONSTEXPR OutputIt write(OutputIt out, T value) {
return write<Char>(
out, static_cast<typename std::underlying_type<T>::type>(value));
@ -3562,7 +3568,7 @@ FMT_FORMAT_AS(Char*, const Char*);
FMT_FORMAT_AS(std::basic_string<Char>, basic_string_view<Char>);
FMT_FORMAT_AS(std::nullptr_t, const void*);
FMT_FORMAT_AS(detail::std_string_view<Char>, basic_string_view<Char>);
#if __cplusplus >= 201703L
#ifdef __cpp_lib_byte
FMT_FORMAT_AS(std::byte, unsigned);
#endif

2
test/format-test.cc
View File

@ -1762,7 +1762,7 @@ TEST(FormatTest, JoinArg) {
#endif
}
#if __cplusplus >= 201703L
#ifdef __cpp_lib_byte
TEST(FormatTest, JoinBytes) {
std::vector<std::byte> v = {std::byte(1), std::byte(2), std::byte(3)};
EXPECT_EQ("1, 2, 3", fmt::format("{}", fmt::join(v, ", ")));