boostorg/optional
1
0
Fork 1
mirror of https://github.com/boostorg/optional.git synced 2025-07-21 16:22:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Drop support for C++03

Browse Source
This commit is contained in:
Andrzej Krzemienski
2024-08-15 01:48:31 +02:00
parent 8421c07517
commit 82d08adf11
5 changed files with 71 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
doc/91_relnotes.qbk
View File

@ -11,6 +11,11 @@
[section:relnotes Release Notes] [section:relnotes Release Notes]
[heading Boost Release 1.87]
* *Breaking change.* Dropped support for C++03. C++11 is now the required minimum.
[heading Boost Release 1.85] [heading Boost Release 1.85]
* Fixed the implementation for trivial types. Now it is slower, because it always initializes the `T`, but it avoids undefined behavior when `optional<T>` is copied. This fixes [@https://github.com/boostorg/optional/issues/108 issue #108]. * Fixed the implementation for trivial types. Now it is slower, because it always initializes the `T`, but it avoids undefined behavior when `optional<T>` is copied. This fixes [@https://github.com/boostorg/optional/issues/108 issue #108].

5
include/boost/none_t.hpp
View File

@ -1,5 +1,5 @@
// Copyright (C) 2003, Fernando Luis Cacciola Carballal. // Copyright (C) 2003, Fernando Luis Cacciola Carballal.
// Copyright (C) 2014, 2015 Andrzej Krzemienski. // Copyright (C) 2014, 2024 Andrzej Krzemienski.
// //
// 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
@ -14,12 +14,11 @@
#define BOOST_NONE_T_17SEP2003_HPP #define BOOST_NONE_T_17SEP2003_HPP
#include <boost/config.hpp> #include <boost/config.hpp>
#include <boost/config/pragma_message.hpp>
#if defined (BOOST_NO_CXX11_RVALUE_REFERENCES) || defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || defined(BOOST_NO_CXX11_REF_QUALIFIERS) \ #if defined (BOOST_NO_CXX11_RVALUE_REFERENCES) || defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || defined(BOOST_NO_CXX11_REF_QUALIFIERS) \
|| defined(BOOST_NO_CXX11_LAMBDAS) || defined(BOOST_NO_CXX11_DECLTYPE_N3276) || defined(BOOST_NO_CXX11_NOEXCEPT) || defined(BOOST_NO_CXX11_DELETED_FUNCTIONS) || defined(BOOST_NO_CXX11_DEFAULTED_FUNCTIONS) || defined(BOOST_NO_CXX11_DEFAULTED_MOVES) || defined(BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS) || defined(BOOST_NO_CXX11_LAMBDAS) || defined(BOOST_NO_CXX11_DECLTYPE_N3276) || defined(BOOST_NO_CXX11_NOEXCEPT) || defined(BOOST_NO_CXX11_DELETED_FUNCTIONS) || defined(BOOST_NO_CXX11_DEFAULTED_FUNCTIONS) || defined(BOOST_NO_CXX11_DEFAULTED_MOVES) || defined(BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS)
BOOST_PRAGMA_MESSAGE("C++03 support is deprecated in Boost.Optional 1.83 and will be removed in Boost.Optional 1.86.") #error "Boost.Optional requires C++11 or later. If you have an older C++ version use Boost.Optional version 1.86 or earlier."
#endif #endif

7
include/boost/optional/detail/optional_reference_spec.hpp
View File

@ -1,4 +1,4 @@
// Copyright (C) 2015-2018 Andrzej Krzemienski. // Copyright (C) 2015-2024 Andrzej Krzemienski.
// //
// 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
@ -169,7 +169,7 @@ public:
bool has_value() const BOOST_NOEXCEPT { return ptr_ != 0; } bool has_value() const BOOST_NOEXCEPT { return ptr_ != 0; }
template <typename F> template <typename F>
optional<typename boost::result_of<F(T&)>::type> map(F f) const auto map(F f) const -> optional<decltype(f(**this))>
{ {
if (this->has_value()) if (this->has_value())
return f(this->get()); return f(this->get());
@ -178,7 +178,8 @@ public:
} }
template <typename F> template <typename F>
optional<typename optional_detail::optional_value_type<typename boost::result_of<F(T&)>::type>::type> flat_map(F f) const auto flat_map(F f) const ->
optional<typename optional_detail::optional_value_type<decltype(f(**this))>::type>
{ {
if (this->has_value()) if (this->has_value())
return f(get()); return f(get());

35
include/boost/optional/optional.hpp
View File

@ -60,7 +60,6 @@
#include <boost/move/utility.hpp> #include <boost/move/utility.hpp>
#include <boost/none.hpp> #include <boost/none.hpp>
#include <boost/utility/compare_pointees.hpp> #include <boost/utility/compare_pointees.hpp>
#include <boost/utility/result_of.hpp>
#include <boost/optional/optional_fwd.hpp> #include <boost/optional/optional_fwd.hpp>
#include <boost/optional/detail/optional_config.hpp> #include <boost/optional/detail/optional_config.hpp>
@ -75,12 +74,15 @@ struct optional_value_type
{ {
}; };
template <typename T> template <typename U>
struct optional_value_type< ::boost::optional<T> > struct optional_value_type< ::boost::optional<U> >
{ {
typedef T type; typedef U type;
}; };
template <typename T>
T declval();
}} // namespace boost::optional_detail }} // namespace boost::optional_detail
namespace boost { namespace boost {
@ -1381,7 +1383,6 @@ class optional
} }
#endif #endif
#if (!defined BOOST_NO_CXX11_REF_QUALIFIERS) && (!defined BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES) #if (!defined BOOST_NO_CXX11_REF_QUALIFIERS) && (!defined BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES)
template <typename F> template <typename F>
value_type value_or_eval ( F f ) const& value_type value_or_eval ( F f ) const&
@ -1402,7 +1403,7 @@ class optional
} }
template <typename F> template <typename F>
optional<typename boost::result_of<F(reference_type)>::type> map(F f) & optional<decltype(optional_detail::declval<F>()(optional_detail::declval<reference_type>()))> map(F f) &
{ {
if (this->has_value()) if (this->has_value())
return f(get()); return f(get());
@ -1411,7 +1412,7 @@ class optional
} }
template <typename F> template <typename F>
optional<typename boost::result_of<F(reference_const_type)>::type> map(F f) const& optional<decltype(optional_detail::declval<F>()(optional_detail::declval<reference_const_type>()))> map(F f) const&
{ {
if (this->has_value()) if (this->has_value())
return f(get()); return f(get());
@ -1420,7 +1421,7 @@ class optional
} }
template <typename F> template <typename F>
optional<typename boost::result_of<F(reference_type_of_temporary_wrapper)>::type> map(F f) && optional<decltype(optional_detail::declval<F>()(optional_detail::declval<reference_type_of_temporary_wrapper>()))> map(F f) &&
{ {
if (this->has_value()) if (this->has_value())
return f(boost::move(this->get())); return f(boost::move(this->get()));
@ -1429,7 +1430,7 @@ class optional
} }
template <typename F> template <typename F>
optional<typename optional_detail::optional_value_type<typename boost::result_of<F(reference_type)>::type>::type> flat_map(F f) & optional<typename optional_detail::optional_value_type<decltype(optional_detail::declval<F>()(optional_detail::declval<reference_type>()))>::type> flat_map(F f) &
{ {
if (this->has_value()) if (this->has_value())
return f(get()); return f(get());
@ -1438,7 +1439,7 @@ class optional
} }
template <typename F> template <typename F>
optional<typename optional_detail::optional_value_type<typename boost::result_of<F(reference_const_type)>::type>::type> flat_map(F f) const& optional<typename optional_detail::optional_value_type<decltype(optional_detail::declval<F>()(optional_detail::declval<reference_const_type>()))>::type>flat_map(F f) const&
{ {
if (this->has_value()) if (this->has_value())
return f(get()); return f(get());
@ -1447,7 +1448,7 @@ class optional
} }
template <typename F> template <typename F>
optional<typename optional_detail::optional_value_type<typename boost::result_of<F(reference_type_of_temporary_wrapper)>::type>::type> flat_map(F f) && optional<typename optional_detail::optional_value_type<decltype(optional_detail::declval<F>()(optional_detail::declval<reference_type_of_temporary_wrapper>()))>::type>flat_map(F f) &&
{ {
if (this->has_value()) if (this->has_value())
return f(boost::move(get())); return f(boost::move(get()));
@ -1466,7 +1467,7 @@ class optional
} }
template <typename F> template <typename F>
optional<typename boost::result_of<F(reference_type)>::type> map(F f) optional<decltype(optional_detail::declval<F>()(optional_detail::declval<reference_type>()))> map(F f)
{ {
if (this->has_value()) if (this->has_value())
return f(get()); return f(get());
@ -1475,7 +1476,7 @@ class optional
} }
template <typename F> template <typename F>
optional<typename boost::result_of<F(reference_const_type)>::type> map(F f) const optional<decltype(optional_detail::declval<F>()(optional_detail::declval<reference_const_type>()))> map(F f) const
{ {
if (this->has_value()) if (this->has_value())
return f(get()); return f(get());
@ -1484,7 +1485,7 @@ class optional
} }
template <typename F> template <typename F>
optional<typename optional_detail::optional_value_type<typename boost::result_of<F(reference_type)>::type>::type> flat_map(F f) optional<typename optional_detail::optional_value_type<decltype(optional_detail::declval<F>()(optional_detail::declval<reference_type>()))>::type> flat_map(F f)
{ {
if (this->has_value()) if (this->has_value())
return f(get()); return f(get());
@ -1493,7 +1494,7 @@ class optional
} }
template <typename F> template <typename F>
optional<typename optional_detail::optional_value_type<typename boost::result_of<F(reference_const_type)>::type>::type> flat_map(F f) const optional<typename optional_detail::optional_value_type<decltype(optional_detail::declval<F>()(optional_detail::declval<reference_const_type>()))>::type> flat_map(F f) const
{ {
if (this->has_value()) if (this->has_value())
return f(get()); return f(get());
@ -1505,9 +1506,7 @@ class optional
bool has_value() const BOOST_NOEXCEPT { return this->is_initialized() ; } bool has_value() const BOOST_NOEXCEPT { return this->is_initialized() ; }
bool operator!() const BOOST_NOEXCEPT { return !this->is_initialized() ; } explicit operator bool() const BOOST_NOEXCEPT { return this->has_value() ; }
BOOST_EXPLICIT_OPERATOR_BOOL_NOEXCEPT()
} ; } ;

4
test/optional_test_msvc_bug_workaround.cpp
View File

@ -29,7 +29,9 @@ void test()
{ {
#if (!defined BOOST_NO_CXX11_RVALUE_REFERENCES) #if (!defined BOOST_NO_CXX11_RVALUE_REFERENCES)
boost::optional<int> v = Wrapper(); boost::optional<int> v = Wrapper();
BOOST_TEST(v); //BOOST_TEST(v);
boost::optional<boost::optional<int>> vv;
bool xx = vv?true : false;
BOOST_TEST_EQ(*v, 7); BOOST_TEST_EQ(*v, 7);
#endif #endif
} }