From d7bb39764b243a299cd75d85da6774df8a7aefd0 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Fri, 7 Oct 2016 23:07:33 -0500 Subject: [PATCH 1/5] Add, and update, documentation build targets. --- doc/Jamfile.v2 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2 index 1f7056bd..176a5a71 100644 --- a/doc/Jamfile.v2 +++ b/doc/Jamfile.v2 @@ -59,4 +59,8 @@ boostbook standalone install pdfinstall : standalone/pdf : . PDF ; explicit pdfinstall ; - +############################################################################### +alias boostdoc ; +explicit boostdoc ; +alias boostrelease : standalone ; +explicit boostrelease ; From 8f9f27336cb59454530d8f2d85761c6e825146f9 Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Sat, 3 Dec 2016 18:09:18 +0000 Subject: [PATCH 2/5] Merge branch 'develop' # 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. --- checks/Jamfile.v2 | 2 +- checks/architecture/.gitignore | 1 + include/boost/config/compiler/sunpro_cc.hpp | 2 +- include/boost/config/compiler/visualc.hpp | 19 +++++++++---------- include/boost/config/stdlib/libcpp.hpp | 5 ++++- 5 files changed, 16 insertions(+), 13 deletions(-) create mode 100644 checks/architecture/.gitignore diff --git a/checks/Jamfile.v2 b/checks/Jamfile.v2 index 1b5e2fd9..fc74ed39 100644 --- a/checks/Jamfile.v2 +++ b/checks/Jamfile.v2 @@ -9,7 +9,7 @@ import modules ; import path ; - +import testing ; rule run-simple ( requirements * : target-name ) { diff --git a/checks/architecture/.gitignore b/checks/architecture/.gitignore new file mode 100644 index 00000000..ba077a40 --- /dev/null +++ b/checks/architecture/.gitignore @@ -0,0 +1 @@ +bin diff --git a/include/boost/config/compiler/sunpro_cc.hpp b/include/boost/config/compiler/sunpro_cc.hpp index 8f07e0e9..ac259fce 100644 --- a/include/boost/config/compiler/sunpro_cc.hpp +++ b/include/boost/config/compiler/sunpro_cc.hpp @@ -152,7 +152,7 @@ #if !defined(__cpp_constexpr) || (__cpp_constexpr < 201304) # define BOOST_NO_CXX14_CONSTEXPR #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 #endif #if (__cplusplus < 201304) // There's no SD6 check for this.... diff --git a/include/boost/config/compiler/visualc.hpp b/include/boost/config/compiler/visualc.hpp index 72caff49..cdbc9b67 100644 --- a/include/boost/config/compiler/visualc.hpp +++ b/include/boost/config/compiler/visualc.hpp @@ -190,6 +190,13 @@ # define BOOST_NO_CXX11_CONSTEXPR #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 // implemented value-initialization, as is reported: // "VC++ does not value-initialize members of derived classes without @@ -210,14 +217,6 @@ // C++ 11: // #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: @@ -294,8 +293,8 @@ #endif // -// last known and checked version is 19.00.23026 (VC++ 2015 RTM): -#if (_MSC_VER > 1900) +// last known and checked version is 19.10.24629 (VC++ 2017 RC): +#if (_MSC_VER > 1910) # if defined(BOOST_ASSERT_CONFIG) # error "Unknown compiler version - please run the configure tests and report the results" # else diff --git a/include/boost/config/stdlib/libcpp.hpp b/include/boost/config/stdlib/libcpp.hpp index 96cf57c3..21eafe89 100644 --- a/include/boost/config/stdlib/libcpp.hpp +++ b/include/boost/config/stdlib/libcpp.hpp @@ -73,8 +73,11 @@ #if _LIBCPP_VERSION < 3700 // libc++ uses a non-standard messages_base #define BOOST_NO_STD_MESSAGES +#endif + // C++17 features -#define BOOST_NO_CXX17_STD_INVOKE +#if (_LIBCPP_VERSION < 3700) || (__cplusplus <= 201402L) +# define BOOST_NO_CXX17_STD_INVOKE #endif #if (_LIBCPP_VERSION <= 1101) && !defined(BOOST_NO_CXX11_THREAD_LOCAL) From b16f6e16982ec2dcd843cb194278b05063b1412b Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Mon, 13 Mar 2017 18:58:28 +0000 Subject: [PATCH 3/5] Fix library name for VC14.1 (Visual Studio 2017) --- include/boost/config/auto_link.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/boost/config/auto_link.hpp b/include/boost/config/auto_link.hpp index d4f3eabf..c71e8035 100644 --- a/include/boost/config/auto_link.hpp +++ b/include/boost/config/auto_link.hpp @@ -166,10 +166,10 @@ BOOST_LIB_VERSION: The Boost version, in the form x_y, for Boost version x.y. // vc14: # define BOOST_LIB_TOOLSET "vc140" -# elif defined(BOOST_MSVC) +# elif defined(BOOST_MSVC) - // vc15: -# define BOOST_LIB_TOOLSET "vc150" + // vc14.1: +# define BOOST_LIB_TOOLSET "vc141" # elif defined(__BORLANDC__) From a12301d1cb4d050dfbd5dea93f68491b82921ec4 Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Mon, 13 Mar 2017 18:59:09 +0000 Subject: [PATCH 4/5] Update compiler version names in visualc.hpp --- include/boost/config/compiler/visualc.hpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/include/boost/config/compiler/visualc.hpp b/include/boost/config/compiler/visualc.hpp index 24a88d5c..760e2833 100644 --- a/include/boost/config/compiler/visualc.hpp +++ b/include/boost/config/compiler/visualc.hpp @@ -190,7 +190,7 @@ # define BOOST_NO_CXX11_CONSTEXPR #endif -// C++14 features supported by VC++ 15 Preview 5 +// C++14 features supported by VC++ 14.1 (Visual Studio 2017) // #if (_MSC_VER < 1910) # define BOOST_NO_CXX14_AGGREGATE_NSDMI @@ -303,8 +303,10 @@ # define BOOST_COMPILER_VERSION 11.0 # elif _MSC_VER < 1900 # define BOOST_COMPILER_VERSION 12.0 -# elif _MSC_VER < 2000 +# elif _MSC_VER < 1910 # define BOOST_COMPILER_VERSION 14.0 +# elif _MSC_VER < 1920 +# define BOOST_COMPILER_VERSION 14.1 # else # define BOOST_COMPILER_VERSION _MSC_VER # endif @@ -314,7 +316,7 @@ #endif // -// last known and checked version is 19.10.24629 (VC++ 2017 RC): +// last known and checked version is 19.10.25017 (VC++ 2017): #if (_MSC_VER > 1910) # if defined(BOOST_ASSERT_CONFIG) # error "Unknown compiler version - please run the configure tests and report the results" From cb2216eaff687f94e6d20687cbc817236b9df7f8 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 23 Apr 2017 22:11:56 -0500 Subject: [PATCH 5/5] Bump to 1.65.0. --- include/boost/version.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/boost/version.hpp b/include/boost/version.hpp index 03b33f9a..725165f4 100644 --- a/include/boost/version.hpp +++ b/include/boost/version.hpp @@ -19,7 +19,7 @@ // BOOST_VERSION / 100 % 1000 is the minor version // BOOST_VERSION / 100000 is the major version -#define BOOST_VERSION 106400 +#define BOOST_VERSION 106500 // // BOOST_LIB_VERSION must be defined to be the same as BOOST_VERSION @@ -27,6 +27,6 @@ // number, y is the minor version number, and z is the patch level if not 0. // This is used by to select which library version to link to. -#define BOOST_LIB_VERSION "1_64" +#define BOOST_LIB_VERSION "1_65" #endif