Skip to content

Commit 0a9d7a1

Browse files
committed
Fix for TBB failure and add license [standalone]
1 parent 16a91de commit 0a9d7a1

File tree

5 files changed

+32
-2
lines changed

5 files changed

+32
-2
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ jobs:
334334
run: cp -r $GITHUB_WORKSPACE/* libs/math
335335
working-directory: ../boost-root
336336
- name: Run CMake
337-
run: cmake -DBUILD_TESTING=1 .
337+
run: cmake -DBUILD_TESTING=1 -DCMAKE_CXX_COMPILER=g++-10 .
338338
working-directory: ../boost-root/libs/math
339339
- name: Run Compile Tests
340340
run: make -j$((`nproc`+1))

LICENSE

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
Boost Software License - Version 1.0 - August 17th, 2003
2+
3+
Permission is hereby granted, free of charge, to any person or organization
4+
obtaining a copy of the software and accompanying documentation covered by
5+
this license (the "Software") to use, reproduce, display, distribute,
6+
execute, and transmit the Software, and to prepare derivative works of the
7+
Software, and to permit third-parties to whom the Software is furnished to
8+
do so, all subject to the following:
9+
10+
The copyright notices in the Software and this entire statement, including
11+
the above license grant, this restriction and the following disclaimer,
12+
must be included in all copies of the Software, in whole or in part, and
13+
all derivative works of the Software, unless such copies or derivative
14+
works are solely in the form of machine-executable object code generated by
15+
a source language processor.
16+
17+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19+
FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
20+
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
21+
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
22+
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23+
DEALINGS IN THE SOFTWARE.

include/boost/math/special_functions/detail/fp_traits.hpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,13 @@ With these techniques, the code could be simplified.
3333
#define BOOST_MATH_ENDIAN_BIG_BYTE BOOST_ENDIAN_BIG_BYTE
3434
#define BOOST_MATH_ENDIAN_LITTLE_BYTE BOOST_ENDIAN_LITTLE_BYTE
3535

36-
#elif (__cplusplus > 202000L || _MSVC_LANG > 202000L) && __has_include(<bit>)
36+
#elif (__cplusplus > 202000L || _MSVC_LANG > 202000L)
3737

38+
#if __has_include(<bit>)
3839
#include <bit>
3940
#define BOOST_MATH_ENDIAN_BIG_BYTE (std::endian::native == std::endian::big)
4041
#define BOOST_MATH_ENDIAN_LITTLE_BYTE (std::endian::native == std::endian::little)
42+
#endif
4143

4244
#elif defined(_WIN32)
4345

include/boost/math/statistics/bivariate_statistics.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include <cmath>
1919
#include <cstddef>
2020
#include <boost/math/tools/assert.hpp>
21+
#include <boost/math/tools/config.hpp>
2122

2223
// Support compilers with P0024R2 implemented without linking TBB
2324
// https://en.cppreference.com/w/cpp/compiler_support

include/boost/math/tools/config.hpp

+4
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,13 @@
3131

3232
#if (__cplusplus > 201700L || _MSVC_LANG > 201700L)
3333
#define BOOST_IF_CONSTEXPR if constexpr
34+
#if !__has_include(<execution>)
35+
#define BOOST_NO_CXX17_HDR_EXECUTION
36+
#endif
3437
#else
3538
#define BOOST_IF_CONSTEXPR if
3639
#define BOOST_NO_CXX17_IF_CONSTEXPR
40+
#define BOOST_NO_CXX17_HDR_EXECUTION
3741
#endif
3842

3943
#define BOOST_JOIN(X, Y) BOOST_DO_JOIN(X, Y)

0 commit comments

Comments
 (0)