Commit 796beaad authored by Victor Zverovich's avatar Victor Zverovich

Fix collision with global convert function (#425)

parent def68746
...@@ -1155,7 +1155,9 @@ struct ConvertToIntImpl2<T, true> { ...@@ -1155,7 +1155,9 @@ struct ConvertToIntImpl2<T, true> {
template<typename T> template<typename T>
struct ConvertToInt { struct ConvertToInt {
enum { enable_conversion = sizeof(convert(get<T>())) == sizeof(Yes) }; enum {
enable_conversion = sizeof(fmt::internal::convert(get<T>())) == sizeof(Yes)
};
enum { value = ConvertToIntImpl2<T, enable_conversion>::value }; enum { value = ConvertToIntImpl2<T, enable_conversion>::value };
}; };
......
...@@ -1653,3 +1653,11 @@ FMT_VARIADIC(void, custom_format, const char *) ...@@ -1653,3 +1653,11 @@ FMT_VARIADIC(void, custom_format, const char *)
TEST(FormatTest, CustomArgFormatter) { TEST(FormatTest, CustomArgFormatter) {
custom_format("{}", 42); custom_format("{}", 42);
} }
void convert(int);
// Check if there is no collision with convert function in the global namespace.
TEST(FormatTest, ConvertCollision) {
fmt::format("{}", 42);
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment