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

Fix an ambiguous call to check caused by ADL (#2184)

Browse Source
This commit is contained in:
Victor Zverovich
2021-03-17 20:59:36 -07:00
parent 2f3f3862fa
commit 1147782c79
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/fmt/core.h
View File

@ -1460,7 +1460,7 @@ template <typename T, typename U> constexpr const U& check(const U& val) {
template <bool IS_PACKED, typename Context, type, typename T, template <bool IS_PACKED, typename Context, type, typename T,
FMT_ENABLE_IF(IS_PACKED)> FMT_ENABLE_IF(IS_PACKED)>
constexpr value<Context> make_arg(const T& val) { constexpr value<Context> make_arg(const T& val) {
return check<T>(arg_mapper<Context>().map(val)); return detail::check<T>(arg_mapper<Context>().map(val));
} }
template <bool IS_PACKED, typename Context, type, typename T, template <bool IS_PACKED, typename Context, type, typename T,

9
test/core-test.cc
View File

@ -471,7 +471,7 @@ TEST(FormatDynArgsTest, NamedArgByRef) {
fmt::dynamic_format_arg_store<fmt::format_context> store; fmt::dynamic_format_arg_store<fmt::format_context> store;
char band[] = "Rolling Stones"; char band[] = "Rolling Stones";
store.push_back(fmt::arg("band", std::cref(band))); store.push_back(fmt::arg("band", std::cref(band)));
band[9] = 'c'; // Changing band affects the output. band[9] = 'c'; // Changing band affects the output.
EXPECT_EQ(fmt::vformat("{band}", store), "Rolling Scones"); EXPECT_EQ(fmt::vformat("{band}", store), "Rolling Scones");
} }
@ -690,9 +690,10 @@ TYPED_TEST(IsStringTest, IsString) {
EXPECT_FALSE(fmt::detail::is_string<my_ns::non_string>::value); EXPECT_FALSE(fmt::detail::is_string<my_ns::non_string>::value);
} }
TEST(CoreTest, Format) { TEST(CoreTest, Format) { EXPECT_EQ(fmt::format("{}", 42), "42"); }
EXPECT_EQ(fmt::format("{}", 42), "42");
} template <typename T> void check(T);
TEST(CoreTest, ADL) { EXPECT_EQ(fmt::format("{}", test_struct()), "test"); }
TEST(CoreTest, FormatTo) { TEST(CoreTest, FormatTo) {
std::string s; std::string s;