mirror of
https://github.com/boostorg/config.git
synced 2025-07-30 04:17:16 +02:00
Merge pull request #320 from boostorg/issue_305
Add helper macro BOOST_IF_CONSTEXPR.
This commit is contained in:
@ -978,6 +978,7 @@ provide compliant C++17 support.
|
||||
[table
|
||||
[[Macro ][ Description ]]
|
||||
[[`BOOST_INLINE_VARIABLE`][This macro expands to `inline` on compilers that support C++17 inline variables and to nothing otherwise. Users may need to check for `BOOST_NO_CXX17_INLINE_VARIABLES` for further adjustments to the code.]]
|
||||
[[`BOOST_IF_CONSTEXPR`][Expands to `if constexpr` when supported, or `if` otherwise.]]
|
||||
[[`BOOST_INLINE_CONSTEXPR`][This is a shortcut for `BOOST_INLINE_VARIABLE BOOST_CONSTEXPR_OR_CONST`.]]
|
||||
]
|
||||
|
||||
|
@ -1002,6 +1002,14 @@ namespace std{ using ::type_info; }
|
||||
#else
|
||||
#define BOOST_INLINE_VARIABLE
|
||||
#endif
|
||||
//
|
||||
// C++17 if constexpr
|
||||
//
|
||||
#if !defined(BOOST_NO_CXX17_IF_CONSTEXPR)
|
||||
# define BOOST_IF_CONSTEXPR if constexpr
|
||||
#else
|
||||
# define BOOST_IF_CONSTEXPR if
|
||||
#endif
|
||||
|
||||
#define BOOST_INLINE_CONSTEXPR BOOST_INLINE_VARIABLE BOOST_CONSTEXPR_OR_CONST
|
||||
|
||||
|
@ -51,6 +51,12 @@ struct no_unique
|
||||
BOOST_ATTRIBUTE_NO_UNIQUE_ADDRESS empty b;
|
||||
};
|
||||
|
||||
template <bool b>
|
||||
struct trait
|
||||
{
|
||||
enum { value = b };
|
||||
};
|
||||
|
||||
|
||||
int main()
|
||||
{
|
||||
@ -66,6 +72,11 @@ int main()
|
||||
always_throw();
|
||||
nodiscard_struct s;
|
||||
no_unique no_un;
|
||||
|
||||
BOOST_IF_CONSTEXPR(trait<true>::value)
|
||||
{
|
||||
result += 2;
|
||||
}
|
||||
}
|
||||
catch(int)
|
||||
{
|
||||
|
Reference in New Issue
Block a user