From d2f8a4298028cc9f517895a946e735ac392676b5 Mon Sep 17 00:00:00 2001 From: "Daniel J. Hofmann" Date: Sun, 14 May 2017 16:31:00 +0200 Subject: [PATCH 1/6] Adds forwarding make_optional helpers, resolves #30 --- include/boost/optional/optional.hpp | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/include/boost/optional/optional.hpp b/include/boost/optional/optional.hpp index a465b9ed..e578a393 100644 --- a/include/boost/optional/optional.hpp +++ b/include/boost/optional/optional.hpp @@ -1276,6 +1276,25 @@ class optional namespace boost { +#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES + +template +inline +optional::type> make_optional ( T && v ) +{ + return optional::type>(boost::forward(v)); +} + +// Returns optional(cond,v) +template +inline +optional::type> make_optional ( bool cond, T && v ) +{ + return optional::type>(cond,boost::forward(v)); +} + +#else + // Returns optional(v) template inline @@ -1292,6 +1311,8 @@ optional make_optional ( bool cond, T const& v ) return optional(cond,v); } +#endif // BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES + // Returns a reference to the value if this is initialized, otherwise, the behaviour is UNDEFINED. // No-throw template From 19eee3dad09c78d0a1ea726d70e7921154b02a57 Mon Sep 17 00:00:00 2001 From: Andrzej Krzemienski Date: Thu, 18 May 2017 01:09:31 +0200 Subject: [PATCH 2/6] Fix make_optional for rvalues --- doc/00_optional.qbk | 2 +- doc/27_ref_optional_synopsis.qbk | 4 + doc/28_ref_optional_semantics.qbk | 18 +++ doc/html/boost_optional/acknowledgements.html | 3 +- .../dependencies_and_portability.html | 3 +- ...emplace_operations_in_older_compilers.html | 3 +- .../optional_reference_binding.html | 3 +- doc/html/boost_optional/quick_start.html | 3 +- ...sing_unnecessary_default_construction.html | 3 +- .../optional_automatic_variables.html | 3 +- .../quick_start/optional_data_members.html | 3 +- .../quick_start/storage_in_containers.html | 3 +- ...ost_optional_bad_optional_access_hpp_.html | 3 +- .../detailed_semantics.html | 3 +- .../header__boost_optional_hpp_.html | 3 +- ...der__boost_optional_optional_fwd_hpp_.html | 3 +- .../detailed_semantics___free_functions.html | 29 ++++- ...ailed_semantics___optional_references.html | 3 +- .../detailed_semantics___optional_values.html | 3 +- .../header_optional_in_place_init.html | 3 +- .../header_optional_optional_refs.html | 3 +- .../header_optional_optional_values.html | 3 +- .../boost_optional/reference/io_header.html | 3 +- .../reference/io_header/io_semantics.html | 3 +- doc/html/boost_optional/relnotes.html | 3 +- .../tutorial/design_overview.html | 3 +- .../design_overview/the_interface.html | 3 +- .../design_overview/the_semantics.html | 3 +- .../tutorial/exception_safety_guarantees.html | 3 +- doc/html/boost_optional/tutorial/gotchas.html | 3 +- ...e_positive_with__wmaybe_uninitialized.html | 3 +- .../gotchas/mixed_relational_comparisons.html | 3 +- .../gotchas/moved_from__optional_.html | 3 +- .../tutorial/in_place_factories.html | 3 +- .../boost_optional/tutorial/io_operators.html | 3 +- .../tutorial/optional_references.html | 3 +- ...for_assignment_of_optional_references.html | 3 +- .../tutorial/performance_considerations.html | 3 +- .../tutorial/relational_operators.html | 3 +- .../tutorial/type_requirements.html | 3 +- .../tutorial/when_to_use_optional.html | 3 +- doc/html/index.html | 5 +- doc/html/optional/reference.html | 3 +- .../header__boost_optional_optional_hpp_.html | 7 +- doc/html/optional/tutorial.html | 3 +- include/boost/optional/optional.hpp | 19 +++ test/Jamfile.v2 | 1 + test/optional_test_make_optional.cpp | 122 ++++++++++++++++++ 48 files changed, 280 insertions(+), 44 deletions(-) create mode 100644 test/optional_test_make_optional.cpp diff --git a/doc/00_optional.qbk b/doc/00_optional.qbk index e6ebc4c6..02e21f46 100644 --- a/doc/00_optional.qbk +++ b/doc/00_optional.qbk @@ -2,7 +2,7 @@ [quickbook 1.4] [authors [Cacciola Carballal, Fernando Luis]] [copyright 2003-2007 Fernando Luis Cacciola Carballal] - [copyright 2014-2016 Andrzej Krzemieński] + [copyright 2014-2017 Andrzej Krzemieński] [category miscellaneous] [id optional] [dirname optional] diff --git a/doc/27_ref_optional_synopsis.qbk b/doc/27_ref_optional_synopsis.qbk index 2da3b8f9..f93076eb 100644 --- a/doc/27_ref_optional_synopsis.qbk +++ b/doc/27_ref_optional_synopsis.qbk @@ -44,8 +44,12 @@ template inline bool operator != ( optional const& x, none_t ) noexcept ; ``[link reference_operator_compare_not_equal_optional_none __GO_TO__]`` template inline optional make_optional ( T const& v ) ; ``[link reference_make_optional_value __GO_TO__]`` + + template inline optional> make_optional ( T && v ) ; ``[link reference_make_optional_rvalue __GO_TO__]`` template inline optional make_optional ( bool condition, T const& v ) ; ``[link reference_make_optional_bool_value __GO_TO__]`` + + template inline optional> make_optional ( bool condition, T && v ) ; ``[link reference_make_optional_bool_rvalue __GO_TO__]`` template inline auto get_optional_value_or ( optional const& opt, typename optional::reference_const_type def ) -> typename optional::reference_const_type; ``[link reference_free_get_value_or __GO_TO__]`` diff --git a/doc/28_ref_optional_semantics.qbk b/doc/28_ref_optional_semantics.qbk index 1288c565..7e2740c0 100644 --- a/doc/28_ref_optional_semantics.qbk +++ b/doc/28_ref_optional_semantics.qbk @@ -1097,6 +1097,15 @@ template void foo ( optional const& opt ) ; foo ( make_optional(1+1) ) ; // Creates an optional `` +__SPACE__ + +[#reference_make_optional_rvalue] + +[: `optional> make_optional( T && v )`] + +* [*Returns: ] `optional>(std::move(v))` for the ['deduced] type `T` of `v`. + + __SPACE__ [#reference_make_optional_bool_value] @@ -1117,6 +1126,15 @@ if ( !v ) error("foo wasn't computed"); `` +__SPACE__ + +[#reference_make_optional_bool_rvalue] + +[: `optional> make_optional( bool condition, T && v )`] + +* [*Returns: ] `optional>(condition, std::move(v))` for the ['deduced] type `T` of `v`. + + __SPACE__ [#reference_operator_compare_equal_optional_optional] diff --git a/doc/html/boost_optional/acknowledgements.html b/doc/html/boost_optional/acknowledgements.html index 2cd116c2..9d07002c 100644 --- a/doc/html/boost_optional/acknowledgements.html +++ b/doc/html/boost_optional/acknowledgements.html @@ -116,7 +116,8 @@

-
Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2016 Andrzej Krzemieński

+

Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2017 Andrzej + Krzemieński

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/boost_optional/dependencies_and_portability.html b/doc/html/boost_optional/dependencies_and_portability.html index ac2309c3..24d00387 100644 --- a/doc/html/boost_optional/dependencies_and_portability.html +++ b/doc/html/boost_optional/dependencies_and_portability.html @@ -77,7 +77,8 @@
-
Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2016 Andrzej Krzemieński

+

Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2017 Andrzej + Krzemieński

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/boost_optional/dependencies_and_portability/emplace_operations_in_older_compilers.html b/doc/html/boost_optional/dependencies_and_portability/emplace_operations_in_older_compilers.html index 4aedcf70..2354e2e3 100644 --- a/doc/html/boost_optional/dependencies_and_portability/emplace_operations_in_older_compilers.html +++ b/doc/html/boost_optional/dependencies_and_portability/emplace_operations_in_older_compilers.html @@ -76,7 +76,8 @@
-
Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2016 Andrzej Krzemieński

+

Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2017 Andrzej + Krzemieński

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/boost_optional/dependencies_and_portability/optional_reference_binding.html b/doc/html/boost_optional/dependencies_and_portability/optional_reference_binding.html index f38dc208..cffa1608 100644 --- a/doc/html/boost_optional/dependencies_and_portability/optional_reference_binding.html +++ b/doc/html/boost_optional/dependencies_and_portability/optional_reference_binding.html @@ -93,7 +93,8 @@
-
Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2016 Andrzej Krzemieński

+

Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2017 Andrzej + Krzemieński

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/boost_optional/quick_start.html b/doc/html/boost_optional/quick_start.html index d68edf5c..d7dde639 100644 --- a/doc/html/boost_optional/quick_start.html +++ b/doc/html/boost_optional/quick_start.html @@ -155,7 +155,8 @@
-
Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2016 Andrzej Krzemieński

+

Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2017 Andrzej + Krzemieński

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/boost_optional/quick_start/bypassing_unnecessary_default_construction.html b/doc/html/boost_optional/quick_start/bypassing_unnecessary_default_construction.html index e0ea6895..7ccdb1be 100644 --- a/doc/html/boost_optional/quick_start/bypassing_unnecessary_default_construction.html +++ b/doc/html/boost_optional/quick_start/bypassing_unnecessary_default_construction.html @@ -61,7 +61,8 @@
-
Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2016 Andrzej Krzemieński

+

Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2017 Andrzej + Krzemieński

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/boost_optional/quick_start/optional_automatic_variables.html b/doc/html/boost_optional/quick_start/optional_automatic_variables.html index 30ca4158..e135be1e 100644 --- a/doc/html/boost_optional/quick_start/optional_automatic_variables.html +++ b/doc/html/boost_optional/quick_start/optional_automatic_variables.html @@ -61,7 +61,8 @@
-
Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2016 Andrzej Krzemieński

+

Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2017 Andrzej + Krzemieński

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/boost_optional/quick_start/optional_data_members.html b/doc/html/boost_optional/quick_start/optional_data_members.html index be051c9a..93682f8b 100644 --- a/doc/html/boost_optional/quick_start/optional_data_members.html +++ b/doc/html/boost_optional/quick_start/optional_data_members.html @@ -80,7 +80,8 @@
-
Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2016 Andrzej Krzemieński

+

Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2017 Andrzej + Krzemieński

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/boost_optional/quick_start/storage_in_containers.html b/doc/html/boost_optional/quick_start/storage_in_containers.html index 6cf99903..4861178d 100644 --- a/doc/html/boost_optional/quick_start/storage_in_containers.html +++ b/doc/html/boost_optional/quick_start/storage_in_containers.html @@ -50,7 +50,8 @@
-
Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2016 Andrzej Krzemieński

+

Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2017 Andrzej + Krzemieński

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/boost_optional/reference/header__boost_optional_bad_optional_access_hpp_.html b/doc/html/boost_optional/reference/header__boost_optional_bad_optional_access_hpp_.html index 930bc15c..42699658 100644 --- a/doc/html/boost_optional/reference/header__boost_optional_bad_optional_access_hpp_.html +++ b/doc/html/boost_optional/reference/header__boost_optional_bad_optional_access_hpp_.html @@ -49,7 +49,8 @@
-
Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2016 Andrzej Krzemieński

+

Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2017 Andrzej + Krzemieński

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/boost_optional/reference/header__boost_optional_bad_optional_access_hpp_/detailed_semantics.html b/doc/html/boost_optional/reference/header__boost_optional_bad_optional_access_hpp_/detailed_semantics.html index 1971eacc..ba66f61f 100644 --- a/doc/html/boost_optional/reference/header__boost_optional_bad_optional_access_hpp_/detailed_semantics.html +++ b/doc/html/boost_optional/reference/header__boost_optional_bad_optional_access_hpp_/detailed_semantics.html @@ -46,7 +46,8 @@
-
Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2016 Andrzej Krzemieński

+

Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2017 Andrzej + Krzemieński

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/boost_optional/reference/header__boost_optional_hpp_.html b/doc/html/boost_optional/reference/header__boost_optional_hpp_.html index 52d67c3a..2a81a82f 100644 --- a/doc/html/boost_optional/reference/header__boost_optional_hpp_.html +++ b/doc/html/boost_optional/reference/header__boost_optional_hpp_.html @@ -33,7 +33,8 @@
-
Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2016 Andrzej Krzemieński

+

Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2017 Andrzej + Krzemieński

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/boost_optional/reference/header__boost_optional_optional_fwd_hpp_.html b/doc/html/boost_optional/reference/header__boost_optional_optional_fwd_hpp_.html index 06b75d03..f053e061 100644 --- a/doc/html/boost_optional/reference/header__boost_optional_optional_fwd_hpp_.html +++ b/doc/html/boost_optional/reference/header__boost_optional_optional_fwd_hpp_.html @@ -52,7 +52,8 @@
-
Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2016 Andrzej Krzemieński

+

Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2017 Andrzej + Krzemieński

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/boost_optional/reference/header__boost_optional_optional_hpp_/detailed_semantics___free_functions.html b/doc/html/boost_optional/reference/header__boost_optional_optional_hpp_/detailed_semantics___free_functions.html index 4b33196a..1a486147 100644 --- a/doc/html/boost_optional/reference/header__boost_optional_optional_hpp_/detailed_semantics___free_functions.html +++ b/doc/html/boost_optional/reference/header__boost_optional_optional_hpp_/detailed_semantics___free_functions.html @@ -47,6 +47,19 @@
+

+ space +

+

+ optional<std::decay_t<T>> + make_optional( + T && + v ) +

+
  • + Returns: optional<std::decay_t<T>>(std::move(v)) for the deduced + type T of v. +

space

@@ -73,6 +86,19 @@ +

+ space +

+

+ optional<std::decay_t<T>> + make_optional( + bool condition, T && v + ) +

+
  • + Returns: optional<std::decay_t<T>>(condition, std::move(v)) for the deduced + type T of v. +

space

@@ -481,7 +507,8 @@ -
Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2016 Andrzej Krzemieński

+

Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2017 Andrzej + Krzemieński

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/boost_optional/reference/header__boost_optional_optional_hpp_/detailed_semantics___optional_references.html b/doc/html/boost_optional/reference/header__boost_optional_optional_hpp_/detailed_semantics___optional_references.html index 71b01dd8..ffe1733d 100644 --- a/doc/html/boost_optional/reference/header__boost_optional_optional_hpp_/detailed_semantics___optional_references.html +++ b/doc/html/boost_optional/reference/header__boost_optional_optional_hpp_/detailed_semantics___optional_references.html @@ -501,7 +501,8 @@
-
Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2016 Andrzej Krzemieński

+

Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2017 Andrzej + Krzemieński

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/boost_optional/reference/header__boost_optional_optional_hpp_/detailed_semantics___optional_values.html b/doc/html/boost_optional/reference/header__boost_optional_optional_hpp_/detailed_semantics___optional_values.html index 0d323b5b..b18c6185 100644 --- a/doc/html/boost_optional/reference/header__boost_optional_optional_hpp_/detailed_semantics___optional_values.html +++ b/doc/html/boost_optional/reference/header__boost_optional_optional_hpp_/detailed_semantics___optional_values.html @@ -1651,7 +1651,8 @@
-
Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2016 Andrzej Krzemieński

+

Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2017 Andrzej + Krzemieński

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/boost_optional/reference/header__boost_optional_optional_hpp_/header_optional_in_place_init.html b/doc/html/boost_optional/reference/header__boost_optional_optional_hpp_/header_optional_in_place_init.html index 8c1a4679..8f1560ed 100644 --- a/doc/html/boost_optional/reference/header__boost_optional_optional_hpp_/header_optional_in_place_init.html +++ b/doc/html/boost_optional/reference/header__boost_optional_optional_hpp_/header_optional_in_place_init.html @@ -47,7 +47,8 @@
-
Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2016 Andrzej Krzemieński

+

Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2017 Andrzej + Krzemieński

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/boost_optional/reference/header__boost_optional_optional_hpp_/header_optional_optional_refs.html b/doc/html/boost_optional/reference/header__boost_optional_optional_hpp_/header_optional_optional_refs.html index 3ce9d0a3..ee518a4a 100644 --- a/doc/html/boost_optional/reference/header__boost_optional_optional_hpp_/header_optional_optional_refs.html +++ b/doc/html/boost_optional/reference/header__boost_optional_optional_hpp_/header_optional_optional_refs.html @@ -100,7 +100,8 @@
-
Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2016 Andrzej Krzemieński

+

Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2017 Andrzej + Krzemieński

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/boost_optional/reference/header__boost_optional_optional_hpp_/header_optional_optional_values.html b/doc/html/boost_optional/reference/header__boost_optional_optional_hpp_/header_optional_optional_values.html index 2d191293..172da406 100644 --- a/doc/html/boost_optional/reference/header__boost_optional_optional_hpp_/header_optional_optional_values.html +++ b/doc/html/boost_optional/reference/header__boost_optional_optional_hpp_/header_optional_optional_values.html @@ -130,7 +130,8 @@
-
Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2016 Andrzej Krzemieński

+

Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2017 Andrzej + Krzemieński

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/boost_optional/reference/io_header.html b/doc/html/boost_optional/reference/io_header.html index 263e7102..675e5987 100644 --- a/doc/html/boost_optional/reference/io_header.html +++ b/doc/html/boost_optional/reference/io_header.html @@ -58,7 +58,8 @@
-
Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2016 Andrzej Krzemieński

+

Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2017 Andrzej + Krzemieński

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/boost_optional/reference/io_header/io_semantics.html b/doc/html/boost_optional/reference/io_header/io_semantics.html index 767cc489..d286c9d4 100644 --- a/doc/html/boost_optional/reference/io_header/io_semantics.html +++ b/doc/html/boost_optional/reference/io_header/io_semantics.html @@ -98,7 +98,8 @@
-
Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2016 Andrzej Krzemieński

+

Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2017 Andrzej + Krzemieński

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/boost_optional/relnotes.html b/doc/html/boost_optional/relnotes.html index 79243a23..1b161ede 100644 --- a/doc/html/boost_optional/relnotes.html +++ b/doc/html/boost_optional/relnotes.html @@ -230,7 +230,8 @@

-
Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2016 Andrzej Krzemieński

+

Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2017 Andrzej + Krzemieński

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/boost_optional/tutorial/design_overview.html b/doc/html/boost_optional/tutorial/design_overview.html index 0aeb0c09..5d2a7a06 100644 --- a/doc/html/boost_optional/tutorial/design_overview.html +++ b/doc/html/boost_optional/tutorial/design_overview.html @@ -170,7 +170,8 @@
-
Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2016 Andrzej Krzemieński

+

Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2017 Andrzej + Krzemieński

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/boost_optional/tutorial/design_overview/the_interface.html b/doc/html/boost_optional/tutorial/design_overview/the_interface.html index 77e17a5c..6b860a7d 100644 --- a/doc/html/boost_optional/tutorial/design_overview/the_interface.html +++ b/doc/html/boost_optional/tutorial/design_overview/the_interface.html @@ -173,7 +173,8 @@
-
Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2016 Andrzej Krzemieński

+

Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2017 Andrzej + Krzemieński

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/boost_optional/tutorial/design_overview/the_semantics.html b/doc/html/boost_optional/tutorial/design_overview/the_semantics.html index 2a19976e..d84118a1 100644 --- a/doc/html/boost_optional/tutorial/design_overview/the_semantics.html +++ b/doc/html/boost_optional/tutorial/design_overview/the_semantics.html @@ -107,7 +107,8 @@
-
Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2016 Andrzej Krzemieński

+

Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2017 Andrzej + Krzemieński

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/boost_optional/tutorial/exception_safety_guarantees.html b/doc/html/boost_optional/tutorial/exception_safety_guarantees.html index cfabeeac..925eca6e 100644 --- a/doc/html/boost_optional/tutorial/exception_safety_guarantees.html +++ b/doc/html/boost_optional/tutorial/exception_safety_guarantees.html @@ -161,7 +161,8 @@
-
Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2016 Andrzej Krzemieński

+

Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2017 Andrzej + Krzemieński

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/boost_optional/tutorial/gotchas.html b/doc/html/boost_optional/tutorial/gotchas.html index 790aa197..fab4d531 100644 --- a/doc/html/boost_optional/tutorial/gotchas.html +++ b/doc/html/boost_optional/tutorial/gotchas.html @@ -98,7 +98,8 @@
-
Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2016 Andrzej Krzemieński

+

Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2017 Andrzej + Krzemieński

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/boost_optional/tutorial/gotchas/false_positive_with__wmaybe_uninitialized.html b/doc/html/boost_optional/tutorial/gotchas/false_positive_with__wmaybe_uninitialized.html index b2e88afc..299b211d 100644 --- a/doc/html/boost_optional/tutorial/gotchas/false_positive_with__wmaybe_uninitialized.html +++ b/doc/html/boost_optional/tutorial/gotchas/false_positive_with__wmaybe_uninitialized.html @@ -63,7 +63,8 @@
-
Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2016 Andrzej Krzemieński

+

Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2017 Andrzej + Krzemieński

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/boost_optional/tutorial/gotchas/mixed_relational_comparisons.html b/doc/html/boost_optional/tutorial/gotchas/mixed_relational_comparisons.html index b4391f78..a0c4eb08 100644 --- a/doc/html/boost_optional/tutorial/gotchas/mixed_relational_comparisons.html +++ b/doc/html/boost_optional/tutorial/gotchas/mixed_relational_comparisons.html @@ -45,7 +45,8 @@
-
Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2016 Andrzej Krzemieński

+

Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2017 Andrzej + Krzemieński

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/boost_optional/tutorial/gotchas/moved_from__optional_.html b/doc/html/boost_optional/tutorial/gotchas/moved_from__optional_.html index faecd740..2be1f777 100644 --- a/doc/html/boost_optional/tutorial/gotchas/moved_from__optional_.html +++ b/doc/html/boost_optional/tutorial/gotchas/moved_from__optional_.html @@ -49,7 +49,8 @@
-
Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2016 Andrzej Krzemieński

+

Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2017 Andrzej + Krzemieński

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/boost_optional/tutorial/in_place_factories.html b/doc/html/boost_optional/tutorial/in_place_factories.html index 3895f2ed..1f4e1458 100644 --- a/doc/html/boost_optional/tutorial/in_place_factories.html +++ b/doc/html/boost_optional/tutorial/in_place_factories.html @@ -183,7 +183,8 @@
-
Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2016 Andrzej Krzemieński

+

Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2017 Andrzej + Krzemieński

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/boost_optional/tutorial/io_operators.html b/doc/html/boost_optional/tutorial/io_operators.html index 05f5af07..874f5ace 100644 --- a/doc/html/boost_optional/tutorial/io_operators.html +++ b/doc/html/boost_optional/tutorial/io_operators.html @@ -73,7 +73,8 @@
-
Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2016 Andrzej Krzemieński

+

Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2017 Andrzej + Krzemieński

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/boost_optional/tutorial/optional_references.html b/doc/html/boost_optional/tutorial/optional_references.html index 9dd45b33..702733c7 100644 --- a/doc/html/boost_optional/tutorial/optional_references.html +++ b/doc/html/boost_optional/tutorial/optional_references.html @@ -103,7 +103,8 @@
-
Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2016 Andrzej Krzemieński

+

Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2017 Andrzej + Krzemieński

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/boost_optional/tutorial/optional_references/rebinding_semantics_for_assignment_of_optional_references.html b/doc/html/boost_optional/tutorial/optional_references/rebinding_semantics_for_assignment_of_optional_references.html index 0e4564f3..219fd617 100644 --- a/doc/html/boost_optional/tutorial/optional_references/rebinding_semantics_for_assignment_of_optional_references.html +++ b/doc/html/boost_optional/tutorial/optional_references/rebinding_semantics_for_assignment_of_optional_references.html @@ -133,7 +133,8 @@
-
Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2016 Andrzej Krzemieński

+

Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2017 Andrzej + Krzemieński

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/boost_optional/tutorial/performance_considerations.html b/doc/html/boost_optional/tutorial/performance_considerations.html index 0f999e98..5ce93f9b 100644 --- a/doc/html/boost_optional/tutorial/performance_considerations.html +++ b/doc/html/boost_optional/tutorial/performance_considerations.html @@ -209,7 +209,8 @@
-
Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2016 Andrzej Krzemieński

+

Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2017 Andrzej + Krzemieński

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/boost_optional/tutorial/relational_operators.html b/doc/html/boost_optional/tutorial/relational_operators.html index 0bfaec62..744120d5 100644 --- a/doc/html/boost_optional/tutorial/relational_operators.html +++ b/doc/html/boost_optional/tutorial/relational_operators.html @@ -99,7 +99,8 @@
-
Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2016 Andrzej Krzemieński

+

Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2017 Andrzej + Krzemieński

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/boost_optional/tutorial/type_requirements.html b/doc/html/boost_optional/tutorial/type_requirements.html index 8c7a9e05..8a9eb7f0 100644 --- a/doc/html/boost_optional/tutorial/type_requirements.html +++ b/doc/html/boost_optional/tutorial/type_requirements.html @@ -95,7 +95,8 @@
-
Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2016 Andrzej Krzemieński

+

Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2017 Andrzej + Krzemieński

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/boost_optional/tutorial/when_to_use_optional.html b/doc/html/boost_optional/tutorial/when_to_use_optional.html index 5046f616..675bd3fb 100644 --- a/doc/html/boost_optional/tutorial/when_to_use_optional.html +++ b/doc/html/boost_optional/tutorial/when_to_use_optional.html @@ -128,7 +128,8 @@
-
Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2016 Andrzej Krzemieński

+

Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2017 Andrzej + Krzemieński

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/index.html b/doc/html/index.html index 748486cd..1429a216 100644 --- a/doc/html/index.html +++ b/doc/html/index.html @@ -26,7 +26,8 @@ Fernando Luis Cacciola Carballal

Copyright © 2003-2007 Fernando Luis Cacciola Carballal

-

Copyright © 2014-2016 Andrzej Krzemieński

+

Copyright © 2014-2017 Andrzej + Krzemieński

Distributed under the Boost Software License, Version 1.0. (See accompanying @@ -145,7 +146,7 @@

- +

Last revised: February 14, 2017 at 22:51:08 GMT

Last revised: May 17, 2017 at 23:01:39 GMT
diff --git a/doc/html/optional/reference.html b/doc/html/optional/reference.html index 1c9b7927..fe13339a 100644 --- a/doc/html/optional/reference.html +++ b/doc/html/optional/reference.html @@ -75,7 +75,8 @@ -
Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2016 Andrzej Krzemieński

+

Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2017 Andrzej + Krzemieński

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/optional/reference/header__boost_optional_optional_hpp_.html b/doc/html/optional/reference/header__boost_optional_optional_hpp_.html index c6eec116..24626e36 100644 --- a/doc/html/optional/reference/header__boost_optional_optional_hpp_.html +++ b/doc/html/optional/reference/header__boost_optional_optional_hpp_.html @@ -65,8 +65,12 @@ template<class T> inline optional<T> make_optional ( T const& v ) ; R +template<class T> inline optional<std::decay_t<T>> make_optional ( T && v ) ; R + template<class T> inline optional<T> make_optional ( bool condition, T const& v ) ; R +template<class T> inline optional<std::decay_t<T>> make_optional ( bool condition, T && v ) ; R + template<class T> inline auto get_optional_value_or ( optional<T> const& opt, typename optional<T>::reference_const_type def ) -> typename optional<T>::reference_const_type; R template<class T> inline auto get_optional_value_or ( optional<T> const& opt, typename optional<T>::reference_type def ) -> typename optional<T>::reference_type ; R @@ -93,7 +97,8 @@
-
Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2016 Andrzej Krzemieński

+

Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2017 Andrzej + Krzemieński

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/optional/tutorial.html b/doc/html/optional/tutorial.html index 9ae37747..b3260b96 100644 --- a/doc/html/optional/tutorial.html +++ b/doc/html/optional/tutorial.html @@ -139,7 +139,8 @@
-
Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2016 Andrzej Krzemieński

+

Copyright © 2003-2007 Fernando Luis Cacciola Carballal
Copyright © 2014-2017 Andrzej + Krzemieński

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/include/boost/optional/optional.hpp b/include/boost/optional/optional.hpp index e578a393..a595e20b 100644 --- a/include/boost/optional/optional.hpp +++ b/include/boost/optional/optional.hpp @@ -152,6 +152,18 @@ class optional_base : public optional_tag construct(val); } +#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES + // Creates an optional initialized with 'move(val)' IFF cond is true, otherwise creates an uninitialzed optional. + // Can throw if T::T(T &&) does + optional_base ( bool cond, rval_reference_type val ) + : + m_initialized(false) + { + if ( cond ) + construct(boost::move(val)); + } +#endif + // Creates a deep copy of another optional // Can throw if T::T(T const&) does optional_base ( optional_base const& rhs ) @@ -810,6 +822,13 @@ class optional : public optional_detail::optional_base // Can throw if T::T(T const&) does optional ( bool cond, argument_type val ) : base(cond,val) {} +#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES + /// Creates an optional initialized with 'val' IFF cond is true, otherwise creates an uninitialized optional. + // Can throw if T::T(T &&) does + optional ( bool cond, rval_reference_type val ) : base( cond, boost::forward(val) ) + {} +#endif + // NOTE: MSVC needs templated versions first // Creates a deep copy of another convertible optional diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index 1820ba45..d081abcb 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -22,6 +22,7 @@ import testing ; [ run optional_test_conversions_from_U.cpp ] [ run optional_test_convert_from_T.cpp ] [ run optional_test_empty_braces.cpp ] + [ run optional_test_make_optional.cpp ] [ run optional_test_tie.cpp ] [ run optional_test_ref_assign_portable_minimum.cpp ] [ run optional_test_ref_assign_mutable_int.cpp ] diff --git a/test/optional_test_make_optional.cpp b/test/optional_test_make_optional.cpp new file mode 100644 index 00000000..92e25207 --- /dev/null +++ b/test/optional_test_make_optional.cpp @@ -0,0 +1,122 @@ +// Copyright (C) 2017 Andrzej Krzemienski. +// +// Use, modification, and distribution is subject to the Boost Software +// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at +// http://www.boost.org/LICENSE_1_0.txt) +// +// See http://www.boost.org/lib/optional for documentation. +// +// You are welcome to contact the author at: +// akrzemi1@gmail.com + +#include "boost/optional/optional.hpp" + +#ifdef __BORLANDC__ +#pragma hdrstop +#endif + +#include "boost/core/ignore_unused.hpp" +#include "boost/core/is_same.hpp" +#include "boost/core/lightweight_test.hpp" +#include "boost/core/lightweight_test_trait.hpp" + + +using boost::optional; +using boost::make_optional; + +#if (!defined BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES) +struct MoveOnly +{ + int value; + explicit MoveOnly(int i) : value(i) {} + MoveOnly(MoveOnly && r) : value(r.value) { r.value = 0; } + MoveOnly& operator=(MoveOnly && r) { value = r.value; r.value = 0; return *this; } + +private: + MoveOnly(MoveOnly const&); + void operator=(MoveOnly const&); +}; + +MoveOnly makeMoveOnly(int i) +{ + return MoveOnly(i); +} + +using boost::core::is_same; + +template +void verify_type(Deduced) +{ + BOOST_TEST_TRAIT_TRUE(( is_same )); +} + +void test_make_optional_for_move_only_type() +{ + verify_type< optional >(make_optional(makeMoveOnly(2))); + verify_type< optional >(make_optional(true, makeMoveOnly(2))); + + optional o1 = make_optional(makeMoveOnly(1)); + BOOST_TEST (o1); + BOOST_TEST_EQ (1, o1->value); + + optional o2 = make_optional(true, makeMoveOnly(2)); + BOOST_TEST (o2); + BOOST_TEST_EQ (2, o2->value); + + optional oN = make_optional(false, makeMoveOnly(2)); + BOOST_TEST (!oN); +} + +void test_make_optional_for_optional() +{ + optional oi; + verify_type< optional< optional > >(make_optional(oi)); + verify_type< optional< optional > >(make_optional(true, oi)); + + optional< optional > ooi = make_optional(oi); + BOOST_TEST (ooi); + BOOST_TEST (!*ooi); + + optional< optional > ooT = make_optional(true, oi); + BOOST_TEST (ooT); + BOOST_TEST (!*ooT); + + optional< optional > ooF = make_optional(false, oi); + BOOST_TEST (!ooF); +} + +void test_nested_make_optional() +{ + verify_type< optional< optional > >(make_optional(make_optional(1))); + verify_type< optional< optional > >(make_optional(true, make_optional(true, 2))); + + optional< optional > oo1 = make_optional(make_optional(1)); + BOOST_TEST (oo1); + BOOST_TEST (*oo1); + BOOST_TEST_EQ (1, **oo1); + + optional< optional > oo2 = make_optional(true, make_optional(true, 2)); + BOOST_TEST (oo2); + BOOST_TEST (*oo2); + BOOST_TEST_EQ (2, **oo2); + + optional< optional > oo3 = make_optional(true, make_optional(false, 3)); + BOOST_TEST (oo3); + BOOST_TEST (!*oo3); + + optional< optional > oo4 = make_optional(false, make_optional(true, 4)); + BOOST_TEST (!oo4); +} + +#endif // !defined BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES + +int main() +{ +#if (!defined BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES) + test_make_optional_for_move_only_type(); +#endif + test_make_optional_for_optional(); + test_nested_make_optional(); + + return boost::report_errors(); +} From 24d52882c81f4b4fb76940e5b2d9f22622ad9194 Mon Sep 17 00:00:00 2001 From: Kohei Takahashi Date: Tue, 13 Jun 2017 20:11:25 +0900 Subject: [PATCH 3/6] Enable tests that doesn't requires rv-ref. --- test/optional_test_make_optional.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/test/optional_test_make_optional.cpp b/test/optional_test_make_optional.cpp index 92e25207..c4c8dc81 100644 --- a/test/optional_test_make_optional.cpp +++ b/test/optional_test_make_optional.cpp @@ -24,6 +24,14 @@ using boost::optional; using boost::make_optional; +using boost::core::is_same; + +template +void verify_type(Deduced) +{ + BOOST_TEST_TRAIT_TRUE(( is_same )); +} + #if (!defined BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES) struct MoveOnly { @@ -42,14 +50,6 @@ MoveOnly makeMoveOnly(int i) return MoveOnly(i); } -using boost::core::is_same; - -template -void verify_type(Deduced) -{ - BOOST_TEST_TRAIT_TRUE(( is_same )); -} - void test_make_optional_for_move_only_type() { verify_type< optional >(make_optional(makeMoveOnly(2))); @@ -67,6 +67,8 @@ void test_make_optional_for_move_only_type() BOOST_TEST (!oN); } +#endif // !defined BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES + void test_make_optional_for_optional() { optional oi; @@ -108,8 +110,6 @@ void test_nested_make_optional() BOOST_TEST (!oo4); } -#endif // !defined BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES - int main() { #if (!defined BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES) From 708c3892d7662ed6f996b84e26ed271f0f95eab4 Mon Sep 17 00:00:00 2001 From: Andrey Semashev Date: Sat, 29 Jul 2017 17:18:27 +0300 Subject: [PATCH 4/6] Use BOOST_MAY_ALIAS from Boost.Config. --- .../boost/optional/detail/optional_aligned_storage.hpp | 8 ++------ include/boost/optional/detail/optional_config.hpp | 10 +++++----- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/include/boost/optional/detail/optional_aligned_storage.hpp b/include/boost/optional/detail/optional_aligned_storage.hpp index 6c7d5814..40938859 100644 --- a/include/boost/optional/detail/optional_aligned_storage.hpp +++ b/include/boost/optional/detail/optional_aligned_storage.hpp @@ -25,12 +25,8 @@ template class aligned_storage { // Borland ICEs if unnamed unions are used for this! - union - // This works around GCC warnings about breaking strict aliasing rules when casting storage address to T* -#if defined(BOOST_OPTIONAL_DETAIL_USE_ATTRIBUTE_MAY_ALIAS) - __attribute__((__may_alias__)) -#endif - dummy_u + // BOOST_MAY_ALIAS works around GCC warnings about breaking strict aliasing rules when casting storage address to T* + union BOOST_MAY_ALIAS dummy_u { char data[ sizeof(T) ]; BOOST_DEDUCED_TYPENAME type_with_alignment< diff --git a/include/boost/optional/detail/optional_config.hpp b/include/boost/optional/detail/optional_config.hpp index e26d73c1..deabd213 100644 --- a/include/boost/optional/detail/optional_config.hpp +++ b/include/boost/optional/detail/optional_config.hpp @@ -44,11 +44,11 @@ # define BOOST_OPTIONAL_WEAK_OVERLOAD_RESOLUTION #endif -#if defined(__GNUC__) && !defined(__INTEL_COMPILER) -// GCC since 3.3 has may_alias attribute that helps to alleviate optimizer issues with -// regard to violation of the strict aliasing rules. The optional< T > storage type is marked -// with this attribute in order to let the compiler know that it will alias objects of type T -// and silence compilation warnings. +#if !defined(BOOST_NO_MAY_ALIAS) +// GCC since 3.3 and some other compilers have may_alias attribute that helps to alleviate +// optimizer issues with regard to violation of the strict aliasing rules. The optional< T > +// storage type is marked with this attribute in order to let the compiler know that it will +// alias objects of type T and silence compilation warnings. # define BOOST_OPTIONAL_DETAIL_USE_ATTRIBUTE_MAY_ALIAS #endif From abf99ce559ab029caaeb8f1859408dff91b70cda Mon Sep 17 00:00:00 2001 From: Andrey Semashev Date: Sat, 29 Jul 2017 17:25:42 +0300 Subject: [PATCH 5/6] Convert tabs to spaces. --- .../detail/old_optional_implementation.hpp | 16 +++++----- .../detail/optional_aligned_storage.hpp | 30 +++++++++---------- include/boost/optional/optional.hpp | 20 ++++++------- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/include/boost/optional/detail/old_optional_implementation.hpp b/include/boost/optional/detail/old_optional_implementation.hpp index f2e67184..4e888edf 100644 --- a/include/boost/optional/detail/old_optional_implementation.hpp +++ b/include/boost/optional/detail/old_optional_implementation.hpp @@ -746,12 +746,12 @@ class optional : public optional_detail::optional_base optional ( optional const& rhs ) : base( static_cast(rhs) ) {} #ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES - // Creates a deep move of another optional - // Can throw if T::T(T&&) does - optional ( optional && rhs ) - BOOST_NOEXCEPT_IF(::boost::is_nothrow_move_constructible::value) - : base( boost::move(rhs) ) - {} + // Creates a deep move of another optional + // Can throw if T::T(T&&) does + optional ( optional && rhs ) + BOOST_NOEXCEPT_IF(::boost::is_nothrow_move_constructible::value) + : base( boost::move(rhs) ) + {} #endif // No-throw (assuming T::~T() doesn't) @@ -819,7 +819,7 @@ class optional : public optional_detail::optional_base #ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES // Assigns from another optional (deep-moves the rhs value) optional& operator= ( optional && rhs ) - BOOST_NOEXCEPT_IF(::boost::is_nothrow_move_constructible::value && ::boost::is_nothrow_move_assignable::value) + BOOST_NOEXCEPT_IF(::boost::is_nothrow_move_constructible::value && ::boost::is_nothrow_move_assignable::value) { this->assign( static_cast(rhs) ) ; return *this ; @@ -892,7 +892,7 @@ class optional : public optional_detail::optional_base #endif void swap( optional & arg ) - BOOST_NOEXCEPT_IF(::boost::is_nothrow_move_constructible::value && ::boost::is_nothrow_move_assignable::value) + BOOST_NOEXCEPT_IF(::boost::is_nothrow_move_constructible::value && ::boost::is_nothrow_move_assignable::value) { // allow for Koenig lookup boost::swap(*this, arg); diff --git a/include/boost/optional/detail/optional_aligned_storage.hpp b/include/boost/optional/detail/optional_aligned_storage.hpp index 40938859..2937349f 100644 --- a/include/boost/optional/detail/optional_aligned_storage.hpp +++ b/include/boost/optional/detail/optional_aligned_storage.hpp @@ -44,24 +44,24 @@ class aligned_storage #endif #if defined(BOOST_OPTIONAL_DETAIL_USE_ATTRIBUTE_MAY_ALIAS) - // This workaround is supposed to silence GCC warnings about broken strict aliasing rules - T const* ptr_ref() const - { - union { void const* ap_pvoid; T const* as_ptype; } caster = { address() }; - return caster.as_ptype; - } - T * ptr_ref() - { - union { void* ap_pvoid; T* as_ptype; } caster = { address() }; - return caster.as_ptype; - } + // This workaround is supposed to silence GCC warnings about broken strict aliasing rules + T const* ptr_ref() const + { + union { void const* ap_pvoid; T const* as_ptype; } caster = { address() }; + return caster.as_ptype; + } + T * ptr_ref() + { + union { void* ap_pvoid; T* as_ptype; } caster = { address() }; + return caster.as_ptype; + } #else - T const* ptr_ref() const { return static_cast(address()); } - T * ptr_ref() { return static_cast (address()); } + T const* ptr_ref() const { return static_cast(address()); } + T * ptr_ref() { return static_cast (address()); } #endif - T const& ref() const { return *ptr_ref(); } - T & ref() { return *ptr_ref(); } + T const& ref() const { return *ptr_ref(); } + T & ref() { return *ptr_ref(); } } ; diff --git a/include/boost/optional/optional.hpp b/include/boost/optional/optional.hpp index a595e20b..a75bf909 100644 --- a/include/boost/optional/optional.hpp +++ b/include/boost/optional/optional.hpp @@ -67,7 +67,7 @@ struct in_place_init_t }; const in_place_init_t in_place_init ((in_place_init_t::init_tag())); -// a tag for conditional in-place initialization of contained value +// a tag for conditional in-place initialization of contained value struct in_place_init_if_t { struct init_tag{}; @@ -896,12 +896,12 @@ class optional : public optional_detail::optional_base optional ( optional const& rhs ) : base( static_cast(rhs) ) {} #ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES - // Creates a deep move of another optional - // Can throw if T::T(T&&) does - optional ( optional && rhs ) - BOOST_NOEXCEPT_IF(::boost::is_nothrow_move_constructible::value) - : base( boost::move(rhs) ) - {} + // Creates a deep move of another optional + // Can throw if T::T(T&&) does + optional ( optional && rhs ) + BOOST_NOEXCEPT_IF(::boost::is_nothrow_move_constructible::value) + : base( boost::move(rhs) ) + {} #endif @@ -910,7 +910,7 @@ class optional : public optional_detail::optional_base ~optional() {} #endif - + #if !defined(BOOST_OPTIONAL_NO_INPLACE_FACTORY_SUPPORT) && !defined(BOOST_OPTIONAL_WEAK_OVERLOAD_RESOLUTION) // Assigns from an expression. See corresponding constructor. // Basic Guarantee: If the resolved T ctor throws, this is left UNINITIALIZED @@ -968,7 +968,7 @@ class optional : public optional_detail::optional_base #ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES // Assigns from another optional (deep-moves the rhs value) optional& operator= ( optional && rhs ) - BOOST_NOEXCEPT_IF(::boost::is_nothrow_move_constructible::value && ::boost::is_nothrow_move_assignable::value) + BOOST_NOEXCEPT_IF(::boost::is_nothrow_move_constructible::value && ::boost::is_nothrow_move_assignable::value) { this->assign( static_cast(rhs) ) ; return *this ; @@ -1112,7 +1112,7 @@ class optional : public optional_detail::optional_base #endif void swap( optional & arg ) - BOOST_NOEXCEPT_IF(::boost::is_nothrow_move_constructible::value && ::boost::is_nothrow_move_assignable::value) + BOOST_NOEXCEPT_IF(::boost::is_nothrow_move_constructible::value && ::boost::is_nothrow_move_assignable::value) { // allow for Koenig lookup boost::swap(*this, arg); From 9c81a3f9695a0a58ffbb5346d8ac9610d721d030 Mon Sep 17 00:00:00 2001 From: Alexander 'z33ky' Hirsch <1zeeky@gmail.com> Date: Tue, 24 Oct 2017 11:24:19 +0200 Subject: [PATCH 6/6] Make certain optional operations trivial if they are for T optional's copy- and move-constructor, as well as its destructor are made trivial, if they are for T. Without defaultable constructors, only the trivial destructor is implemented. --- include/boost/optional/optional.hpp | 760 ++++++++++++++++------------ test/Jamfile.v2 | 1 + test/optional_test_trivial.cpp | 75 +++ 3 files changed, 524 insertions(+), 312 deletions(-) create mode 100644 test/optional_test_trivial.cpp diff --git a/include/boost/optional/optional.hpp b/include/boost/optional/optional.hpp index a75bf909..15460d52 100644 --- a/include/boost/optional/optional.hpp +++ b/include/boost/optional/optional.hpp @@ -32,6 +32,9 @@ #include #include #include +#include +#include +#include #include #include #include @@ -86,20 +89,365 @@ namespace optional_detail { struct optional_tag {} ; +template +class optional_destroyer ; template -class optional_base : public optional_tag +class optional_base ; + +template +class optional_storage : optional_tag { + friend class optional_destroyer ; + friend class optional_destroyer ; + friend class optional_base ; + private : + typedef aligned_storage storage_type ; + typedef optional_base this_type ; + + protected : + typedef T value_type ; + + typedef T & reference_type ; + typedef T const& reference_const_type ; +#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES + typedef T && rval_reference_type ; + typedef T && reference_type_of_temporary_wrapper ; +#endif + typedef T * pointer_type ; + typedef T const* pointer_const_type ; + typedef T const& argument_type ; + + public: + // Returns a pointer to the value if this is initialized, otherwise, + // returns NULL. + // No-throw + pointer_const_type get_ptr() const { return m_initialized ? get_ptr_impl() : 0 ; } + pointer_type get_ptr() { return m_initialized ? get_ptr_impl() : 0 ; } + + bool is_initialized() const { return m_initialized ; } + + protected : + optional_storage() + : + m_initialized( false ) {} + + void construct ( argument_type val ) + { + ::new (m_storage.address()) value_type(val) ; + m_initialized = true ; + } + +#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES + void construct ( rval_reference_type val ) + { + ::new (m_storage.address()) value_type( boost::move(val) ) ; + m_initialized = true ; + } +#endif + +#if (!defined BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES) && (!defined BOOST_NO_CXX11_VARIADIC_TEMPLATES) + // Constructs in-place + // upon exception *this is always uninitialized + template + void construct ( in_place_init_t, Args&&... args ) + { + ::new (m_storage.address()) value_type( boost::forward(args)... ) ; + m_initialized = true ; + } +#elif (!defined BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES) + template + void construct ( in_place_init_t, Arg&& arg ) + { + ::new (m_storage.address()) value_type( boost::forward(arg) ); + m_initialized = true ; + } + + void construct ( in_place_init_t ) + { + ::new (m_storage.address()) value_type(); + m_initialized = true ; + } +#else + + template + void construct ( in_place_init_t, const Arg& arg ) + { + ::new (m_storage.address()) value_type( arg ); + m_initialized = true ; + } + + template + void construct ( in_place_init_t, Arg& arg ) + { + ::new (m_storage.address()) value_type( arg ); + m_initialized = true ; + } + + void construct ( in_place_init_t ) + { + ::new (m_storage.address()) value_type(); + m_initialized = true ; + } +#endif + +#ifndef BOOST_OPTIONAL_NO_INPLACE_FACTORY_SUPPORT + +#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES + // Constructs in-place using the given factory + template + void construct ( Expr&& factory, in_place_factory_base const* ) + { + boost_optional_detail::construct(factory, m_storage.address()); + m_initialized = true ; + } + + // Constructs in-place using the given typed factory + template + void construct ( Expr&& factory, typed_in_place_factory_base const* ) + { + factory.apply(m_storage.address()) ; + m_initialized = true ; + } +#else + // Constructs in-place using the given factory + template + void construct ( Expr const& factory, in_place_factory_base const* ) + { + boost_optional_detail::construct(factory, m_storage.address()); + m_initialized = true ; + } + + // Constructs in-place using the given typed factory + template + void construct ( Expr const& factory, typed_in_place_factory_base const* ) + { + factory.apply(m_storage.address()) ; + m_initialized = true ; + } +#endif + +#endif + +#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES + // Constructs using any expression implicitly convertible to the single argument + // of a one-argument T constructor. + // Converting constructions of optional from optional uses this function with + // 'Expr' being of type 'U' and relying on a converting constructor of T from U. + template + void construct ( Expr&& expr, void const* ) + { + new (m_storage.address()) value_type(boost::forward(expr)) ; + m_initialized = true ; + } +#else + // Constructs using any expression implicitly convertible to the single argument + // of a one-argument T constructor. + // Converting constructions of optional from optional uses this function with + // 'Expr' being of type 'U' and relying on a converting constructor of T from U. + template + void construct ( Expr const& expr, void const* ) + { + new (m_storage.address()) value_type(expr) ; + m_initialized = true ; + } +#endif + +#ifdef BOOST_OPTIONAL_WEAK_OVERLOAD_RESOLUTION + // BCB5.64 (and probably lower versions) workaround. + // The in-place factories are supported by means of catch-all constructors + // and assignment operators (the functions are parameterized in terms of + // an arbitrary 'Expr' type) + // This compiler incorrectly resolves the overload set and sinks optional and optional + // to the 'Expr'-taking functions even though explicit overloads are present for them. + // Thus, the following overload is needed to properly handle the case when the 'lhs' + // is another optional. + // + // For VC<=70 compilers this workaround dosen't work becasue the comnpiler issues and error + // instead of choosing the wrong overload + // +#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES + // Notice that 'Expr' will be optional or optional (but not optional_base<..>) + template + void construct ( Expr&& expr, optional_tag const* ) + { + if ( expr.is_initialized() ) + { + // An exception can be thrown here. + // It it happens, THIS will be left uninitialized. + new (m_storage.address()) value_type(boost::move(expr.get())) ; + m_initialized = true ; + } + } +#else + // Notice that 'Expr' will be optional or optional (but not optional_base<..>) + template + void construct ( Expr const& expr, optional_tag const* ) + { + if ( expr.is_initialized() ) + { + // An exception can be thrown here. + // It it happens, THIS will be left uninitialized. + new (m_storage.address()) value_type(expr.get()) ; + m_initialized = true ; + } + } +#endif +#endif // defined BOOST_OPTIONAL_WEAK_OVERLOAD_RESOLUTION + + void assign_value ( argument_type val ) { get_impl() = val; } +#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES + void assign_value ( rval_reference_type val ) { get_impl() = static_cast(val); } +#endif + + reference_const_type get_impl() const { return m_storage.ref() ; } + reference_type get_impl() { return m_storage.ref() ; } + + pointer_const_type get_ptr_impl() const { return m_storage.ptr_ref(); } + pointer_type get_ptr_impl() { return m_storage.ptr_ref(); } + + private : +#if BOOST_WORKAROUND(BOOST_MSVC, <= 1600) + void destroy_impl ( ) { m_storage.ptr_ref()->~T() ; m_initialized = false ; } +#else + void destroy_impl ( ) { m_storage.ref().T::~T() ; m_initialized = false ; } +#endif + + bool m_initialized ; + storage_type m_storage ; +}; + +template::value> +class optional_copier : public optional_storage +{ + typedef optional_storage storage_base ; + + protected : + optional_copier() {} + optional_copier ( optional_copier const& rhs ) + { + if ( rhs.is_initialized() ) + storage_base::construct(rhs.get_impl()); + } + +#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES +#if (!defined BOOST_NO_CXX11_DEFAULTED_FUNCTIONS) && (!defined BOOST_NO_CXX11_NON_PUBLIC_DEFAULTED_FUNCTIONS) + optional_copier ( optional_copier && ) = default; +#else + optional_copier ( optional_copier && rhs ) : storage_base( boost::move(rhs) ) {} +#endif +#endif +}; + +#if (!defined BOOST_NO_CXX11_DEFAULTED_FUNCTIONS) && (!defined BOOST_NO_CXX11_NON_PUBLIC_DEFAULTED_FUNCTIONS) +template +class optional_copier : public optional_storage +{ + protected : + optional_copier() {} + optional_copier ( optional_copier const& ) = default; + optional_copier ( optional_copier && ) = default; +}; +#endif + +template::value> +class optional_mover : public optional_copier +{ + typedef optional_storage storage_base ; + + protected : + optional_mover() {} +#if (!defined BOOST_NO_CXX11_DEFAULTED_FUNCTIONS) || (!defined BOOST_NO_CXX11_NON_PUBLIC_DEFAULTED_FUNCTIONS) + optional_mover ( optional_mover const& ) = default; +#else + optional_mover ( optional_mover const& rhs ) : base( rhs ) {} +#endif + +#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES + // Creates a deep move of another optional + // Can throw if T::T(T&&) does + optional_mover ( optional_mover&& rhs ) + BOOST_NOEXCEPT_IF(::boost::is_nothrow_move_constructible::value) + { + if ( rhs.is_initialized() ) + storage_base::construct( boost::move(rhs.get_impl()) ); + } +#endif +}; + +#if (!defined BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES) && (!defined BOOST_NO_CXX11_DEFAULTED_FUNCTIONS) && (!defined BOOST_NO_CXX11_NON_PUBLIC_DEFAULTED_FUNCTIONS) +template +class optional_mover : public optional_copier +{ + protected : + optional_mover() {} + optional_mover ( optional_mover const& ) = default; + optional_mover ( optional_mover && ) = default; +}; +#endif + +template::value> +class optional_destroyer : public optional_mover +{ + typedef optional_mover base ; + typedef optional_storage storage_base ; + + protected : + optional_destroyer() {} +#if (!defined BOOST_NO_CXX11_DEFAULTED_FUNCTIONS) || (!defined BOOST_NO_CXX11_NON_PUBLIC_DEFAULTED_FUNCTIONS) + optional_destroyer ( optional_destroyer const& ) = default; +#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES + optional_destroyer ( optional_destroyer && ) = default; +#endif +#else + optional_destroyer ( optional_destroyer const& rhs ) : base( rhs ) {} +#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES + optional_destroyer ( optional_destroyer && ) : base( boost::move(rhs) ) {} +#endif +#endif - typedef aligned_storage storage_type ; - typedef optional_base this_type ; + // No-throw (assuming T::~T() doesn't) + ~optional_destroyer() { destroy() ; } + + void destroy ( ) + { + if ( storage_base::m_initialized ) + storage_base::destroy_impl() ; + } +}; + +template +class optional_destroyer : public optional_mover +{ + typedef optional_storage storage_base ; protected : + optional_destroyer() {} +#if (!defined BOOST_NO_CXX11_DEFAULTED_FUNCTIONS) && (!defined BOOST_NO_CXX11_NON_PUBLIC_DEFAULTED_FUNCTIONS) + optional_destroyer ( optional_destroyer const& ) = default; +#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES + optional_destroyer ( optional_destroyer && ) = default; +#endif +#else + optional_destroyer ( optional_destroyer const& rhs ) : base( rhs ) {} +#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES + optional_destroyer ( optional_destroyer && ) : base( boost::move(rhs) ) {} +#endif +#endif - typedef T value_type ; + void destroy ( ) { storage_base::m_initialized = false; } +}; + +template +class optional_base : public optional_destroyer +{ + typedef optional_destroyer base ; + typedef optional_storage storage_base ; protected: + typedef typename base::value_type value_type ; + typedef T & reference_type ; typedef T const& reference_const_type ; #ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES @@ -112,88 +460,72 @@ class optional_base : public optional_tag // Creates an optional uninitialized. // No-throw - optional_base() - : - m_initialized(false) {} + optional_base() {} // Creates an optional uninitialized. // No-throw - optional_base ( none_t ) - : - m_initialized(false) {} + optional_base ( none_t ) {} // Creates an optional initialized with 'val'. // Can throw if T::T(T const&) does optional_base ( argument_type val ) - : - m_initialized(false) { - construct(val); + storage_base::construct(val); } #ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES // move-construct an optional initialized from an rvalue-ref to 'val'. // Can throw if T::T(T&&) does optional_base ( rval_reference_type val ) - : - m_initialized(false) { - construct( boost::move(val) ); + storage_base::construct( boost::move(val) ); } #endif // Creates an optional initialized with 'val' IFF cond is true, otherwise creates an uninitialzed optional. // Can throw if T::T(T const&) does optional_base ( bool cond, argument_type val ) - : - m_initialized(false) { if ( cond ) - construct(val); + storage_base::construct(val); } #ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES // Creates an optional initialized with 'move(val)' IFF cond is true, otherwise creates an uninitialzed optional. // Can throw if T::T(T &&) does optional_base ( bool cond, rval_reference_type val ) - : - m_initialized(false) { if ( cond ) - construct(boost::move(val)); + storage_base::construct(boost::move(val)); } #endif // Creates a deep copy of another optional // Can throw if T::T(T const&) does +#if (!defined BOOST_NO_CXX11_DEFAULTED_FUNCTIONS) && (!defined BOOST_NO_CXX11_NON_PUBLIC_DEFAULTED_FUNCTIONS) + optional_base ( optional_base const& ) = default; +#else optional_base ( optional_base const& rhs ) : - m_initialized(false) - { - if ( rhs.is_initialized() ) - construct(rhs.get_impl()); - } + base( rhs ) {} +#endif #ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES - // Creates a deep move of another optional - // Can throw if T::T(T&&) does - optional_base ( optional_base&& rhs ) +#if (!defined BOOST_NO_CXX11_DEFAULTED_FUNCTIONS) && (!defined BOOST_NO_CXX11_NON_PUBLIC_DEFAULTED_FUNCTIONS) + optional_base ( optional_base && ) = default; +#else + optional_base ( optional_base && rhs ) : - m_initialized(false) - { - if ( rhs.is_initialized() ) - construct( boost::move(rhs.get_impl()) ); - } + base( boost::move(rhs) ) {} +#endif #endif #ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES template explicit optional_base ( Expr&& expr, PtrExpr const* tag ) - : - m_initialized(false) { - construct(boost::forward(expr),tag); + storage_base::construct(boost::forward(expr),tag); } #else @@ -202,31 +534,25 @@ class optional_base : public optional_tag // implementation (the correct 'construct()' overload) template explicit optional_base ( Expr const& expr, Expr const* tag ) - : - m_initialized(false) { - construct(expr,tag); + storage_base::construct(expr,tag); } #endif - - // No-throw (assuming T::~T() doesn't) - ~optional_base() { destroy() ; } - // Assigns from another optional (deep-copies the rhs value) void assign ( optional_base const& rhs ) { - if (is_initialized()) + if (storage_base::is_initialized()) { if ( rhs.is_initialized() ) - assign_value(rhs.get_impl()); - else destroy(); + storage_base::assign_value(rhs.get_impl()); + else base::destroy(); } else { if ( rhs.is_initialized() ) - construct(rhs.get_impl()); + storage_base::construct(rhs.get_impl()); } } @@ -234,16 +560,16 @@ class optional_base : public optional_tag // Assigns from another optional (deep-moves the rhs value) void assign ( optional_base&& rhs ) { - if (is_initialized()) + if (storage_base::is_initialized()) { if ( rhs.is_initialized() ) - assign_value( boost::move(rhs.get_impl()) ); - else destroy(); + storage_base::assign_value( boost::move(rhs.get_impl()) ); + else base::destroy(); } else { if ( rhs.is_initialized() ) - construct(boost::move(rhs.get_impl())); + storage_base::construct(boost::move(rhs.get_impl())); } } #endif @@ -252,24 +578,24 @@ class optional_base : public optional_tag template void assign ( optional const& rhs ) { - if (is_initialized()) + if (storage_base::is_initialized()) { if ( rhs.is_initialized() ) #ifndef BOOST_OPTIONAL_CONFIG_RESTORE_ASSIGNMENT_OF_NONCONVERTIBLE_TYPES - assign_value( rhs.get() ); + storage_base::assign_value( rhs.get() ); #else - assign_value( static_cast(rhs.get()) ); + storage_base::assign_value( static_cast(rhs.get()) ); #endif - else destroy(); + else base::destroy(); } else { if ( rhs.is_initialized() ) #ifndef BOOST_OPTIONAL_CONFIG_RESTORE_ASSIGNMENT_OF_NONCONVERTIBLE_TYPES - construct(rhs.get()); + storage_base::construct(rhs.get()); #else - construct(static_cast(rhs.get())); + storage_base::construct(static_cast(rhs.get())); #endif } } @@ -280,16 +606,16 @@ class optional_base : public optional_tag void assign ( optional&& rhs ) { typedef BOOST_DEDUCED_TYPENAME optional::rval_reference_type ref_type; - if (is_initialized()) + if (storage_base::is_initialized()) { if ( rhs.is_initialized() ) - assign_value( static_cast(rhs.get()) ); - else destroy(); + storage_base::assign_value( static_cast(rhs.get()) ); + else base::destroy(); } else { if ( rhs.is_initialized() ) - construct(static_cast(rhs.get())); + storage_base::construct(static_cast(rhs.get())); } } #endif @@ -297,24 +623,24 @@ class optional_base : public optional_tag // Assigns from a T (deep-copies the rhs value) void assign ( argument_type val ) { - if (is_initialized()) - assign_value(val); - else construct(val); + if (storage_base::is_initialized()) + storage_base::assign_value(val); + else storage_base::construct(val); } #ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES // Assigns from a T (deep-moves the rhs value) void assign ( rval_reference_type val ) { - if (is_initialized()) - assign_value( boost::move(val) ); - else construct( boost::move(val) ); + if (storage_base::is_initialized()) + storage_base::assign_value( boost::move(val) ); + else storage_base::construct( boost::move(val) ); } #endif // Assigns from "none", destroying the current value, if any, leaving this UNINITIALIZED // No-throw (assuming T::~T() doesn't) - void assign ( none_t ) BOOST_NOEXCEPT { destroy(); } + void assign ( none_t ) BOOST_NOEXCEPT { base::destroy(); } #ifndef BOOST_OPTIONAL_NO_INPLACE_FACTORY_SUPPORT @@ -322,17 +648,17 @@ class optional_base : public optional_tag template void assign_expr ( Expr&& expr, ExprPtr const* tag ) { - if (is_initialized()) + if (storage_base::is_initialized()) assign_expr_to_initialized(boost::forward(expr),tag); - else construct(boost::forward(expr),tag); + else storage_base::construct(boost::forward(expr),tag); } #else template void assign_expr ( Expr const& expr, Expr const* tag ) { - if (is_initialized()) + if (storage_base::is_initialized()) assign_expr_to_initialized(expr,tag); - else construct(expr,tag); + else storage_base::construct(expr,tag); } #endif @@ -342,94 +668,46 @@ class optional_base : public optional_tag // **DEPPRECATED** Destroys the current value, if any, leaving this UNINITIALIZED // No-throw (assuming T::~T() doesn't) - void reset() BOOST_NOEXCEPT { destroy(); } + void reset() BOOST_NOEXCEPT { base::destroy(); } // **DEPPRECATED** Replaces the current value -if any- with 'val' void reset ( argument_type val ) { assign(val); } - // Returns a pointer to the value if this is initialized, otherwise, - // returns NULL. - // No-throw - pointer_const_type get_ptr() const { return m_initialized ? get_ptr_impl() : 0 ; } - pointer_type get_ptr() { return m_initialized ? get_ptr_impl() : 0 ; } - - bool is_initialized() const { return m_initialized ; } - - protected : - - void construct ( argument_type val ) - { - ::new (m_storage.address()) value_type(val) ; - m_initialized = true ; - } - -#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES - void construct ( rval_reference_type val ) - { - ::new (m_storage.address()) value_type( boost::move(val) ) ; - m_initialized = true ; - } -#endif - - + protected: #if (!defined BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES) && (!defined BOOST_NO_CXX11_VARIADIC_TEMPLATES) - // Constructs in-place - // upon exception *this is always uninitialized - template - void construct ( in_place_init_t, Args&&... args ) - { - ::new (m_storage.address()) value_type( boost::forward(args)... ) ; - m_initialized = true ; - } template void emplace_assign ( Args&&... args ) { - destroy(); - construct(in_place_init, boost::forward(args)...); + base::destroy(); + storage_base::construct(in_place_init, boost::forward(args)...); } template explicit optional_base ( in_place_init_t, Args&&... args ) - : - m_initialized(false) { - construct(in_place_init, boost::forward(args)...); + storage_base::construct(in_place_init, boost::forward(args)...); } template explicit optional_base ( in_place_init_if_t, bool cond, Args&&... args ) - : - m_initialized(false) { if ( cond ) - construct(in_place_init, boost::forward(args)...); + storage_base::construct(in_place_init, boost::forward(args)...); } #elif (!defined BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES) - template - void construct ( in_place_init_t, Arg&& arg ) - { - ::new (m_storage.address()) value_type( boost::forward(arg) ); - m_initialized = true ; - } - - void construct ( in_place_init_t ) - { - ::new (m_storage.address()) value_type(); - m_initialized = true ; - } template void emplace_assign ( Arg&& arg ) { - destroy(); - construct(in_place_init, boost::forward(arg)) ; + base::destroy(); + storage_base::construct(in_place_init, boost::forward(arg)) ; } void emplace_assign () { - destroy(); - construct(in_place_init) ; + base::destroy(); + storage_base::construct(in_place_init) ; } template @@ -437,14 +715,14 @@ class optional_base : public optional_tag : m_initialized(false) { - construct(in_place_init, boost::forward(arg)); + storage_base::construct(in_place_init, boost::forward(arg)); } explicit optional_base ( in_place_init_t ) : m_initialized(false) { - construct(in_place_init); + storage_base::construct(in_place_init); } template @@ -453,7 +731,7 @@ class optional_base : public optional_tag m_initialized(false) { if ( cond ) - construct(in_place_init, boost::forward(arg)); + storage_base::construct(in_place_init, boost::forward(arg)); } explicit optional_base ( in_place_init_if_t, bool cond ) @@ -461,176 +739,105 @@ class optional_base : public optional_tag m_initialized(false) { if ( cond ) - construct(in_place_init); + storage_base::construct(in_place_init); } - #else - - template - void construct ( in_place_init_t, const Arg& arg ) - { - ::new (m_storage.address()) value_type( arg ); - m_initialized = true ; - } - - template - void construct ( in_place_init_t, Arg& arg ) - { - ::new (m_storage.address()) value_type( arg ); - m_initialized = true ; - } - - void construct ( in_place_init_t ) - { - ::new (m_storage.address()) value_type(); - m_initialized = true ; - } template void emplace_assign ( const Arg& arg ) { - destroy(); - construct(in_place_init, arg); + base::destroy(); + storage_base::construct(in_place_init, arg); } template void emplace_assign ( Arg& arg ) { - destroy(); - construct(in_place_init, arg); + base::destroy(); + storage_base::construct(in_place_init, arg); } void emplace_assign () { - destroy(); - construct(in_place_init); + base::destroy(); + storage_base::construct(in_place_init); } template explicit optional_base ( in_place_init_t, const Arg& arg ) - : m_initialized(false) { - construct(in_place_init, arg); + storage_base::construct(in_place_init, arg); } template explicit optional_base ( in_place_init_t, Arg& arg ) - : m_initialized(false) { - construct(in_place_init, arg); + storage_base::construct(in_place_init, arg); } explicit optional_base ( in_place_init_t ) - : m_initialized(false) { - construct(in_place_init); + storage_base::construct(in_place_init); } template explicit optional_base ( in_place_init_if_t, bool cond, const Arg& arg ) - : m_initialized(false) { if ( cond ) - construct(in_place_init, arg); + storage_base::construct(in_place_init, arg); } template explicit optional_base ( in_place_init_if_t, bool cond, Arg& arg ) - : m_initialized(false) { if ( cond ) - construct(in_place_init, arg); + storage_base::construct(in_place_init, arg); } explicit optional_base ( in_place_init_if_t, bool cond ) - : m_initialized(false) { if ( cond ) - construct(in_place_init); + storage_base::construct(in_place_init); } #endif #ifndef BOOST_OPTIONAL_NO_INPLACE_FACTORY_SUPPORT #ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES - // Constructs in-place using the given factory - template - void construct ( Expr&& factory, in_place_factory_base const* ) - { - boost_optional_detail::construct(factory, m_storage.address()); - m_initialized = true ; - } - - // Constructs in-place using the given typed factory - template - void construct ( Expr&& factory, typed_in_place_factory_base const* ) - { - factory.apply(m_storage.address()) ; - m_initialized = true ; - } - template void assign_expr_to_initialized ( Expr&& factory, in_place_factory_base const* tag ) { - destroy(); - construct(factory,tag); + base::destroy(); + storage_base::construct(factory,tag); } // Constructs in-place using the given typed factory template void assign_expr_to_initialized ( Expr&& factory, typed_in_place_factory_base const* tag ) { - destroy(); - construct(factory,tag); + base::destroy(); + storage_base::construct(factory,tag); } - #else - // Constructs in-place using the given factory - template - void construct ( Expr const& factory, in_place_factory_base const* ) - { - boost_optional_detail::construct(factory, m_storage.address()); - m_initialized = true ; - } - - // Constructs in-place using the given typed factory - template - void construct ( Expr const& factory, typed_in_place_factory_base const* ) - { - factory.apply(m_storage.address()) ; - m_initialized = true ; - } - template void assign_expr_to_initialized ( Expr const& factory, in_place_factory_base const* tag ) { - destroy(); - construct(factory,tag); + base::destroy(); + storage_base::construct(factory,tag); } // Constructs in-place using the given typed factory template void assign_expr_to_initialized ( Expr const& factory, typed_in_place_factory_base const* tag ) { - destroy(); - construct(factory,tag); + base::destroy(); + storage_base::construct(factory,tag); } #endif #endif #ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES - // Constructs using any expression implicitly convertible to the single argument - // of a one-argument T constructor. - // Converting constructions of optional from optional uses this function with - // 'Expr' being of type 'U' and relying on a converting constructor of T from U. - template - void construct ( Expr&& expr, void const* ) - { - new (m_storage.address()) value_type(boost::forward(expr)) ; - m_initialized = true ; - } - // Assigns using a form any expression implicitly convertible to the single argument // of a T's assignment operator. // Converting assignments of optional from optional uses this function with @@ -638,20 +845,9 @@ class optional_base : public optional_tag template void assign_expr_to_initialized ( Expr&& expr, void const* ) { - assign_value( boost::forward(expr) ); + storage_base::assign_value( boost::forward(expr) ); } #else - // Constructs using any expression implicitly convertible to the single argument - // of a one-argument T constructor. - // Converting constructions of optional from optional uses this function with - // 'Expr' being of type 'U' and relying on a converting constructor of T from U. - template - void construct ( Expr const& expr, void const* ) - { - new (m_storage.address()) value_type(expr) ; - m_initialized = true ; - } - // Assigns using a form any expression implicitly convertible to the single argument // of a T's assignment operator. // Converting assignments of optional from optional uses this function with @@ -659,80 +855,9 @@ class optional_base : public optional_tag template void assign_expr_to_initialized ( Expr const& expr, void const* ) { - assign_value(expr); - } - -#endif - -#ifdef BOOST_OPTIONAL_WEAK_OVERLOAD_RESOLUTION - // BCB5.64 (and probably lower versions) workaround. - // The in-place factories are supported by means of catch-all constructors - // and assignment operators (the functions are parameterized in terms of - // an arbitrary 'Expr' type) - // This compiler incorrectly resolves the overload set and sinks optional and optional - // to the 'Expr'-taking functions even though explicit overloads are present for them. - // Thus, the following overload is needed to properly handle the case when the 'lhs' - // is another optional. - // - // For VC<=70 compilers this workaround dosen't work becasue the comnpiler issues and error - // instead of choosing the wrong overload - // -#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES - // Notice that 'Expr' will be optional or optional (but not optional_base<..>) - template - void construct ( Expr&& expr, optional_tag const* ) - { - if ( expr.is_initialized() ) - { - // An exception can be thrown here. - // It it happens, THIS will be left uninitialized. - new (m_storage.address()) value_type(boost::move(expr.get())) ; - m_initialized = true ; - } - } -#else - // Notice that 'Expr' will be optional or optional (but not optional_base<..>) - template - void construct ( Expr const& expr, optional_tag const* ) - { - if ( expr.is_initialized() ) - { - // An exception can be thrown here. - // It it happens, THIS will be left uninitialized. - new (m_storage.address()) value_type(expr.get()) ; - m_initialized = true ; - } + storage_base::assign_value(expr); } #endif -#endif // defined BOOST_OPTIONAL_WEAK_OVERLOAD_RESOLUTION - - void assign_value ( argument_type val ) { get_impl() = val; } -#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES - void assign_value ( rval_reference_type val ) { get_impl() = static_cast(val); } -#endif - - void destroy() - { - if ( m_initialized ) - destroy_impl() ; - } - - reference_const_type get_impl() const { return m_storage.ref() ; } - reference_type get_impl() { return m_storage.ref() ; } - - pointer_const_type get_ptr_impl() const { return m_storage.ptr_ref(); } - pointer_type get_ptr_impl() { return m_storage.ptr_ref(); } - - private : - -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1600) - void destroy_impl ( ) { m_storage.ptr_ref()->~T() ; m_initialized = false ; } -#else - void destroy_impl ( ) { m_storage.ref().T::~T() ; m_initialized = false ; } -#endif - - bool m_initialized ; - storage_type m_storage ; } ; // definition of metafunciton is_optional_val_init_candidate @@ -893,16 +1018,27 @@ class optional : public optional_detail::optional_base // Creates a deep copy of another optional // Can throw if T::T(T const&) does +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + optional ( optional const& rhs ) = default; +#else optional ( optional const& rhs ) : base( static_cast(rhs) ) {} +#endif #ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES // Creates a deep move of another optional // Can throw if T::T(T&&) does +#ifndef BOOST_NO_CXX11_DEFAULTED_FUNCTIONS + optional ( optional && rhs ) + BOOST_NOEXCEPT_IF(::boost::is_nothrow_move_constructible::value) + = default; +#else + // Creates a deep move of another optional + // Can throw if T::T(T&&) does optional ( optional && rhs ) BOOST_NOEXCEPT_IF(::boost::is_nothrow_move_constructible::value) : base( boost::move(rhs) ) {} - +#endif #endif #if BOOST_WORKAROUND(_MSC_VER, <= 1600) diff --git a/test/Jamfile.v2 b/test/Jamfile.v2 index d081abcb..06ef7ae0 100644 --- a/test/Jamfile.v2 +++ b/test/Jamfile.v2 @@ -44,6 +44,7 @@ import testing ; [ run optional_test_minimum_requirements.cpp ] [ run optional_test_msvc_bug_workaround.cpp ] [ compile optional_test_sfinae_friendly_ctor.cpp ] + [ compile optional_test_trivial.cpp ] [ compile-fail optional_test_ref_convert_assign_const_int_prevented.cpp ] [ compile-fail optional_test_fail1.cpp ] [ compile-fail optional_test_fail3a.cpp ] diff --git a/test/optional_test_trivial.cpp b/test/optional_test_trivial.cpp new file mode 100644 index 00000000..62ad5241 --- /dev/null +++ b/test/optional_test_trivial.cpp @@ -0,0 +1,75 @@ +// Copyright (C) 2017 Alexander Hirsch. +// +// Use, modification, and distribution is subject to the Boost Software +// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at +// http://www.boost.org/LICENSE_1_0.txt) +// +// See http://www.boost.org/lib/optional for documentation. +// +// You are welcome to contact the author at: +// 1zeeky@gmail.com + + +#include "boost/optional/optional.hpp" + +#ifdef __BORLANDC__ +#pragma hdrstop +#endif + +#include "boost/static_assert.hpp" +#include "boost/core/lightweight_test.hpp" +#include "boost/type_traits/has_trivial_copy.hpp" +#include "boost/type_traits/has_trivial_destructor.hpp" +#include "boost/type_traits/has_trivial_move_constructor.hpp" + +struct Foo +{ +}; + +struct NDFoo +{ + NDFoo(const NDFoo&) = default; +#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES + NDFoo(NDFoo&&) = default; +#endif + ~NDFoo() { ; } +}; + +struct NCFoo +{ + NCFoo(const NCFoo&) { ; } +#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES + NCFoo(NCFoo&&) = default; +#endif + ~NCFoo() = default; +}; + +#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES +struct NMFoo +{ + NMFoo(const NMFoo&) = default; + NMFoo(NMFoo&&) { ; } + ~NMFoo() = default; +}; +#endif + +template +void test() +{ + using optional = boost::optional; + BOOST_STATIC_ASSERT(boost::has_trivial_destructor::value == boost::has_trivial_destructor::value); + BOOST_STATIC_ASSERT(boost::has_trivial_copy::value == boost::has_trivial_copy::value); +#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES + BOOST_STATIC_ASSERT(boost::has_trivial_move_constructor::value == boost::has_trivial_move_constructor::value); +#endif +} + +int main() +{ + test(); + test(); + test(); +#ifndef BOOST_OPTIONAL_DETAIL_NO_RVALUE_REFERENCES + test(); +#endif +}