feedc0de/boost_optional
1
0
Fork 0
forked from boostorg/optional
Code Pull Requests Activity

refactor: address code review comments

Browse Source
This commit is contained in:
typenameTea
2024-10-05 12:47:10 +01:00
parent 2b33d57c82
commit c33708c1f9
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/boost/optional/detail/optional_utility.hpp
View File

@ -1,4 +1,4 @@
// Copyright (C) 2024 Andrzej Krzemienski. // Copyright (C) 2024 typenameTea.
// //
// Use, modification, and distribution is subject to the Boost Software // Use, modification, and distribution is subject to the Boost Software
// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at // License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
@ -7,7 +7,7 @@
// See http://www.boost.org/libs/optional for documentation. // See http://www.boost.org/libs/optional for documentation.
// //
// You are welcome to contact the author at: // You are welcome to contact the author at:
// akrzemi1@gmail.com // typenametea@gmail.com
#ifndef BOOST_OPTIONAL_OPTIONAL_DETAIL_OPTIONAL_UTILITY_HPP #ifndef BOOST_OPTIONAL_OPTIONAL_DETAIL_OPTIONAL_UTILITY_HPP
#define BOOST_OPTIONAL_OPTIONAL_DETAIL_OPTIONAL_UTILITY_HPP #define BOOST_OPTIONAL_OPTIONAL_DETAIL_OPTIONAL_UTILITY_HPP
@ -16,18 +16,21 @@ namespace boost {
namespace optional_detail { namespace optional_detail {
// Workaround: forward and move aren't constexpr in C++11 // Workaround: forward and move aren't constexpr in C++11
template <class T> inline constexpr T&& forward(typename boost::remove_reference<T>::type& t) noexcept template <class T>
inline constexpr T&& forward(typename boost::remove_reference<T>::type& t) noexcept
{ {
return static_cast<T&&>(t); return static_cast<T&&>(t);
} }
template <class T> inline constexpr T&& forward(typename boost::remove_reference<T>::type&& t) noexcept template <class T>
inline constexpr T&& forward(typename boost::remove_reference<T>::type&& t) noexcept
{ {
BOOST_STATIC_ASSERT_MSG(!boost::is_lvalue_reference<T>::value, "Can not forward an rvalue as an lvalue."); BOOST_STATIC_ASSERT_MSG(!boost::is_lvalue_reference<T>::value, "Can not forward an rvalue as an lvalue.");
return static_cast<T&&>(t); return static_cast<T&&>(t);
} }
template <class T> inline constexpr typename boost::remove_reference<T>::type&& move(T&& t) noexcept template <class T>
inline constexpr typename boost::remove_reference<T>::type&& move(T&& t) noexcept
{ {
return static_cast<typename boost::remove_reference<T>::type&&>(t); return static_cast<typename boost::remove_reference<T>::type&&>(t);
} }

6
include/boost/optional/optional_io.hpp
View File

@ -63,11 +63,7 @@ operator>>(std::basic_istream<CharType, CharTrait>& in, optional<T>& v)
{ {
T x; T x;
in >> x; in >> x;
#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES v = optional_detail::move(x);
v = std::move(x);
#else
v = x;
#endif
} }
else else
{ {