feedc0de/boost_integer
1
0
Fork 0
forked from boostorg/integer
Code Pull Requests Activity

Merge master; fix Jamfile

Browse Source
This commit is contained in:
Nick Thompson
2018-10-28 21:14:31 -06:00
parent 6340dec871 b5d5c56e68
commit bbb1da275b
4 changed files with 46 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

217
.travis.yml
View File

@ -28,10 +28,10 @@ matrix:
include: include:
- os: linux - os: linux
env: TOOLSET=gcc COMPILER=g++ CXXSTD=c++03 env: TOOLSET=gcc COMPILER=g++ CXXSTD=03
- os: linux - os: linux
env: TOOLSET=gcc COMPILER=g++-4.7 CXXSTD=c++03 env: TOOLSET=gcc COMPILER=g++-4.7 CXXSTD=03,11
addons: addons:
apt: apt:
packages: packages:
@ -40,16 +40,7 @@ matrix:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- os: linux - os: linux
env: TOOLSET=gcc COMPILER=g++-4.7 CXXSTD=c++11 env: TOOLSET=gcc COMPILER=g++-4.8 CXXSTD=03,11
addons:
apt:
packages:
- g++-4.7
sources:
- ubuntu-toolchain-r-test
- os: linux
env: TOOLSET=gcc COMPILER=g++-4.8 CXXSTD=c++03
addons: addons:
apt: apt:
packages: packages:
@ -58,16 +49,7 @@ matrix:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- os: linux - os: linux
env: TOOLSET=gcc COMPILER=g++-4.8 CXXSTD=c++11 env: TOOLSET=gcc COMPILER=g++-4.9 CXXSTD=03,11
addons:
apt:
packages:
- g++-4.8
sources:
- ubuntu-toolchain-r-test
- os: linux
env: TOOLSET=gcc COMPILER=g++-4.9 CXXSTD=c++03
addons: addons:
apt: apt:
packages: packages:
@ -76,16 +58,7 @@ matrix:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- os: linux - os: linux
env: TOOLSET=gcc COMPILER=g++-4.9 CXXSTD=c++11 env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=03,11,14
addons:
apt:
packages:
- g++-4.9
sources:
- ubuntu-toolchain-r-test
- os: linux
env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=c++03
addons: addons:
apt: apt:
packages: packages:
@ -94,25 +67,7 @@ matrix:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- os: linux - os: linux
env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=c++11 env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=03,11,14,1z
addons:
apt:
packages:
- g++-5
sources:
- ubuntu-toolchain-r-test
- os: linux
env: TOOLSET=gcc COMPILER=g++-5 CXXSTD=c++14
addons:
apt:
packages:
- g++-5
sources:
- ubuntu-toolchain-r-test
- os: linux
env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++03
addons: addons:
apt: apt:
packages: packages:
@ -121,40 +76,37 @@ matrix:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- os: linux - os: linux
env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++11 env: TOOLSET=gcc COMPILER=g++-7 CXXSTD=03,11,14,1z
addons: addons:
apt: apt:
packages: packages:
- g++-6 - g++-7
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- os: linux - os: linux
env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++14 compiler: g++-8
env: TOOLSET=gcc COMPILER=g++-8 CXXSTD=03,11,14,17
addons: addons:
apt: apt:
packages: packages:
- g++-6 - g++-8
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- os: linux - os: linux
env: TOOLSET=gcc COMPILER=g++-6 CXXSTD=c++1z env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11
- os: linux
compiler: clang++-libc++
env: TOOLSET=clang COMPILER=clang++-libc++ CXXSTD=03,11,14,1z
addons: addons:
apt: apt:
packages: packages:
- g++-6 - libc++-dev
sources:
- ubuntu-toolchain-r-test
- os: linux - os: linux
env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++03 env: TOOLSET=clang COMPILER=clang++-3.5 CXXSTD=03,11
- os: linux
env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++11
- os: linux
env: TOOLSET=clang COMPILER=clang++-3.5 CXXSTD=c++03
addons: addons:
apt: apt:
packages: packages:
@ -164,17 +116,7 @@ matrix:
- llvm-toolchain-precise-3.5 - llvm-toolchain-precise-3.5
- os: linux - os: linux
env: TOOLSET=clang COMPILER=clang++-3.5 CXXSTD=c++11 env: TOOLSET=clang COMPILER=clang++-3.6 CXXSTD=03,11
addons:
apt:
packages:
- clang-3.5
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.5
- os: linux
env: TOOLSET=clang COMPILER=clang++-3.6 CXXSTD=c++03
addons: addons:
apt: apt:
packages: packages:
@ -184,17 +126,7 @@ matrix:
- llvm-toolchain-precise-3.6 - llvm-toolchain-precise-3.6
- os: linux - os: linux
env: TOOLSET=clang COMPILER=clang++-3.6 CXXSTD=c++11 env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=03,11
addons:
apt:
packages:
- clang-3.6
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.6
- os: linux
env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=c++03
addons: addons:
apt: apt:
packages: packages:
@ -204,17 +136,7 @@ matrix:
- llvm-toolchain-precise-3.7 - llvm-toolchain-precise-3.7
- os: linux - os: linux
env: TOOLSET=clang COMPILER=clang++-3.7 CXXSTD=c++11 env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=03,11,14,1z
addons:
apt:
packages:
- clang-3.7
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.7
- os: linux
env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=c++03
addons: addons:
apt: apt:
packages: packages:
@ -224,126 +146,67 @@ matrix:
- llvm-toolchain-precise-3.8 - llvm-toolchain-precise-3.8
- os: linux - os: linux
env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=c++11 env: TOOLSET=clang COMPILER=clang++-3.9 CXXSTD=03,11,14,1z
addons:
apt:
packages:
- clang-3.8
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.8
- os: linux
env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=c++14
addons:
apt:
packages:
- clang-3.8
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.8
- os: linux
env: TOOLSET=clang COMPILER=clang++-3.8 CXXSTD=c++1z
addons:
apt:
packages:
- clang-3.8
sources:
- ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.8
- os: linux
env: TOOLSET=clang COMPILER=clang++-3.9 CXXSTD=c++03
addons: addons:
apt: apt:
packages: packages:
- clang-3.9 - clang-3.9
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.9 - llvm-toolchain-trusty-3.9
- os: linux - os: linux
env: TOOLSET=clang COMPILER=clang++-3.9 CXXSTD=c++11 compiler: clang++-4.0
env: TOOLSET=clang COMPILER=clang++-4.0 CXXSTD=03,11,14,1z
addons: addons:
apt: apt:
packages: packages:
- clang-3.9 - clang-4.0
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.9 - llvm-toolchain-trusty-4.0
- os: linux - os: linux
env: TOOLSET=clang COMPILER=clang++-3.9 CXXSTD=c++14 compiler: clang++-5.0
env: TOOLSET=clang COMPILER=clang++-5.0 CXXSTD=03,11,14,1z
addons: addons:
apt: apt:
packages: packages:
- clang-3.9 - clang-5.0
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.9 - llvm-toolchain-trusty-5.0
- os: linux - os: linux
env: TOOLSET=clang COMPILER=clang++-3.9 CXXSTD=c++1z compiler: clang++-6.0
env: TOOLSET=clang COMPILER=clang++-6.0 CXXSTD=03,11,14,17
addons: addons:
apt: apt:
packages: packages:
- clang-3.9 - clang-6.0
sources: sources:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.9 - llvm-toolchain-trusty-6.0
- os: osx - os: osx
env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++03 env: TOOLSET=clang COMPILER=clang++ CXXSTD=03,11,14,1z
- os: osx
env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++11
- os: osx
env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++14
- os: osx
env: TOOLSET=clang COMPILER=clang++ CXXSTD=c++1z
install: install:
- cd .. - cd ..
- git clone -b $TRAVIS_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root - git clone -b $TRAVIS_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
- cd boost-root - cd boost-root
- git submodule update --init tools/boostdep
- git submodule update --init tools/build - git submodule update --init tools/build
- git submodule update --init libs/config - git submodule update --init libs/config
- git submodule update --init libs/core
- git submodule update --init libs/container_hash
- git submodule update --init libs/io
- git submodule update --init libs/detail
- git submodule update --init libs/assert
- git submodule update --init libs/static_assert
- git submodule update --init libs/type_traits
- git submodule update --init libs/mpl
- git submodule update --init libs/preprocessor
- git submodule update --init libs/multiprecision
- git submodule update --init libs/math
- git submodule update --init libs/rational
- git submodule update --init libs/throw_exception
- git submodule update --init libs/predef
- git submodule update --init libs/lexical_cast
- git submodule update --init libs/range
- git submodule update --init libs/iterator
- git submodule update --init libs/concept_check
- git submodule update --init libs/numeric
- git submodule update --init libs/array
- git submodule update --init libs/container
- git submodule update --init libs/move
- git submodule update --init libs/functional
- git submodule update --init libs/random
- git submodule update --init libs/utility
- cp -r $TRAVIS_BUILD_DIR/* libs/integer - cp -r $TRAVIS_BUILD_DIR/* libs/integer
- python tools/boostdep/depinst/depinst.py integer
- ./bootstrap.sh - ./bootstrap.sh
- ./b2 headers - ./b2 headers
script: script:
- |- - |-
echo "using $TOOLSET : : $COMPILER : <cxxflags>-std=$CXXSTD ;" > ~/user-config.jam echo "using $TOOLSET : : $COMPILER ;" > ~/user-config.jam
- ./b2 libs/integer/test toolset=$TOOLSET - ./b2 -j3 libs/integer/test toolset=$TOOLSET cxxstd=$CXXSTD
notifications: notifications:
email: email:

25
appveyor.yml
View File

@ -44,32 +44,11 @@ install:
- cd .. - cd ..
- git clone -b %APPVEYOR_REPO_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root - git clone -b %APPVEYOR_REPO_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root
- cd boost-root - cd boost-root
- git submodule update --init tools/boostdep
- git submodule update --init tools/build - git submodule update --init tools/build
- git submodule update --init libs/config - git submodule update --init libs/config
- git submodule update --init libs/core
- git submodule update --init libs/detail
- git submodule update --init libs/assert
- git submodule update --init libs/static_assert
- git submodule update --init libs/type_traits
- git submodule update --init libs/mpl
- git submodule update --init libs/preprocessor
- git submodule update --init libs/multiprecision
- git submodule update --init libs/math
- git submodule update --init libs/rational
- git submodule update --init libs/throw_exception
- git submodule update --init libs/predef
- git submodule update --init libs/lexical_cast
- git submodule update --init libs/range
- git submodule update --init libs/iterator
- git submodule update --init libs/concept_check
- git submodule update --init libs/numeric
- git submodule update --init libs/array
- git submodule update --init libs/container
- git submodule update --init libs/move
- git submodule update --init libs/functional
- git submodule update --init libs/random
- git submodule update --init libs/utility
- xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\integer - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\integer
- python tools/boostdep/depinst/depinst.py integer
- bootstrap - bootstrap
- b2 headers - b2 headers

5
test/Jamfile.v2
View File

@ -3,6 +3,7 @@
#~ (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) #~ (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
import testing ; import testing ;
import ../../config/checks/config : requires ;
project : requirements <warnings>all <toolset>gcc:<cxxflags>-Wextra ; project : requirements <warnings>all <toolset>gcc:<cxxflags>-Wextra ;
@ -16,8 +17,8 @@ test-suite integer
[ run integer_mask_test.cpp ] [ run integer_mask_test.cpp ]
[ run static_log2_test.cpp ] [ run static_log2_test.cpp ]
[ run static_min_max_test.cpp ] [ run static_min_max_test.cpp ]
[ run extended_euclidean_test.cpp ] [ run extended_euclidean_test.cpp : : : [ requires cxx11_unified_initialization_syntax ] ]
[ run mod_inverse_test.cpp ] [ run mod_inverse_test.cpp : : : [ requires cxx11_unified_initialization_syntax ] ]
[ compile integer_traits_include_test.cpp ] [ compile integer_traits_include_test.cpp ]
[ compile integer_include_test.cpp ] [ compile integer_include_test.cpp ]
[ compile integer_mask_include_test.cpp ] [ compile integer_mask_include_test.cpp ]

2
test/extended_euclidean_test.cpp
View File

@ -22,7 +22,7 @@ void test_extended_euclidean()
Z max_arg = 500; Z max_arg = 500;
for (Z m = max_arg; m > 0; --m) for (Z m = max_arg; m > 0; --m)
{ {
for (Z n = m; n > 0; --n) for (Z n = max_arg; n > 0; --n)
{ {
boost::integer::euclidean_result_t<Z> u = extended_euclidean(m, n); boost::integer::euclidean_result_t<Z> u = extended_euclidean(m, n);
int256_t gcdmn = gcd(m, n); int256_t gcdmn = gcd(m, n);