From cd4e44f3dc66a24c49ac4dc7d176cff98bcca821 Mon Sep 17 00:00:00 2001 From: Matt Date: Thu, 13 Apr 2017 09:13:26 -0400 Subject: [PATCH 1/6] r #12967 make none_t constructor constexpr --- include/boost/none_t.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/boost/none_t.hpp b/include/boost/none_t.hpp index 008f369..9ed9409 100644 --- a/include/boost/none_t.hpp +++ b/include/boost/none_t.hpp @@ -29,7 +29,7 @@ class none_t {}; struct none_t { struct init_tag{}; - explicit none_t(init_tag){} // to disable default constructor + explicit constexpr none_t(init_tag){} // to disable default constructor }; #endif // old implementation workarounds From b709447922e48e857d442856465a752312d54c2e Mon Sep 17 00:00:00 2001 From: Matt Date: Wed, 16 Aug 2017 13:52:46 -0400 Subject: [PATCH 2/6] r #12967 use BOOST_CONSTEXPR on none_t ctor --- include/boost/none_t.hpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/boost/none_t.hpp b/include/boost/none_t.hpp index 9ed9409..6b3c833 100644 --- a/include/boost/none_t.hpp +++ b/include/boost/none_t.hpp @@ -13,6 +13,8 @@ #ifndef BOOST_NONE_T_17SEP2003_HPP #define BOOST_NONE_T_17SEP2003_HPP +#include + namespace boost { #ifdef BOOST_OPTIONAL_USE_OLD_DEFINITION_OF_NONE @@ -29,7 +31,7 @@ class none_t {}; struct none_t { struct init_tag{}; - explicit constexpr none_t(init_tag){} // to disable default constructor + explicit BOOST_CONSTEXPR none_t(init_tag){} // to disable default constructor }; #endif // old implementation workarounds From 78d6563bcee11020b1468dda3dab813cd0bfbf1e Mon Sep 17 00:00:00 2001 From: Edward Diener Date: Mon, 30 Mar 2020 14:04:35 -0400 Subject: [PATCH 3/6] Change __BORLANDC__ to BOOST_BORLANDC, which is defined in Boost config for the Embarcadero non-clang-based compilers. --- include/boost/optional/detail/old_optional_implementation.hpp | 4 ++-- include/boost/optional/detail/optional_config.hpp | 2 +- test/optional_ref_assign_test_defs.hpp | 2 +- test/optional_test.cpp | 2 +- test/optional_test_conversions_from_U.cpp | 2 +- test/optional_test_convert_from_T.cpp | 2 +- test/optional_test_emplace.cpp | 2 +- test/optional_test_empty_braces.cpp | 2 +- test/optional_test_equals_none.cpp | 2 +- test/optional_test_experimental_traits.cpp | 2 +- test/optional_test_flat_map.cpp | 2 +- test/optional_test_inplace_factory.cpp | 2 +- test/optional_test_inplace_fail.cpp | 2 +- test/optional_test_inplace_fail2.cpp | 2 +- test/optional_test_io.cpp | 2 +- test/optional_test_make_optional.cpp | 2 +- test/optional_test_map.cpp | 2 +- test/optional_test_maybe_uninitialized_warning.cpp | 2 +- test/optional_test_member_T.cpp | 2 +- test/optional_test_minimum_requirements.cpp | 2 +- test/optional_test_move.cpp | 2 +- test/optional_test_msvc_bug_workaround.cpp | 2 +- test/optional_test_noexcept_move.cpp | 2 +- test/optional_test_old_impl.cpp | 2 +- test/optional_test_path_assignment.cpp | 2 +- test/optional_test_ref_assign_const_int.cpp | 2 +- test/optional_test_ref_assign_mutable_int.cpp | 2 +- test/optional_test_ref_assign_portable_minimum.cpp | 2 +- test/optional_test_ref_convert_assign_const_int.cpp | 2 +- test/optional_test_ref_convert_assign_const_int_prevented.cpp | 2 +- test/optional_test_ref_convert_assign_mutable_int.cpp | 2 +- test/optional_test_ref_convert_assign_non_int.cpp | 2 +- test/optional_test_ref_converting_ctor.cpp | 2 +- test/optional_test_ref_move.cpp | 2 +- test/optional_test_ref_portable_minimum.cpp | 2 +- test/optional_test_ref_to_val.cpp | 2 +- test/optional_test_sfinae_friendly_ctor.cpp | 2 +- test/optional_test_static_properties.cpp | 2 +- test/optional_test_swap.cpp | 2 +- test/optional_test_tc_base.cpp | 2 +- test/optional_test_tie.cpp | 2 +- test/optional_test_value_access.cpp | 2 +- 42 files changed, 43 insertions(+), 43 deletions(-) diff --git a/include/boost/optional/detail/old_optional_implementation.hpp b/include/boost/optional/detail/old_optional_implementation.hpp index f8dc260..3431e15 100644 --- a/include/boost/optional/detail/old_optional_implementation.hpp +++ b/include/boost/optional/detail/old_optional_implementation.hpp @@ -79,7 +79,7 @@ class optional_base : public optional_tag private : typedef -#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) +#if !BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564)) BOOST_DEDUCED_TYPENAME #endif ::boost::detail::make_reference_content::type internal_type ; @@ -619,7 +619,7 @@ class optional_base : public optional_tag reference_const_type dereference( internal_type const* p, is_reference_tag ) const { return p->get() ; } reference_type dereference( internal_type* p, is_reference_tag ) { return p->get() ; } -#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x581)) +#if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x581)) void destroy_impl ( is_not_reference_tag ) { get_ptr_impl()->internal_type::~internal_type() ; m_initialized = false ; } #else void destroy_impl ( is_not_reference_tag ) { get_ptr_impl()->~T() ; m_initialized = false ; } diff --git a/include/boost/optional/detail/optional_config.hpp b/include/boost/optional/detail/optional_config.hpp index bb7e12f..73f2505 100644 --- a/include/boost/optional/detail/optional_config.hpp +++ b/include/boost/optional/detail/optional_config.hpp @@ -28,7 +28,7 @@ # define BOOST_OPTIONAL_NO_INPLACE_FACTORY_SUPPORT #endif -#if BOOST_WORKAROUND(__BORLANDC__, <= 0x551) +#if BOOST_WORKAROUND(BOOST_BORLANDC, <= 0x551) // BCB (5.5.1) cannot parse the nested template struct in an inplace factory. # define BOOST_OPTIONAL_NO_INPLACE_FACTORY_SUPPORT #endif diff --git a/test/optional_ref_assign_test_defs.hpp b/test/optional_ref_assign_test_defs.hpp index 1b2a1b0..7185ff4 100644 --- a/test/optional_ref_assign_test_defs.hpp +++ b/test/optional_ref_assign_test_defs.hpp @@ -13,7 +13,7 @@ #include "boost/optional/optional.hpp" -#ifdef __BORLANDC__ +#ifdef BOOST_BORLANDC #pragma hdrstop #endif diff --git a/test/optional_test.cpp b/test/optional_test.cpp index 3354430..a0fa5a6 100644 --- a/test/optional_test.cpp +++ b/test/optional_test.cpp @@ -24,7 +24,7 @@ #include "boost/optional/optional.hpp" -#ifdef __BORLANDC__ +#ifdef BOOST_BORLANDC #pragma hdrstop #endif diff --git a/test/optional_test_conversions_from_U.cpp b/test/optional_test_conversions_from_U.cpp index 57d8215..309cb86 100644 --- a/test/optional_test_conversions_from_U.cpp +++ b/test/optional_test_conversions_from_U.cpp @@ -11,7 +11,7 @@ #include "boost/optional/optional.hpp" -#ifdef __BORLANDC__ +#ifdef BOOST_BORLANDC #pragma hdrstop #endif diff --git a/test/optional_test_convert_from_T.cpp b/test/optional_test_convert_from_T.cpp index 6d4c2ff..bfa1a0a 100644 --- a/test/optional_test_convert_from_T.cpp +++ b/test/optional_test_convert_from_T.cpp @@ -11,7 +11,7 @@ #include "boost/optional/optional.hpp" -#ifdef __BORLANDC__ +#ifdef BOOST_BORLANDC #pragma hdrstop #endif diff --git a/test/optional_test_emplace.cpp b/test/optional_test_emplace.cpp index 36972d3..d44e1d1 100644 --- a/test/optional_test_emplace.cpp +++ b/test/optional_test_emplace.cpp @@ -11,7 +11,7 @@ #include "boost/optional/optional.hpp" -#ifdef __BORLANDC__ +#ifdef BOOST_BORLANDC #pragma hdrstop #endif diff --git a/test/optional_test_empty_braces.cpp b/test/optional_test_empty_braces.cpp index 593a68f..273d81d 100644 --- a/test/optional_test_empty_braces.cpp +++ b/test/optional_test_empty_braces.cpp @@ -11,7 +11,7 @@ #include "boost/optional/optional.hpp" -#ifdef __BORLANDC__ +#ifdef BOOST_BORLANDC #pragma hdrstop #endif diff --git a/test/optional_test_equals_none.cpp b/test/optional_test_equals_none.cpp index 1c8c5d8..1e3157b 100644 --- a/test/optional_test_equals_none.cpp +++ b/test/optional_test_equals_none.cpp @@ -11,7 +11,7 @@ #include "boost/optional/optional.hpp" -#ifdef __BORLANDC__ +#ifdef BOOST_BORLANDC #pragma hdrstop #endif diff --git a/test/optional_test_experimental_traits.cpp b/test/optional_test_experimental_traits.cpp index 8093056..5088b4a 100644 --- a/test/optional_test_experimental_traits.cpp +++ b/test/optional_test_experimental_traits.cpp @@ -11,7 +11,7 @@ #include "boost/optional/optional.hpp" -#ifdef __BORLANDC__ +#ifdef BOOST_BORLANDC #pragma hdrstop #endif diff --git a/test/optional_test_flat_map.cpp b/test/optional_test_flat_map.cpp index 409e111..a6b2b13 100644 --- a/test/optional_test_flat_map.cpp +++ b/test/optional_test_flat_map.cpp @@ -11,7 +11,7 @@ #include "boost/optional/optional.hpp" -#ifdef __BORLANDC__ +#ifdef BOOST_BORLANDC #pragma hdrstop #endif diff --git a/test/optional_test_inplace_factory.cpp b/test/optional_test_inplace_factory.cpp index 1e852f0..b1624f6 100644 --- a/test/optional_test_inplace_factory.cpp +++ b/test/optional_test_inplace_factory.cpp @@ -13,7 +13,7 @@ #include #include "boost/optional/optional.hpp" -#ifdef __BORLANDC__ +#ifdef BOOST_BORLANDC #pragma hdrstop #endif diff --git a/test/optional_test_inplace_fail.cpp b/test/optional_test_inplace_fail.cpp index bb7c26f..38722ba 100644 --- a/test/optional_test_inplace_fail.cpp +++ b/test/optional_test_inplace_fail.cpp @@ -13,7 +13,7 @@ #include #include "boost/optional/optional.hpp" -#ifdef __BORLANDC__ +#ifdef BOOST_BORLANDC #pragma hdrstop #endif diff --git a/test/optional_test_inplace_fail2.cpp b/test/optional_test_inplace_fail2.cpp index e6a0004..ad4cedd 100644 --- a/test/optional_test_inplace_fail2.cpp +++ b/test/optional_test_inplace_fail2.cpp @@ -13,7 +13,7 @@ #include #include "boost/optional/optional.hpp" -#ifdef __BORLANDC__ +#ifdef BOOST_BORLANDC #pragma hdrstop #endif diff --git a/test/optional_test_io.cpp b/test/optional_test_io.cpp index 9dab619..14c2b26 100644 --- a/test/optional_test_io.cpp +++ b/test/optional_test_io.cpp @@ -14,7 +14,7 @@ #include "boost/optional/optional.hpp" #include "boost/optional/optional_io.hpp" -#ifdef __BORLANDC__ +#ifdef BOOST_BORLANDC #pragma hdrstop #endif diff --git a/test/optional_test_make_optional.cpp b/test/optional_test_make_optional.cpp index 8230c19..be271bd 100644 --- a/test/optional_test_make_optional.cpp +++ b/test/optional_test_make_optional.cpp @@ -11,7 +11,7 @@ #include "boost/optional/optional.hpp" -#ifdef __BORLANDC__ +#ifdef BOOST_BORLANDC #pragma hdrstop #endif diff --git a/test/optional_test_map.cpp b/test/optional_test_map.cpp index 288249c..3c1617b 100644 --- a/test/optional_test_map.cpp +++ b/test/optional_test_map.cpp @@ -11,7 +11,7 @@ #include "boost/optional/optional.hpp" -#ifdef __BORLANDC__ +#ifdef BOOST_BORLANDC #pragma hdrstop #endif diff --git a/test/optional_test_maybe_uninitialized_warning.cpp b/test/optional_test_maybe_uninitialized_warning.cpp index a9a0707..7660ece 100644 --- a/test/optional_test_maybe_uninitialized_warning.cpp +++ b/test/optional_test_maybe_uninitialized_warning.cpp @@ -11,7 +11,7 @@ #include "boost/optional/optional.hpp" -#ifdef __BORLANDC__ +#ifdef BOOST_BORLANDC #pragma hdrstop #endif diff --git a/test/optional_test_member_T.cpp b/test/optional_test_member_T.cpp index 325838d..c31fedb 100644 --- a/test/optional_test_member_T.cpp +++ b/test/optional_test_member_T.cpp @@ -11,7 +11,7 @@ #include "boost/optional/optional.hpp" -#ifdef __BORLANDC__ +#ifdef BOOST_BORLANDC #pragma hdrstop #endif diff --git a/test/optional_test_minimum_requirements.cpp b/test/optional_test_minimum_requirements.cpp index 77ef1fc..1e22735 100644 --- a/test/optional_test_minimum_requirements.cpp +++ b/test/optional_test_minimum_requirements.cpp @@ -11,7 +11,7 @@ #include "boost/optional/optional.hpp" -#ifdef __BORLANDC__ +#ifdef BOOST_BORLANDC #pragma hdrstop #endif diff --git a/test/optional_test_move.cpp b/test/optional_test_move.cpp index 1558c34..f27cd99 100644 --- a/test/optional_test_move.cpp +++ b/test/optional_test_move.cpp @@ -12,7 +12,7 @@ #include "boost/optional/optional.hpp" -#ifdef __BORLANDC__ +#ifdef BOOST_BORLANDC #pragma hdrstop #endif diff --git a/test/optional_test_msvc_bug_workaround.cpp b/test/optional_test_msvc_bug_workaround.cpp index 30f3b02..126e885 100644 --- a/test/optional_test_msvc_bug_workaround.cpp +++ b/test/optional_test_msvc_bug_workaround.cpp @@ -12,7 +12,7 @@ #define BOOST_OPTIONAL_CONFIG_NO_RVALUE_REFERENCES #include "boost/optional/optional.hpp" -#ifdef __BORLANDC__ +#ifdef BOOST_BORLANDC #pragma hdrstop #endif diff --git a/test/optional_test_noexcept_move.cpp b/test/optional_test_noexcept_move.cpp index 0675844..2e270ed 100644 --- a/test/optional_test_noexcept_move.cpp +++ b/test/optional_test_noexcept_move.cpp @@ -12,7 +12,7 @@ #include "boost/static_assert.hpp" #include "boost/optional/optional.hpp" -#ifdef __BORLANDC__ +#ifdef BOOST_BORLANDC #pragma hdrstop #endif diff --git a/test/optional_test_old_impl.cpp b/test/optional_test_old_impl.cpp index 994d989..f3da56e 100644 --- a/test/optional_test_old_impl.cpp +++ b/test/optional_test_old_impl.cpp @@ -12,7 +12,7 @@ #define BOOST_OPTIONAL_CONFIG_USE_OLD_IMPLEMENTATION_OF_OPTIONAL // does old implementation still work for basic usage? #include "boost/optional/optional.hpp" -#ifdef __BORLANDC__ +#ifdef BOOST_BORLANDC #pragma hdrstop #endif diff --git a/test/optional_test_path_assignment.cpp b/test/optional_test_path_assignment.cpp index f0c214a..50cda0a 100644 --- a/test/optional_test_path_assignment.cpp +++ b/test/optional_test_path_assignment.cpp @@ -11,7 +11,7 @@ #include "boost/optional/optional.hpp" -#ifdef __BORLANDC__ +#ifdef BOOST_BORLANDC #pragma hdrstop #endif diff --git a/test/optional_test_ref_assign_const_int.cpp b/test/optional_test_ref_assign_const_int.cpp index a14ef6d..6dddf9e 100644 --- a/test/optional_test_ref_assign_const_int.cpp +++ b/test/optional_test_ref_assign_const_int.cpp @@ -11,7 +11,7 @@ #include "boost/optional/optional.hpp" -#ifdef __BORLANDC__ +#ifdef BOOST_BORLANDC #pragma hdrstop #endif diff --git a/test/optional_test_ref_assign_mutable_int.cpp b/test/optional_test_ref_assign_mutable_int.cpp index 1c674da..5aa717e 100644 --- a/test/optional_test_ref_assign_mutable_int.cpp +++ b/test/optional_test_ref_assign_mutable_int.cpp @@ -11,7 +11,7 @@ #include "boost/optional/optional.hpp" -#ifdef __BORLANDC__ +#ifdef BOOST_BORLANDC #pragma hdrstop #endif diff --git a/test/optional_test_ref_assign_portable_minimum.cpp b/test/optional_test_ref_assign_portable_minimum.cpp index 19085d3..31599f3 100644 --- a/test/optional_test_ref_assign_portable_minimum.cpp +++ b/test/optional_test_ref_assign_portable_minimum.cpp @@ -11,7 +11,7 @@ #include "boost/optional/optional.hpp" -#ifdef __BORLANDC__ +#ifdef BOOST_BORLANDC #pragma hdrstop #endif diff --git a/test/optional_test_ref_convert_assign_const_int.cpp b/test/optional_test_ref_convert_assign_const_int.cpp index fb44aa1..0d6585f 100644 --- a/test/optional_test_ref_convert_assign_const_int.cpp +++ b/test/optional_test_ref_convert_assign_const_int.cpp @@ -11,7 +11,7 @@ #include "boost/optional/optional.hpp" -#ifdef __BORLANDC__ +#ifdef BOOST_BORLANDC #pragma hdrstop #endif diff --git a/test/optional_test_ref_convert_assign_const_int_prevented.cpp b/test/optional_test_ref_convert_assign_const_int_prevented.cpp index 7690d80..e692475 100644 --- a/test/optional_test_ref_convert_assign_const_int_prevented.cpp +++ b/test/optional_test_ref_convert_assign_const_int_prevented.cpp @@ -11,7 +11,7 @@ #include "boost/optional/optional.hpp" -#ifdef __BORLANDC__ +#ifdef BOOST_BORLANDC #pragma hdrstop #endif diff --git a/test/optional_test_ref_convert_assign_mutable_int.cpp b/test/optional_test_ref_convert_assign_mutable_int.cpp index 56a6e80..6003c43 100644 --- a/test/optional_test_ref_convert_assign_mutable_int.cpp +++ b/test/optional_test_ref_convert_assign_mutable_int.cpp @@ -11,7 +11,7 @@ #include "boost/optional/optional.hpp" -#ifdef __BORLANDC__ +#ifdef BOOST_BORLANDC #pragma hdrstop #endif diff --git a/test/optional_test_ref_convert_assign_non_int.cpp b/test/optional_test_ref_convert_assign_non_int.cpp index 80566b2..93d3c3f 100644 --- a/test/optional_test_ref_convert_assign_non_int.cpp +++ b/test/optional_test_ref_convert_assign_non_int.cpp @@ -11,7 +11,7 @@ #include "boost/optional/optional.hpp" -#ifdef __BORLANDC__ +#ifdef BOOST_BORLANDC #pragma hdrstop #endif diff --git a/test/optional_test_ref_converting_ctor.cpp b/test/optional_test_ref_converting_ctor.cpp index 81f3c0f..6f6517a 100644 --- a/test/optional_test_ref_converting_ctor.cpp +++ b/test/optional_test_ref_converting_ctor.cpp @@ -11,7 +11,7 @@ #include "boost/optional/optional.hpp" -#ifdef __BORLANDC__ +#ifdef BOOST_BORLANDC #pragma hdrstop #endif diff --git a/test/optional_test_ref_move.cpp b/test/optional_test_ref_move.cpp index 78b7bf2..bf0bcb8 100644 --- a/test/optional_test_ref_move.cpp +++ b/test/optional_test_ref_move.cpp @@ -11,7 +11,7 @@ #include "boost/optional/optional.hpp" -#ifdef __BORLANDC__ +#ifdef BOOST_BORLANDC #pragma hdrstop #endif diff --git a/test/optional_test_ref_portable_minimum.cpp b/test/optional_test_ref_portable_minimum.cpp index c929c3a..ec5b827 100644 --- a/test/optional_test_ref_portable_minimum.cpp +++ b/test/optional_test_ref_portable_minimum.cpp @@ -11,7 +11,7 @@ #include "boost/optional/optional.hpp" -#ifdef __BORLANDC__ +#ifdef BOOST_BORLANDC #pragma hdrstop #endif diff --git a/test/optional_test_ref_to_val.cpp b/test/optional_test_ref_to_val.cpp index 19e1675..e93469f 100644 --- a/test/optional_test_ref_to_val.cpp +++ b/test/optional_test_ref_to_val.cpp @@ -12,7 +12,7 @@ #include "boost/optional/optional.hpp" -#ifdef __BORLANDC__ +#ifdef BOOST_BORLANDC #pragma hdrstop #endif diff --git a/test/optional_test_sfinae_friendly_ctor.cpp b/test/optional_test_sfinae_friendly_ctor.cpp index 87539e1..c13bb2b 100644 --- a/test/optional_test_sfinae_friendly_ctor.cpp +++ b/test/optional_test_sfinae_friendly_ctor.cpp @@ -11,7 +11,7 @@ #include "boost/optional/optional.hpp" -#ifdef __BORLANDC__ +#ifdef BOOST_BORLANDC #pragma hdrstop #endif diff --git a/test/optional_test_static_properties.cpp b/test/optional_test_static_properties.cpp index c47bfa9..5dc1053 100644 --- a/test/optional_test_static_properties.cpp +++ b/test/optional_test_static_properties.cpp @@ -11,7 +11,7 @@ #include "boost/optional/optional.hpp" -#ifdef __BORLANDC__ +#ifdef BOOST_BORLANDC #pragma hdrstop #endif diff --git a/test/optional_test_swap.cpp b/test/optional_test_swap.cpp index 2feed25..2294c70 100644 --- a/test/optional_test_swap.cpp +++ b/test/optional_test_swap.cpp @@ -17,7 +17,7 @@ #include "boost/optional/optional.hpp" #include "boost/utility/in_place_factory.hpp" -#ifdef __BORLANDC__ +#ifdef BOOST_BORLANDC #pragma hdrstop #endif diff --git a/test/optional_test_tc_base.cpp b/test/optional_test_tc_base.cpp index a1d293b..8c78dc0 100644 --- a/test/optional_test_tc_base.cpp +++ b/test/optional_test_tc_base.cpp @@ -11,7 +11,7 @@ #include "boost/optional/optional.hpp" -#ifdef __BORLANDC__ +#ifdef BOOST_BORLANDC #pragma hdrstop #endif diff --git a/test/optional_test_tie.cpp b/test/optional_test_tie.cpp index b5c5818..1ea34f4 100644 --- a/test/optional_test_tie.cpp +++ b/test/optional_test_tie.cpp @@ -12,7 +12,7 @@ #include "boost/optional/optional.hpp" -#ifdef __BORLANDC__ +#ifdef BOOST_BORLANDC #pragma hdrstop #endif diff --git a/test/optional_test_value_access.cpp b/test/optional_test_value_access.cpp index 47ec5cc..c11cb42 100644 --- a/test/optional_test_value_access.cpp +++ b/test/optional_test_value_access.cpp @@ -11,7 +11,7 @@ #include "boost/optional/optional.hpp" -#ifdef __BORLANDC__ +#ifdef BOOST_BORLANDC #pragma hdrstop #endif From db5e156ebcd5483324f9ee2f0b6746e1698aa5f9 Mon Sep 17 00:00:00 2001 From: Moritz Baumann Date: Tue, 11 Aug 2020 10:36:12 +0200 Subject: [PATCH 4/6] Add explicit include to make tests compile with MSVC --- test/optional_test_emplace.cpp | 1 + test/optional_test_minimum_requirements.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/test/optional_test_emplace.cpp b/test/optional_test_emplace.cpp index d44e1d1..5182d97 100644 --- a/test/optional_test_emplace.cpp +++ b/test/optional_test_emplace.cpp @@ -15,6 +15,7 @@ #pragma hdrstop #endif +#include #include "boost/core/lightweight_test.hpp" #include "boost/none.hpp" diff --git a/test/optional_test_minimum_requirements.cpp b/test/optional_test_minimum_requirements.cpp index 1e22735..11ff247 100644 --- a/test/optional_test_minimum_requirements.cpp +++ b/test/optional_test_minimum_requirements.cpp @@ -15,6 +15,7 @@ #pragma hdrstop #endif +#include #include "boost/core/lightweight_test.hpp" #include "boost/none.hpp" From 9de55e6ffd97872a89d44fa06014f838b1615e73 Mon Sep 17 00:00:00 2001 From: Giovanni Mascellani Date: Sun, 17 Nov 2019 17:05:37 +0100 Subject: [PATCH 5/6] Fix funny mistake in copyright headers. --- test/optional_test_deleted_default_ctor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/optional_test_deleted_default_ctor.cpp b/test/optional_test_deleted_default_ctor.cpp index 790753c..1fe2bdb 100644 --- a/test/optional_test_deleted_default_ctor.cpp +++ b/test/optional_test_deleted_default_ctor.cpp @@ -1,5 +1,5 @@ // Copyright 2017 Peter Dimov -// Copyright 2017 Vinnie NotDefaultConstructible +// Copyright 2017 Vinnie Falco // Copyright 2018 Andrzej Krzemienski // // Distributed under the Boost Software License, Version 1.0. From 7e0b8145b51221bcae49f83d0ab53722c9056044 Mon Sep 17 00:00:00 2001 From: Andrzej Krzemienski Date: Sat, 24 Oct 2020 17:17:10 +0200 Subject: [PATCH 6/6] boost::none is constexpr-declared --- doc/21_ref_none.qbk | 4 +- doc/91_relnotes.qbk | 12 ++++-- doc/html/boost_optional/acknowledgements.html | 4 +- .../dependencies_and_portability.html | 4 +- ...emplace_operations_in_older_compilers.html | 4 +- .../optional_reference_binding.html | 4 +- doc/html/boost_optional/quick_start.html | 4 +- ...sing_unnecessary_default_construction.html | 4 +- .../optional_automatic_variables.html | 4 +- .../quick_start/optional_data_members.html | 4 +- .../quick_start/storage_in_containers.html | 4 +- ...ost_optional_bad_optional_access_hpp_.html | 4 +- .../detailed_semantics.html | 4 +- .../header__boost_optional_hpp_.html | 4 +- ...der__boost_optional_optional_fwd_hpp_.html | 4 +- .../detailed_semantics___free_functions.html | 4 +- ...ailed_semantics___optional_references.html | 4 +- .../detailed_semantics___optional_values.html | 4 +- .../header_optional_in_place_init.html | 4 +- .../header_optional_optional_refs.html | 4 +- .../header_optional_optional_values.html | 4 +- .../boost_optional/reference/io_header.html | 4 +- .../reference/io_header/io_semantics.html | 14 +++---- doc/html/boost_optional/relnotes.html | 42 ++++++++++++------- .../tutorial/design_overview.html | 12 +++--- .../design_overview/the_interface.html | 8 ++-- .../design_overview/the_semantics.html | 4 +- .../tutorial/exception_safety_guarantees.html | 4 +- doc/html/boost_optional/tutorial/gotchas.html | 6 +-- ...e_positive_with__wmaybe_uninitialized.html | 4 +- .../gotchas/mixed_relational_comparisons.html | 4 +- .../gotchas/moved_from__optional_.html | 4 +- .../tutorial/in_place_factories.html | 4 +- .../boost_optional/tutorial/io_operators.html | 4 +- .../tutorial/optional_references.html | 4 +- ...for_assignment_of_optional_references.html | 4 +- .../tutorial/performance_considerations.html | 4 +- .../tutorial/relational_operators.html | 4 +- .../tutorial/type_requirements.html | 4 +- .../tutorial/when_to_use_optional.html | 4 +- doc/html/index.html | 8 ++-- doc/html/optional/reference.html | 6 +-- .../header__boost_optional_optional_hpp_.html | 4 +- doc/html/optional/tutorial.html | 4 +- include/boost/none.hpp | 7 ++-- 45 files changed, 139 insertions(+), 120 deletions(-) diff --git a/doc/21_ref_none.qbk b/doc/21_ref_none.qbk index 011eff7..65eaa81 100644 --- a/doc/21_ref_none.qbk +++ b/doc/21_ref_none.qbk @@ -17,8 +17,8 @@ namespace boost { class none_t {/* see below */}; -const none_t none (/* see below */); - +inline constexpr none_t none (/* see below */); + } // namespace boost ``` diff --git a/doc/91_relnotes.qbk b/doc/91_relnotes.qbk index e4a5eaa..79f881f 100644 --- a/doc/91_relnotes.qbk +++ b/doc/91_relnotes.qbk @@ -11,18 +11,24 @@ [section:relnotes Release Notes] +[heading Boost Release 1.75] + +* `boost::none` is `constexpr`-declared. + +* Fixed [@https://github.com/boostorg/optional/issues/78 issue #78]. + [heading Boost Release 1.73] * Fixed [@https://github.com/boostorg/optional/issues/78 issue #78]. -* `boost::none` is now declared as an inline variable (on compilers taht support it): there is only one instance of `boost::none` across all translation units. +* `boost::none` is now declared as an inline variable (on compilers taht support it): there is only one instance of `boost::none` across all translation units. * Fixed a number of compilation errors in GCC 4.4.7 in `optional` for trivial `T`s. Thanks to Robert Leahy for the fix. For details see [@https://github.com/boostorg/optional/pull/80 pr #78]. -* Now surpressing warning `-Wweak-vtables`. +* Now surpressing warning `-Wweak-vtables`. [heading Boost Release 1.69] * Remove deprecation mark from `reset()` method (without arguments). * Fixed [@https://github.com/boostorg/optional/issues/59 issue #59]. -* Fixed bug with initialization of certain wrapper types in clang with -std=c++03. See [@https://github.com/boostorg/optional/pull/64 pr #64]. +* Fixed bug with initialization of certain wrapper types in clang with -std=c++03. See [@https://github.com/boostorg/optional/pull/64 pr #64]. [heading Boost Release 1.68] diff --git a/doc/html/boost_optional/acknowledgements.html b/doc/html/boost_optional/acknowledgements.html index c6f9f2f..eff2ed8 100644 --- a/doc/html/boost_optional/acknowledgements.html +++ b/doc/html/boost_optional/acknowledgements.html @@ -1,6 +1,6 @@ - + Acknowledgements @@ -116,7 +116,7 @@ -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-