From 17b44320607e89d4914736bcb2978271f410deb9 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Fri, 19 Jan 2018 16:07:30 +0100 Subject: remove mistaken usages of std::forward I originally mistaken what the function did. --- options/value.hpp | 4 ++-- variant/default/main-window.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/options/value.hpp b/options/value.hpp index 87bb2a85..c8fb02ca 100644 --- a/options/value.hpp +++ b/options/value.hpp @@ -103,7 +103,7 @@ public: } never_inline - operator t() const { return std::forward(get()); } + operator t() const { return get(); } never_inline t operator->() const @@ -135,7 +135,7 @@ public: never_inline u to() const { - return static_cast(std::forward(get())); + return static_cast(get()); } private: diff --git a/variant/default/main-window.cpp b/variant/default/main-window.cpp index 0c0a7a8f..1b681abc 100644 --- a/variant/default/main-window.cpp +++ b/variant/default/main-window.cpp @@ -643,7 +643,7 @@ bool main_window::mk_window_common(std::unique_ptr& d, F&& ctor) template inline bool main_window::mk_window(std::unique_ptr& place, Args&&... params) { - return mk_window_common(place, [&]() { return new t(std::forward(params)...); }); + return mk_window_common(place, [&]() { return new t(params...); }); } template -- cgit v1.2.3