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 collision with global convert function (#425)

Browse Source 
(cherry picked from commit 796beaaddb)
This commit is contained in:
Victor Zverovich
2016-11-19 12:05:49 -08:00
committed by Jonathan Müller
parent baedba07ca
commit a55df13598
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
fmt/format.h
View File

@ -1153,7 +1153,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 };
}; };

8
test/format-test.cc
View File

@ -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);
}