mirror of
https://github.com/ToruNiina/toml11.git
synced 2025-09-18 10:28:09 +08:00
fix: avoid ambiguity in overload resolution
Since both `std::string` and `std::filesystem::path` can be convertible from `const char &[N]` (like, `parse("file.toml")`), after adding `parse(std::filesystem::path)`, the overload resolution of `parse("file.toml")` becomes ambiguous. By adding `parse(...)` that exactly matches to `parse("file.toml")`, we can remove this ambiguity.
This commit is contained in:
@@ -2102,6 +2102,24 @@ basic_value<Comment, Table, Array> parse(const std::string& fname)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifdef TOML11_HAS_STD_FILESYSTEM
|
#ifdef TOML11_HAS_STD_FILESYSTEM
|
||||||
|
// This function just forwards `parse("filename.toml")` to std::string version
|
||||||
|
// to avoid the ambiguity in overload resolution.
|
||||||
|
//
|
||||||
|
// Both std::string and std::filesystem::path are convertible from const char[].
|
||||||
|
// Without this, both parse(std::string) and parse(std::filesystem::path)
|
||||||
|
// matches to parse("filename.toml"). This breaks the existing code.
|
||||||
|
//
|
||||||
|
// This function exactly matches to the invokation with string literal.
|
||||||
|
// So this function is preferred than others and the ambiguity disappears.
|
||||||
|
template<typename Comment = ::toml::discard_comments,
|
||||||
|
template<typename ...> class Table = std::unordered_map,
|
||||||
|
template<typename ...> class Array = std::vector,
|
||||||
|
std::size_t N>
|
||||||
|
basic_value<Comment, Table, Array> parse(const char (&fname)[N])
|
||||||
|
{
|
||||||
|
return parse<Comment, Table, Array>(std::string(fname));
|
||||||
|
}
|
||||||
|
|
||||||
template<typename Comment = ::toml::discard_comments,
|
template<typename Comment = ::toml::discard_comments,
|
||||||
template<typename ...> class Table = std::unordered_map,
|
template<typename ...> class Table = std::unordered_map,
|
||||||
template<typename ...> class Array = std::vector>
|
template<typename ...> class Array = std::vector>
|
||||||
|
Reference in New Issue
Block a user