summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2018-01-19 16:07:30 +0100
committerStanislaw Halik <sthalik@misaki.pl>2018-01-20 11:53:55 +0100
commit17b44320607e89d4914736bcb2978271f410deb9 (patch)
treea857aed36799c8e2c74e16591c86bd56a225c8d1
parent11b3fff51e39cd98c62b0b59fe95aa51f8b30627 (diff)
remove mistaken usages of std::forward
I originally mistaken what the function did.
-rw-r--r--options/value.hpp4
-rw-r--r--variant/default/main-window.cpp2
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<t>(get()); }
+ operator t() const { return get(); }
never_inline
t operator->() const
@@ -135,7 +135,7 @@ public:
never_inline
u to() const
{
- return static_cast<u>(std::forward<t>(get()));
+ return static_cast<u>(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<t>& d, F&& ctor)
template<typename t, typename... Args>
inline bool main_window::mk_window(std::unique_ptr<t>& place, Args&&... params)
{
- return mk_window_common(place, [&]() { return new t(std::forward<Args>(params)...); });
+ return mk_window_common(place, [&]() { return new t(params...); });
}
template<typename t>