Merge branch 'inline_variable' of https://github.com/Lastique/config into develop

Fixed Conflicts:
	doc/macro_reference.qbk
This commit is contained in:
jzmaddock committed 2019-10-29 16:56:11 +00:00
commit c85145a2a8
3 files changed
+28 -3

No files matched your search

+16 -2
View File
@@ -940,7 +940,7 @@ provide compliant C++14 support.
[table
[[Macro ][ Description ]]
[[`BOOST_CXX14_CONSTEXPR`][This macro works similar to BOOST_CONSTEXPR, but expands to `constexpr` only if the C++14 "relaxed" `constexpr` is available.]]
[[`BOOST_CXX14_CONSTEXPR`][This macro works similar to `BOOST_CONSTEXPR`, but expands to `constexpr` only if the C++14 "relaxed" `constexpr` is available.]]
]
[endsect]
@@ -959,7 +959,21 @@ that are not yet supported by a particular compiler or library.
[[`BOOST_NO_CXX17_STD_INVOKE`][The compiler does not support `std::invoke()`.]]
[[`BOOST_NO_CXX17_ITERATOR_TRAITS`][The compiler does not support SFINAE-friendly `std::iterator_traits`.]]
[[`BOOST_NO_CXX17_IF_CONSTEXPR`][The compiler does not support `if constexpr`.]]
[[`BOOST_NO_CXX17_INLINE_VARIABLES`][The compiler does not support C++17 inline variables.]]
[[`BOOST_NO_CXX17_INLINE_VARIABLES`][The compiler does not support `inline` variables.]]
]
[endsect]
[#config_17_for_14]
[section Macros that allow use of C++17 features with C++14 or earlier compilers]
The following macros allow use of C++17 features even with compilers that do not yet
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.]]
]
[endsect]