boostorg/beast
1
0
Fork 1
mirror of https://github.com/boostorg/beast.git synced 2025-08-03 23:04:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Only set -std=c++11 on Travis

Browse Source
This commit is contained in:
Vinnie Falco
2017-08-09 16:32:06 -07:00
parent 8977237f8a
commit d9d2b10760
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -2,6 +2,7 @@ Version 104:
* Remove unused include * Remove unused include
* Use #error in config.hpp * Use #error in config.hpp
* Only set -std=c++11 on Travis
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------

2
Jamfile
View File

@@ -99,8 +99,6 @@ project /boost/beast
<define>BOOST_ASIO_DISABLE_BOOST_DATE_TIME=1 <define>BOOST_ASIO_DISABLE_BOOST_DATE_TIME=1
<define>BOOST_ASIO_DISABLE_BOOST_REGEX=1 <define>BOOST_ASIO_DISABLE_BOOST_REGEX=1
<define>BOOST_ASIO_NO_DEPRECATED=1 <define>BOOST_ASIO_NO_DEPRECATED=1
<toolset>gcc:<cxxflags>-std=c++11
<toolset>clang:<cxxflags>-std=c++11
<toolset>msvc:<define>_SCL_SECURE_NO_WARNINGS=1 <toolset>msvc:<define>_SCL_SECURE_NO_WARNINGS=1
<toolset>msvc:<define>_CRT_SECURE_NO_WARNINGS=1 <toolset>msvc:<define>_CRT_SECURE_NO_WARNINGS=1
<toolset>msvc:<cxxflags>"/permissive- /bigobj" <toolset>msvc:<cxxflags>"/permissive- /bigobj"

6
build/build-and-test.sh
View File

@@ -100,7 +100,8 @@ function build_bjam ()
if [[ $VARIANT == "coverage" ]] || \ if [[ $VARIANT == "coverage" ]] || \
[[ $VARIANT == "valgrind" ]] || \ [[ $VARIANT == "valgrind" ]] || \
[[ $VARIANT == "ubasan" ]]; then [[ $VARIANT == "ubasan" ]]; then
bjam \ b2 \
cxxflags=-std=c++11 \
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 \
@@ -109,7 +110,8 @@ function build_bjam ()
variant=$VARIANT \ variant=$VARIANT \
-j${JOBS} -j${JOBS}
else else
bjam \ b2 \
cxxflags=-std=c++11 \
libs/beast/test//fat-tests \ libs/beast/test//fat-tests \
libs/beast/example \ libs/beast/example \
toolset=$TOOLSET \ toolset=$TOOLSET \