boostorg/system
1
0
Fork 1
mirror of https://github.com/boostorg/system.git synced 2025-08-02 13:54:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/constexpr

Browse Source
This commit is contained in:
Peter Dimov
2018-01-18 15:03:07 +02:00
parent d0b3f59e63 b494f307b5
commit f89fe0ea77
2 changed files with 29 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
.travis.yml
View File

@@ -28,6 +28,26 @@ matrix:
compiler: g++ compiler: g++
env: TOOLSET=gcc COMPILER=g++ CXXSTD=03,11 env: TOOLSET=gcc COMPILER=g++ CXXSTD=03,11
- os: linux
compiler: g++-4.4
env: TOOLSET=gcc COMPILER=g++-4.4 CXXSTD=98,0x
addons:
apt:
packages:
- g++-4.4
sources:
- ubuntu-toolchain-r-test
- os: linux
compiler: g++-4.6
env: TOOLSET=gcc COMPILER=g++-4.6 CXXSTD=03,0x
addons:
apt:
packages:
- g++-4.6
sources:
- ubuntu-toolchain-r-test
- os: linux - os: linux
compiler: g++-4.7 compiler: g++-4.7
env: TOOLSET=gcc COMPILER=g++-4.7 CXXSTD=03,11 env: TOOLSET=gcc COMPILER=g++-4.7 CXXSTD=03,11

12
test/Jamfile.v2
View File

@@ -25,7 +25,11 @@ project
{ {
local result ; local result ;
if <toolset>gcc in $(properties) || <toolset>clang in $(properties) if <toolset>gcc in $(properties)
{
result = <cxxflags>-std=c++98 ; # 4.4 has no 03
}
else if <toolset>clang in $(properties)
{ {
result = <cxxflags>-std=c++03 ; result = <cxxflags>-std=c++03 ;
} }
@@ -41,11 +45,11 @@ project
{ {
local result ; local result ;
if <toolset-gcc:version>4.6 in $(properties) if <toolset>gcc in $(properties)
{ {
result = <cxxflags>-std=c++0x ; result = <cxxflags>-std=c++0x ; # 4.6 has no 11
} }
else if <toolset>gcc in $(properties) || <toolset>clang in $(properties) else if <toolset>clang in $(properties)
{ {
result = <cxxflags>-std=c++11 ; result = <cxxflags>-std=c++11 ;
} }