nerdcruft/libcruft-util
1
0
Fork 0
Code Issues Releases Activity

types/tagged: prefer forward to move

Browse Source
This commit is contained in:
Danny Robson 2019-03-11 13:01:01 +11:00
parent d124fffcb3
commit c3840f05b8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
types/tagged.hpp
View File

@ -55,7 +55,7 @@ namespace cruft {
template <typename InitialT> template <typename InitialT>
tagged (InitialT &&initial) tagged (InitialT &&initial)
{ {
set<InitialT> (std::move (initial)); set<InitialT> (std::forward<InitialT> (initial));
} }
~tagged () = default; ~tagged () = default;
@ -72,7 +72,7 @@ namespace cruft {
NextT& NextT&
operator= (NextT &&next) operator= (NextT &&next)
{ {
return set<NextT> (std::move (next)); return set<NextT> (std::forward<NextT> (next));
} }
@ -93,7 +93,7 @@ namespace cruft {
get (void)& get (void)&
{ {
CHECK (InnerT::tag == m_tag); CHECK (InnerT::tag == m_tag);
return *cruft::cast::alignment<InnerT*> (m_data + 0); return *cruft::cast::alignment<std::decay_t<InnerT>*> (m_data + 0);
} }
@ -102,7 +102,7 @@ namespace cruft {
get (void) const& get (void) const&
{ {
CHECK (InnerT::tag == m_tag); CHECK (InnerT::tag == m_tag);
return *cruft::cast::alignment<InnerT const*> (m_data + 0); return *cruft::cast::alignment<std::decay_t<InnerT> const*> (m_data + 0);
} }
@ -113,7 +113,7 @@ namespace cruft {
set (InnerT &&inner)& set (InnerT &&inner)&
{ {
m_tag = inner.tag; m_tag = inner.tag;
return get<InnerT> () = std::move (inner); return *cruft::cast::alignment<std::decay_t<InnerT>*> (m_data + 0) = std::forward<InnerT> (inner);
} }
private: private: