mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2025-04-16 05:42:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling of fixed enums in clang (#580)

Browse Source
This commit is contained in:
Victor Zverovich 2018-02-10 06:17:42 -08:00
parent 66afd9b33a
commit 0b635c9dc5
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/fmt/core.h
View File

@ -82,6 +82,8 @@
# endif # endif
#endif #endif
#define FMT_USE_STRONG_ENUMS FMT_HAS_FEATURE(cxx_strong_enums)
// Check if exceptions are disabled. // Check if exceptions are disabled.
#if defined(__GNUC__) && !defined(__EXCEPTIONS) #if defined(__GNUC__) && !defined(__EXCEPTIONS)
# define FMT_EXCEPTIONS 0 # define FMT_EXCEPTIONS 0
@ -583,6 +585,12 @@ void make_value(const T *p) {
static_assert(!sizeof(T), "formatting of non-void pointers is disallowed"); static_assert(!sizeof(T), "formatting of non-void pointers is disallowed");
} }
template <typename C, typename T>
inline typename std::enable_if<
convert_to_int<T>::value && std::is_enum<T>::value,
typed_value<C, INT>>::type
make_value(const T &val) { return static_cast<int>(val); }
template <typename C, typename T> template <typename C, typename T>
inline typename std::enable_if< inline typename std::enable_if<
!convert_to_int<T>::value, typed_value<C, CUSTOM>>::type !convert_to_int<T>::value, typed_value<C, CUSTOM>>::type

8
test/format-test.cc
View File

@ -1508,6 +1508,14 @@ TEST(FormatTest, Enum) {
EXPECT_EQ("0", fmt::format("{}", A)); EXPECT_EQ("0", fmt::format("{}", A));
} }
#if FMT_USE_STRONG_ENUMS
enum TestFixedEnum : short { B };
TEST(FormatTest, FixedEnum) {
EXPECT_EQ("0", fmt::format("{}", B));
}
#endif
using buffer_range = fmt::back_insert_range<fmt::internal::buffer>; using buffer_range = fmt::back_insert_range<fmt::internal::buffer>;
class mock_arg_formatter : class mock_arg_formatter :