fmtlib/fmt
1
0
Fork 1
mirror of https://github.com/fmtlib/fmt.git synced 2025-08-01 19:54:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Map not int enum to correct underlying_type (#1286)

Browse Source 
* Map not int enum to correct underlying_type

* Use non-zero constant in TestFixedEnum
This commit is contained in:
Egor Seredin
2019-08-31 22:25:38 +09:00
committed by Victor Zverovich
parent 345ba07f1d
commit bcd9b9331a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/fmt/core.h
View File

@@ -825,8 +825,8 @@ template <typename Context> struct arg_mapper {
FMT_ENABLE_IF(std::is_enum<T>::value && FMT_ENABLE_IF(std::is_enum<T>::value &&
!has_formatter<T, Context>::value && !has_formatter<T, Context>::value &&
!has_fallback_formatter<T, Context>::value)> !has_fallback_formatter<T, Context>::value)>
FMT_CONSTEXPR int map(const T& val) { FMT_CONSTEXPR auto map(const T& val) -> decltype(map(static_cast<typename std::underlying_type<T>::type>(val))) {
return static_cast<int>(val); return map(static_cast<typename std::underlying_type<T>::type>(val));
} }
template <typename T, template <typename T,
FMT_ENABLE_IF(!is_string<T>::value && !is_char<T>::value && FMT_ENABLE_IF(!is_string<T>::value && !is_char<T>::value &&

4
test/format-test.cc
View File

@@ -1906,9 +1906,9 @@ TEST(FormatTest, FormatterNotSpecialized) {
} }
#if FMT_HAS_FEATURE(cxx_strong_enums) #if FMT_HAS_FEATURE(cxx_strong_enums)
enum TestFixedEnum : short { B }; enum TestFixedEnum : short { B = 1 };
TEST(FormatTest, FixedEnum) { EXPECT_EQ("0", fmt::format("{}", B)); } TEST(FormatTest, FixedEnum) { EXPECT_EQ("1", fmt::format("{}", B)); }
#endif #endif
using buffer_range = fmt::buffer_range<char>; using buffer_range = fmt::buffer_range<char>;