From e3217cd572ee8208bcb5e683f34350fc399c7ab7 Mon Sep 17 00:00:00 2001 From: ToruNiina Date: Mon, 17 Dec 2018 23:17:45 +0900 Subject: [PATCH] quit returning rvalue ref from unwrap_or --- toml/result.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/toml/result.hpp b/toml/result.hpp index 7fa6b94..c174578 100644 --- a/toml/result.hpp +++ b/toml/result.hpp @@ -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() &