diff --git a/boostify/include/boost/outcome/config.hpp b/boostify/include/boost/outcome/config.hpp index 8fd746f2f49..66494d120bb 100644 --- a/boostify/include/boost/outcome/config.hpp +++ b/boostify/include/boost/outcome/config.hpp @@ -63,15 +63,16 @@ Distributed under the Boost Software License, Version 1.0. #define BOOST_OUTCOME_NODISCARD __attribute__((warn_unused_result)) #elif defined(_MSC_VER) // _Must_inspect_result_ expands into this -#define BOOST_OUTCOME_NODISCARD \ - __declspec("SAL_name" \ - "(" \ - "\"_Must_inspect_result_\"" \ - "," \ - "\"\"" \ - "," \ - "\"2\"" \ - ")") __declspec("SAL_begin") __declspec("SAL_post") __declspec("SAL_mustInspect") __declspec("SAL_post") __declspec("SAL_checkReturn") __declspec("SAL_end") +#define BOOST_OUTCOME_NODISCARD \ + __declspec( \ + "SAL_name" \ + "(" \ + "\"_Must_inspect_result_\"" \ + "," \ + "\"\"" \ + "," \ + "\"2\"" \ + ")") __declspec("SAL_begin") __declspec("SAL_post") __declspec("SAL_mustInspect") __declspec("SAL_post") __declspec("SAL_checkReturn") __declspec("SAL_end") #endif #endif #ifndef BOOST_OUTCOME_NODISCARD @@ -124,34 +125,34 @@ namespace boost } } /*! The namespace of this Boost.Outcome v2. -*/ + */ #define BOOST_OUTCOME_V2_NAMESPACE boost::outcome_v2 /*! Expands into the appropriate namespace markup to enter the Boost.Outcome v2 namespace. -*/ -#define BOOST_OUTCOME_V2_NAMESPACE_BEGIN \ - namespace boost \ - { \ - namespace outcome_v2 \ + */ +#define BOOST_OUTCOME_V2_NAMESPACE_BEGIN \ + namespace boost \ + { \ + namespace outcome_v2 \ { /*! Expands into the appropriate namespace markup to enter the C++ module exported Boost.Outcome v2 namespace. */ -#define BOOST_OUTCOME_V2_NAMESPACE_EXPORT_BEGIN \ - namespace boost \ - { \ - namespace outcome_v2 \ +#define BOOST_OUTCOME_V2_NAMESPACE_EXPORT_BEGIN \ + namespace boost \ + { \ + namespace outcome_v2 \ { /*! \brief Expands into the appropriate namespace markup to exit the Boost.Outcome v2 namespace. \ingroup config */ -#define BOOST_OUTCOME_V2_NAMESPACE_END \ - } \ +#define BOOST_OUTCOME_V2_NAMESPACE_END \ + } \ } #include // for uint32_t etc #include -#include // for future serialisation -#include // for placement in moves etc +#include // for future serialisation +#include // for placement in moves etc #include #ifndef BOOST_OUTCOME_USE_STD_IN_PLACE_TYPE @@ -192,6 +193,13 @@ template constexpr in_place_type_t in_place_type{}; BOOST_OUTCOME_V2_NAMESPACE_END #endif +#if BOOST_OUTCOME_USE_STD_ADDRESSOF +#include // for std::addressof +#define BOOST_OUTCOME_USE_STD_ADDRESSOF(...) std::addressof(__VA_ARGS__) +#else +#define BOOST_OUTCOME_USE_STD_ADDRESSOF(...) (&__VA_ARGS__) +#endif + #ifndef BOOST_OUTCOME_TRIVIAL_ABI #if defined(STANDARDESE_IS_IN_THE_HOUSE) || __clang_major__ >= 7 //! Defined to be `[[clang::trivial_abi]]` when on a new enough clang compiler. Usually automatic, can be overriden. diff --git a/include/outcome/detail/revision.hpp b/include/outcome/detail/revision.hpp index 0dd61bf2562..a8e5c1ab2cf 100644 --- a/include/outcome/detail/revision.hpp +++ b/include/outcome/detail/revision.hpp @@ -22,6 +22,6 @@ Distributed under the Boost Software License, Version 1.0. */ // Note the second line of this file must ALWAYS be the git SHA, third line ALWAYS the git SHA update time -#define OUTCOME_PREVIOUS_COMMIT_REF 0bedf671c04467d66219454bd9a61d0bfbb99242 -#define OUTCOME_PREVIOUS_COMMIT_DATE "2023-07-20 08:20:32 +00:00" -#define OUTCOME_PREVIOUS_COMMIT_UNIQUE 0bedf671 +#define OUTCOME_PREVIOUS_COMMIT_REF d45173e172a9884022ec5795e7f9fc9096d4edd2 +#define OUTCOME_PREVIOUS_COMMIT_DATE "2023-07-20 08:44:04 +00:00" +#define OUTCOME_PREVIOUS_COMMIT_UNIQUE d45173e1