boostorg/config
1
0
Fork 1
mirror of https://github.com/boostorg/config.git synced 2025-08-02 13:54:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into issue_305

Browse Source
This commit is contained in:
jzmaddock
2020-01-25 09:35:15 +00:00
committed by GitHub
parent 9aaa4edda1 aab566f9b9
commit b54214277f
3 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/macro_reference.qbk
View File

@@ -979,6 +979,7 @@ provide compliant C++17 support.
[[Macro ][ Description ]] [[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_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_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`.]]
] ]
[endsect] [endsect]

2
include/boost/config/detail/suffix.hpp
View File

@@ -1011,6 +1011,8 @@ namespace std{ using ::type_info; }
# define BOOST_IF_CONSTEXPR if # define BOOST_IF_CONSTEXPR if
#endif #endif
#define BOOST_INLINE_CONSTEXPR BOOST_INLINE_VARIABLE BOOST_CONSTEXPR_OR_CONST
// //
// Unused variable/typedef workarounds: // Unused variable/typedef workarounds:
// //

2
include/boost/config/stdlib/dinkumware.hpp
View File

@@ -86,6 +86,7 @@
# define BOOST_NO_STD_LOCALE # define BOOST_NO_STD_LOCALE
#endif #endif
#if BOOST_MSVC < 1800
// Fix for VC++ 8.0 on up ( I do not have a previous version to test ) // Fix for VC++ 8.0 on up ( I do not have a previous version to test )
// or clang-cl. If exceptions are off you must manually include the // or clang-cl. If exceptions are off you must manually include the
// <exception> header before including the <typeinfo> header. Admittedly // <exception> header before including the <typeinfo> header. Admittedly
@@ -100,6 +101,7 @@
&& !defined(__VXWORKS__) && !defined(__VXWORKS__)
# define BOOST_NO_STD_TYPEINFO # define BOOST_NO_STD_TYPEINFO
#endif #endif
#endif
// C++0x headers implemented in 520 (as shipped by Microsoft) // C++0x headers implemented in 520 (as shipped by Microsoft)
// //