fmtlib/fmt
1
0
Fork 1
mirror of https://github.com/fmtlib/fmt.git synced 2025-07-30 02:37:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling of types with deleted rvalue conversion to string (#1421)

Browse Source
This commit is contained in:
Victor Zverovich
2019-11-25 08:30:47 -08:00
parent 57cd3f72e9
commit 99b6e928d4
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/fmt/core.h
View File

@ -923,7 +923,7 @@ template <typename Context> struct arg_mapper {
// A type constant after applying arg_mapper<Context>. // A type constant after applying arg_mapper<Context>.
template <typename T, typename Context> template <typename T, typename Context>
using mapped_type_constant = using mapped_type_constant =
type_constant<decltype(arg_mapper<Context>().map(std::declval<T>())), type_constant<decltype(arg_mapper<Context>().map(std::declval<const T&>())),
typename Context::char_type>; typename Context::char_type>;
enum { packed_arg_bits = 5 }; enum { packed_arg_bits = 5 };

11
test/core-test.cc
View File

@ -649,3 +649,14 @@ TEST(FormatterTest, FormatExplicitlyConvertibleToStringLike) {
EXPECT_EQ("foo", fmt::format("{}", explicitly_convertible_to_string_like())); EXPECT_EQ("foo", fmt::format("{}", explicitly_convertible_to_string_like()));
} }
#endif #endif
struct disabled_rvalue_conversion {
operator const char*() const& { return "foo"; }
operator const char*()& { return "foo"; }
operator const char*() const&& = delete;
operator const char*()&& = delete;
};
TEST(FormatterTest, DisabledRValueConversion) {
EXPECT_EQ("foo", fmt::format("{}", disabled_rvalue_conversion()));
}