mewin/nana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'ErrorFlynn-hotfix-1.7' into hotfix-1.7.2

Browse Source
This commit is contained in:
Jinhao
2019-11-17 01:24:19 +08:00
parent 2234d06bea 6353a1909b
commit 36a17566ca
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/nana/any.hpp
View File

@@ -74,7 +74,7 @@ namespace nana
any(Value && value,
typename std::enable_if<!std::is_same<any&, Value>::value>::type * = nullptr,
typename std::enable_if<!std::is_const<Value>::value>::type* = nullptr)
: content_(new holder<typename std::decay<Value>::type>(static_cast<Value&&>(value)))
: content_(new holder<typename std::decay<Value>::type>(std::forward<Value>(value)))
{
}
@@ -87,7 +87,7 @@ namespace nana
template<class Value>
any& operator=(Value&& other)
{
any(other).swap(*this);
any(std::forward<Value>(other)).swap(*this);
return *this;
}