mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2024-12-28 06:36:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Detect types convertible to unformattable pointers

Browse Source
This commit is contained in:
Victor Zverovich 2021-11-13 08:26:27 -08:00
parent 094b66e81d
commit 5380ff4d88
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/fmt/core.h
View File

@ -1370,8 +1370,11 @@ template <typename Context> struct arg_mapper {
// We use SFINAE instead of a const T* parameter to avoid conflicting with // We use SFINAE instead of a const T* parameter to avoid conflicting with
// the C array overload. // the C array overload.
template <typename T, FMT_ENABLE_IF(std::is_pointer<T>::value)> template <
FMT_CONSTEXPR auto map(T) -> unformattable_pointer { typename T,
FMT_ENABLE_IF(std::is_convertible<const T&, const void*>::value &&
!std::is_convertible<const T&, const char_type*>::value)>
FMT_CONSTEXPR auto map(const T&) -> unformattable_pointer {
return {}; return {};
} }

6
test/core-test.cc
View File

@ -733,6 +733,10 @@ template <> struct formatter<nonconst_formattable> {
}; };
FMT_END_NAMESPACE FMT_END_NAMESPACE
struct convertible_to_pointer {
operator const int*() const { return nullptr; }
};
TEST(core_test, is_formattable) { TEST(core_test, is_formattable) {
static_assert(fmt::is_formattable<signed char*>::value, ""); static_assert(fmt::is_formattable<signed char*>::value, "");
static_assert(fmt::is_formattable<unsigned char*>::value, ""); static_assert(fmt::is_formattable<unsigned char*>::value, "");
@ -760,6 +764,8 @@ TEST(core_test, is_formattable) {
static_assert(!fmt::is_formattable<const nonconst_formattable&>::value, ""); static_assert(!fmt::is_formattable<const nonconst_formattable&>::value, "");
#endif #endif
static_assert(!fmt::is_formattable<convertible_to_pointer>::value, "");
static_assert(!fmt::is_formattable<signed char*, wchar_t>::value, ""); static_assert(!fmt::is_formattable<signed char*, wchar_t>::value, "");
static_assert(!fmt::is_formattable<unsigned char*, wchar_t>::value, ""); static_assert(!fmt::is_formattable<unsigned char*, wchar_t>::value, "");
static_assert(!fmt::is_formattable<const signed char*, wchar_t>::value, ""); static_assert(!fmt::is_formattable<const signed char*, wchar_t>::value, "");