This commit is contained in:
Simon Brand
2018-09-03 09:09:47 +01:00
parent 8b1c3fb67f
commit aecb8fe6db
3 changed files with 23 additions and 3 deletions
+3 -3
View File
@@ -1639,7 +1639,7 @@ template <class Opt, class F,
constexpr auto optional_map_impl(Opt &&opt, F &&f) {
return opt.has_value()
? detail::invoke(std::forward<F>(f), *std::forward<Opt>(opt))
: optional<detail::decay_t<Ret>>(nullopt);
: optional<Ret>(nullopt);
}
template <class Opt, class F,
@@ -1660,10 +1660,10 @@ template <class Opt, class F,
*std::declval<Opt>())),
detail::enable_if_t<!std::is_void<Ret>::value> * = nullptr>
constexpr auto optional_map_impl(Opt &&opt, F &&f) -> optional<detail::decay_t<Ret>> {
constexpr auto optional_map_impl(Opt &&opt, F &&f) -> optional<Ret> {
return opt.has_value()
? detail::invoke(std::forward<F>(f), *std::forward<Opt>(opt))
: optional<detail::decay_t<Ret>>(nullopt);
: optional<Ret>(nullopt);
}
template <class Opt, class F,