Skip to content

Commit

Permalink
Fix broken Boost build.
Browse files Browse the repository at this point in the history
  • Loading branch information
@ned14
ned14 committed Jul 20, 2023
1 parent d45173e commit 29c6aa0
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 26 deletions.
54 changes: 31 additions & 23 deletions boostify/include/boost/outcome/config.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 <cstdint> // for uint32_t etc
#include <initializer_list>
#include <iosfwd> // for future serialisation
#include <new> // for placement in moves etc
#include <iosfwd> // for future serialisation
#include <new> // for placement in moves etc
#include <type_traits>

#ifndef BOOST_OUTCOME_USE_STD_IN_PLACE_TYPE
Expand Down Expand Up @@ -192,6 +193,13 @@ template <class T> constexpr in_place_type_t<T> in_place_type{};
BOOST_OUTCOME_V2_NAMESPACE_END
#endif

#if BOOST_OUTCOME_USE_STD_ADDRESSOF
#include <memory> // 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.
Expand Down
6 changes: 3 additions & 3 deletions include/outcome/detail/revision.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 29c6aa0

Please sign in to comment.