zhangyiss/toml11
1
0
Fork 0
mirror of https://github.com/ToruNiina/toml11.git synced 2025-09-18 02:08:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove template argument from result::unwrap_or

Browse Source
This commit is contained in:
ToruNiina
2018-12-17 19:18:16 +09:00
parent 7b3684b54e
commit 24723226f1
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
toml/result.hpp
View File

@@ -396,20 +396,17 @@ struct result
return std::move(this->succ.value); return std::move(this->succ.value);
} }
template<typename U> value_type& unwrap_or(value_type& opt) &
value_type& unwrap_or(U& opt) &
{ {
if(is_err()) {return opt;} if(is_err()) {return opt;}
return this->succ.value; return this->succ.value;
} }
template<typename U> value_type const& unwrap_or(value_type const& opt) const&
value_type const& unwrap_or(U const& opt) const&
{ {
if(is_err()) {return opt;} if(is_err()) {return opt;}
return this->succ.value; return this->succ.value;
} }
template<typename U> value_type&& unwrap_or(value_type opt) &&
value_type&& unwrap_or(U&& opt) &&
{ {
if(is_err()) {return std::move(opt);} if(is_err()) {return std::move(opt);}
return std::move(this->succ.value); return std::move(this->succ.value);