Skip to content

Commit e9dfed4

Browse files
committed
Upgrade to boost version 1.71.0
1 parent 02f5335 commit e9dfed4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+409
-241
lines changed

cpp/BoostParts/boost/config/auto_link.hpp

+7-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,8 @@ BOOST_LIB_VERSION: The Boost version, in the form x_y, for Boost version x.y.
9999
#if defined(BOOST_MSVC) \
100100
|| defined(__BORLANDC__) \
101101
|| (defined(__MWERKS__) && defined(_WIN32) && (__MWERKS__ >= 0x3000)) \
102-
|| (defined(__ICL) && defined(_MSC_EXTENSIONS) && (_MSC_VER >= 1200))
102+
|| (defined(__ICL) && defined(_MSC_EXTENSIONS) && (_MSC_VER >= 1200)) \
103+
|| (defined(BOOST_CLANG) && defined(BOOST_WINDOWS) && defined(_MSC_VER) && (__clang_major__ >= 4))
103104

104105
#ifndef BOOST_VERSION_HPP
105106
# include <boost/version.hpp>
@@ -203,6 +204,11 @@ BOOST_LIB_VERSION: The Boost version, in the form x_y, for Boost version x.y.
203204
// Metrowerks CodeWarrior 9.x
204205
# define BOOST_LIB_TOOLSET "cw9"
205206

207+
# elif defined(BOOST_CLANG) && defined(BOOST_WINDOWS) && defined(_MSC_VER) && (__clang_major__ >= 4)
208+
209+
// Clang on Windows
210+
# define BOOST_LIB_TOOLSET "clangw" BOOST_STRINGIZE(__clang_major__)
211+
206212
# endif
207213
#endif // BOOST_LIB_TOOLSET
208214

cpp/BoostParts/boost/config/compiler/gcc.hpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -309,8 +309,8 @@
309309
# define BOOST_FALLTHROUGH __attribute__((fallthrough))
310310
#endif
311311

312-
#ifdef __MINGW32__
313-
// Currently (June 2017) thread_local is broken on mingw for all current compiler releases, see
312+
#if defined(__MINGW32__) && !defined(__MINGW64__)
313+
// Currently (March 2019) thread_local is broken on mingw for all current 32bit compiler releases, see
314314
// https://sourceforge.net/p/mingw-w64/bugs/527/
315315
// Not setting this causes program termination on thread exit.
316316
#define BOOST_NO_CXX11_THREAD_LOCAL
@@ -327,7 +327,7 @@
327327

328328
//
329329
// __builtin_unreachable:
330-
#if BOOST_GCC_VERSION >= 40800
330+
#if BOOST_GCC_VERSION >= 40500
331331
#define BOOST_UNREACHABLE_RETURN(x) __builtin_unreachable();
332332
#endif
333333

cpp/BoostParts/boost/config/compiler/visualc.hpp

+11-5
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@
4343
# error "Compiler not supported or configured - please reconfigure"
4444
#endif
4545

46+
// VS2005 (VC8) docs: __assume has been in Visual C++ for multiple releases
47+
#define BOOST_UNREACHABLE_RETURN(x) __assume(0);
48+
4649
#if _MSC_FULL_VER < 180020827
4750
# define BOOST_NO_FENV_H
4851
#endif
@@ -202,8 +205,9 @@
202205
#if (_MSC_VER < 1911) || (_MSVC_LANG < 201703)
203206
# define BOOST_NO_CXX17_STRUCTURED_BINDINGS
204207
# define BOOST_NO_CXX17_IF_CONSTEXPR
205-
# define BOOST_NO_CXX17_HDR_OPTIONAL
206-
# define BOOST_NO_CXX17_HDR_STRING_VIEW
208+
// Let the defaults handle these now:
209+
//# define BOOST_NO_CXX17_HDR_OPTIONAL
210+
//# define BOOST_NO_CXX17_HDR_STRING_VIEW
207211
#endif
208212

209213
// MSVC including version 14 has not yet completely
@@ -313,7 +317,7 @@
313317
# endif
314318
# else
315319
# if _MSC_VER < 1200
316-
// Note: Versions up to 7.0 aren't supported.
320+
// Note: Versions up to 10.0 aren't supported.
317321
# define BOOST_COMPILER_VERSION 5.0
318322
# elif _MSC_VER < 1300
319323
# define BOOST_COMPILER_VERSION 6.0
@@ -335,6 +339,8 @@
335339
# define BOOST_COMPILER_VERSION 14.0
336340
# elif _MSC_VER < 1920
337341
# define BOOST_COMPILER_VERSION 14.1
342+
# elif _MSC_VER < 1930
343+
# define BOOST_COMPILER_VERSION 14.2
338344
# else
339345
# define BOOST_COMPILER_VERSION _MSC_VER
340346
# endif
@@ -346,8 +352,8 @@
346352
#include <boost/config/pragma_message.hpp>
347353

348354
//
349-
// last known and checked version is 19.12.25830.2 (VC++ 2017.3):
350-
#if (_MSC_VER > 1912)
355+
// last known and checked version is 19.20.27508 (VC++ 2019 RC3):
356+
#if (_MSC_VER > 1920)
351357
# if defined(BOOST_ASSERT_CONFIG)
352358
# error "Boost.Config is older than your current compiler version."
353359
# elif !defined(BOOST_CONFIG_SUPPRESS_OUTDATED_MESSAGE)

cpp/BoostParts/boost/config/detail/suffix.hpp

+21
Original file line numberDiff line numberDiff line change
@@ -992,6 +992,23 @@ namespace std{ using ::type_info; }
992992
#ifndef BOOST_ATTRIBUTE_UNUSED
993993
# define BOOST_ATTRIBUTE_UNUSED
994994
#endif
995+
//
996+
// [[nodiscard]]:
997+
//
998+
#ifdef __has_cpp_attribute
999+
#if __has_cpp_attribute(nodiscard)
1000+
# define BOOST_ATTRIBUTE_NODISCARD [[nodiscard]]
1001+
#endif
1002+
#if __has_cpp_attribute(no_unique_address) && !(defined(__GNUC__) && (__cplusplus < 201100))
1003+
# define BOOST_ATTRIBUTE_NO_UNIQUE_ADDRESS [[no_unique_address]]
1004+
#endif
1005+
#endif
1006+
#ifndef BOOST_ATTRIBUTE_NODISCARD
1007+
# define BOOST_ATTRIBUTE_NODISCARD
1008+
#endif
1009+
#ifndef BOOST_ATTRIBUTE_NO_UNIQUE_ADDRESS
1010+
# define BOOST_ATTRIBUTE_NO_UNIQUE_ADDRESS
1011+
#endif
9951012

9961013
#define BOOST_STATIC_CONSTEXPR static BOOST_CONSTEXPR_OR_CONST
9971014

@@ -1027,13 +1044,17 @@ namespace std{ using ::type_info; }
10271044
#if !defined(__has_include)
10281045
# define BOOST_NO_CXX17_HDR_OPTIONAL
10291046
# define BOOST_NO_CXX17_HDR_STRING_VIEW
1047+
# define BOOST_NO_CXX17_HDR_VARIANT
10301048
#else
10311049
#if !__has_include(<optional>)
10321050
# define BOOST_NO_CXX17_HDR_OPTIONAL
10331051
#endif
10341052
#if !__has_include(<string_view>)
10351053
# define BOOST_NO_CXX17_HDR_STRING_VIEW
10361054
#endif
1055+
#if !__has_include(<variant>)
1056+
# define BOOST_NO_CXX17_HDR_VARIANT
1057+
#endif
10371058
#endif
10381059

10391060
//

0 commit comments

Comments
 (0)