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

Merge branch 'develop'

Browse Source 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
This commit is contained in:
jzmaddock
2016-12-03 18:09:18 +00:00
parent c45ac74369
commit 8f9f27336c
5 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
checks/Jamfile.v2
View File

@@ -9,7 +9,7 @@
import modules ; import modules ;
import path ; import path ;
import testing ;
rule run-simple ( requirements * : target-name ) rule run-simple ( requirements * : target-name )
{ {

1
checks/architecture/.gitignore vendored Normal file
View File

@@ -0,0 +1 @@
bin

2
include/boost/config/compiler/sunpro_cc.hpp
View File

@@ -152,7 +152,7 @@
#if !defined(__cpp_constexpr) || (__cpp_constexpr < 201304) #if !defined(__cpp_constexpr) || (__cpp_constexpr < 201304)
# define BOOST_NO_CXX14_CONSTEXPR # define BOOST_NO_CXX14_CONSTEXPR
#endif #endif
#if !defined(__cpp_decltype_auto) || (__cpp_decltype_auto < 201304) #if !defined(__cpp_decltype_auto) || (__cpp_decltype_auto < 201304) || (__cplusplus < 201402L)
# define BOOST_NO_CXX14_DECLTYPE_AUTO # define BOOST_NO_CXX14_DECLTYPE_AUTO
#endif #endif
#if (__cplusplus < 201304) // There's no SD6 check for this.... #if (__cplusplus < 201304) // There's no SD6 check for this....

19
include/boost/config/compiler/visualc.hpp
View File

@@ -190,6 +190,13 @@
# define BOOST_NO_CXX11_CONSTEXPR # define BOOST_NO_CXX11_CONSTEXPR
#endif #endif
// C++14 features supported by VC++ 15 Preview 5
//
#if (_MSC_VER < 1910)
# define BOOST_NO_CXX14_AGGREGATE_NSDMI
# define BOOST_NO_CXX14_CONSTEXPR
#endif
// MSVC including version 14 has not yet completely // MSVC including version 14 has not yet completely
// implemented value-initialization, as is reported: // implemented value-initialization, as is reported:
// "VC++ does not value-initialize members of derived classes without // "VC++ does not value-initialize members of derived classes without
@@ -210,14 +217,6 @@
// C++ 11: // C++ 11:
// //
#define BOOST_NO_TWO_PHASE_NAME_LOOKUP #define BOOST_NO_TWO_PHASE_NAME_LOOKUP
//
// C++ 14:
#if !defined(__cpp_aggregate_nsdmi) || (__cpp_aggregate_nsdmi < 201304)
# define BOOST_NO_CXX14_AGGREGATE_NSDMI
#endif
#if !defined(__cpp_constexpr) || (__cpp_constexpr < 201304)
# define BOOST_NO_CXX14_CONSTEXPR
#endif
// //
// prefix and suffix headers: // prefix and suffix headers:
@@ -294,8 +293,8 @@
#endif #endif
// //
// last known and checked version is 19.00.23026 (VC++ 2015 RTM): // last known and checked version is 19.10.24629 (VC++ 2017 RC):
#if (_MSC_VER > 1900) #if (_MSC_VER > 1910)
# if defined(BOOST_ASSERT_CONFIG) # if defined(BOOST_ASSERT_CONFIG)
# error "Unknown compiler version - please run the configure tests and report the results" # error "Unknown compiler version - please run the configure tests and report the results"
# else # else

5
include/boost/config/stdlib/libcpp.hpp
View File

@@ -73,8 +73,11 @@
#if _LIBCPP_VERSION < 3700 #if _LIBCPP_VERSION < 3700
// libc++ uses a non-standard messages_base // libc++ uses a non-standard messages_base
#define BOOST_NO_STD_MESSAGES #define BOOST_NO_STD_MESSAGES
#endif
// C++17 features // C++17 features
#define BOOST_NO_CXX17_STD_INVOKE #if (_LIBCPP_VERSION < 3700) || (__cplusplus <= 201402L)
# define BOOST_NO_CXX17_STD_INVOKE
#endif #endif
#if (_LIBCPP_VERSION <= 1101) && !defined(BOOST_NO_CXX11_THREAD_LOCAL) #if (_LIBCPP_VERSION <= 1101) && !defined(BOOST_NO_CXX11_THREAD_LOCAL)