boostorg/beast
1
0
Fork 1
mirror of https://github.com/boostorg/beast.git synced 2025-07-30 12:57:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use cxxstd instead of cxxflags

Browse Source
This commit is contained in:
Glen Fernandes
2019-01-08 23:43:47 -05:00
committed by Vinnie Falco
parent 8b72b4d407
commit 1d5a18a0a1
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.travis.yml
View File

@ -42,7 +42,7 @@ matrix:
- VARIANT=coverage - VARIANT=coverage
- TOOLSET=gcc - TOOLSET=gcc
- COMPILER=g++-6 - COMPILER=g++-6
- CXXSTD=c++11 - CXXSTD=11
before_install: before_install:
- pip install --user https://github.com/codecov/codecov-python/archive/master.zip - pip install --user https://github.com/codecov/codecov-python/archive/master.zip
addons: addons:
@ -62,7 +62,7 @@ matrix:
- VARIANT=valgrind - VARIANT=valgrind
- TOOLSET=gcc - TOOLSET=gcc
- COMPILER=g++-5 - COMPILER=g++-5
- CXXSTD=c++11 - CXXSTD=11
addons: addons:
apt: apt:
packages: packages:
@ -80,7 +80,7 @@ matrix:
- VARIANT=ubasan - VARIANT=ubasan
- TOOLSET=clang - TOOLSET=clang
- COMPILER=clang++-3.8 - COMPILER=clang++-3.8
- CXXSTD=c++11 - CXXSTD=11
- UBSAN_OPTIONS='print_stacktrace=1' - UBSAN_OPTIONS='print_stacktrace=1'
- PATH=$PWD/llvm-$LLVM_VERSION/bin:$PATH - PATH=$PWD/llvm-$LLVM_VERSION/bin:$PATH
addons: addons:
@ -100,7 +100,7 @@ matrix:
- VARIANT=release - VARIANT=release
- TOOLSET=gcc - TOOLSET=gcc
- COMPILER=g++-8 - COMPILER=g++-8
- CXXSTD=c++11 - CXXSTD=11
addons: addons:
apt: apt:
packages: packages:
@ -117,7 +117,7 @@ matrix:
- VARIANT=debug - VARIANT=debug
- TOOLSET=clang - TOOLSET=clang
- COMPILER=clang++ - COMPILER=clang++
- CXXSTD=c++14 - CXXSTD=14
install: install:
- export BOOST_BRANCH=develop && [ "$TRAVIS_BRANCH" == "master" ] && BOOST_BRANCH=master || true - export BOOST_BRANCH=develop && [ "$TRAVIS_BRANCH" == "master" ] && BOOST_BRANCH=master || true
@ -198,7 +198,7 @@ install:
script: script:
- |- - |-
echo "using $TOOLSET : : $COMPILER : <cxxflags>-std=$CXXSTD ;" > ~/user-config.jam echo "using $TOOLSET : : $COMPILER ;" > ~/user-config.jam
- cd ../boost-root - cd ../boost-root
- libs/beast/tools/retry.sh libs/beast/tools/build-and-test.sh - libs/beast/tools/retry.sh libs/beast/tools/build-and-test.sh

6
CHANGELOG.md
View File

@ -1,3 +1,9 @@
Version 202
* Use cxxstd instead of cxxflags
--------------------------------------------------------------------------------
Version 201 Version 201
* Decay bound arguments in handler wrapper parameters * Decay bound arguments in handler wrapper parameters

4
tools/build-and-test.sh
View File

@ -104,7 +104,7 @@ function build_bjam ()
[[ $VARIANT == "ubasan" ]]; then [[ $VARIANT == "ubasan" ]]; then
b2 \ b2 \
define=BOOST_COROUTINES_NO_DEPRECATION_WARNING=1 \ define=BOOST_COROUTINES_NO_DEPRECATION_WARNING=1 \
cxxstd=11 \ cxxstd=$CXXSTD \
libs/beast/test/beast/core//fat-tests \ libs/beast/test/beast/core//fat-tests \
libs/beast/test/beast/http//fat-tests \ libs/beast/test/beast/http//fat-tests \
libs/beast/test/beast/websocket//fat-tests \ libs/beast/test/beast/websocket//fat-tests \
@ -115,7 +115,7 @@ function build_bjam ()
else else
b2 \ b2 \
define=BOOST_COROUTINES_NO_DEPRECATION_WARNING=1 \ define=BOOST_COROUTINES_NO_DEPRECATION_WARNING=1 \
cxxstd=11 \ cxxstd=$CXXSTD \
libs/beast/test//fat-tests \ libs/beast/test//fat-tests \
libs/beast/example \ libs/beast/example \
toolset=$TOOLSET \ toolset=$TOOLSET \