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

Merge branch 'master' into error-message

Browse Source
This commit is contained in:
ToruNiina
2018-12-22 17:55:59 +09:00
parent 9c95992dad 617187969c
commit 5546b3389d
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
toml/result.hpp
View File

@@ -406,10 +406,10 @@ struct result
if(is_err()) {return opt;}
return this->succ.value;
}
value_type&& unwrap_or(value_type opt) &&
value_type unwrap_or(value_type opt) &&
{
if(is_err()) {return std::move(opt);}
return std::move(this->succ.value);
if(is_err()) {return opt;}
return this->succ.value;
}
error_type& unwrap_err() &