Template basic_string_view on Traits in parse overloads

This commit is contained in:
Howard Hinnant 2021-05-20 08:46:42 -04:00
parent ebb5719cd7
commit 38267fa1ef

View File

@ -8080,7 +8080,7 @@ public:
, offset_(offset)
{}
parse_manip(std::basic_string_view<CharT> format, Parsable& tp,
parse_manip(std::basic_string_view<CharT, Traits> format, Parsable& tp,
std::basic_string<CharT, Traits, Alloc>* abbrev = nullptr,
std::chrono::minutes* offset = nullptr)
: format_(format)
@ -8198,12 +8198,12 @@ parse(const CharT* format, Parsable& tp,
// basic_string_view formats
template <class Parsable, class CharT>
template <class Parsable, class CharT, class Traits>
inline
auto
parse(std::basic_string_view<CharT> format, Parsable& tp)
-> decltype(from_stream(std::declval<std::basic_istream<CharT>&>(), format.data(), tp),
parse_manip<Parsable, CharT>{format, tp})
parse(std::basic_string_view<CharT, Traits> format, Parsable& tp)
-> decltype(from_stream(std::declval<std::basic_istream<CharT, Traits>&>(), format.data(), tp),
parse_manip<Parsable, CharT, Traits>{format, tp})
{
return {format, tp};
}
@ -8211,7 +8211,7 @@ parse(std::basic_string_view<CharT> format, Parsable& tp)
template <class Parsable, class CharT, class Traits, class Alloc>
inline
auto
parse(std::basic_string_view<CharT> format,
parse(std::basic_string_view<CharT, Traits> format,
Parsable& tp, std::basic_string<CharT, Traits, Alloc>& abbrev)
-> decltype(from_stream(std::declval<std::basic_istream<CharT, Traits>&>(), format.data(),
tp, &abbrev),
@ -8220,13 +8220,13 @@ parse(std::basic_string_view<CharT> format,
return {format, tp, &abbrev};
}
template <class Parsable, class CharT>
template <class Parsable, class CharT, class Traits>
inline
auto
parse(std::basic_string_view<CharT> format, Parsable& tp, std::chrono::minutes& offset)
-> decltype(from_stream(std::declval<std::basic_istream<CharT>&>(), format.data(),
tp, std::declval<std::basic_string<CharT>*>(), &offset),
parse_manip<Parsable, CharT>{format, tp, nullptr, &offset})
parse(std::basic_string_view<CharT, Traits> format, Parsable& tp, std::chrono::minutes& offset)
-> decltype(from_stream(std::declval<std::basic_istream<CharT, Traits>&>(), format.data(),
tp, std::declval<std::basic_string<CharT, Traits>*>(), &offset),
parse_manip<Parsable, CharT, Traits>{format, tp, nullptr, &offset})
{
return {format, tp, nullptr, &offset};
}
@ -8234,7 +8234,7 @@ parse(std::basic_string_view<CharT> format, Parsable& tp, std::chrono::minutes&
template <class Parsable, class CharT, class Traits, class Alloc>
inline
auto
parse(std::basic_string_view<CharT> format, Parsable& tp,
parse(std::basic_string_view<CharT, Traits> format, Parsable& tp,
std::basic_string<CharT, Traits, Alloc>& abbrev, std::chrono::minutes& offset)
-> decltype(from_stream(std::declval<std::basic_istream<CharT, Traits>&>(), format.data(),
tp, &abbrev, &offset),