Merge branch 'develop' (early part)

This commit is contained in:
Daniel James
2018-04-16 06:42:45 +01:00
2 changed files with 7 additions and 7 deletions

View File

@@ -18,7 +18,7 @@ environment:
install: install:
- cd c:\projects - cd c:\projects
- curl -sSL -o boost.7z https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.7z - curl -sSL -o boost.7z https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_67_0.7z
- 7z x boost.7z - 7z x boost.7z
- set BOOST_ROOT=c:\projects\boost_1_66_0 - set BOOST_ROOT=c:\projects\boost_1_66_0
- rd /s /q %BOOST_ROOT%\boost\functional\hash - rd /s /q %BOOST_ROOT%\boost\functional\hash

View File

@@ -12,11 +12,11 @@ matrix:
include: include:
- compiler: gcc - compiler: gcc
env: | env: |
USER_CONFIG="using gcc : : g++-4.8 -Werror ;" USER_CONFIG="using gcc : : g++-4.8 ;"
CXXSTD=03,11 CXXSTD=03,11
- compiler: g++-7 - compiler: g++-7
env: | env: |
USER_CONFIG="using gcc : : g++-7 -Werror ;" USER_CONFIG="using gcc : : g++-7 ;"
CXXSTD=11,14,17 CXXSTD=11,14,17
addons: addons:
apt: apt:
@@ -26,16 +26,16 @@ matrix:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- compiler: clang - compiler: clang
env: | env: |
USER_CONFIG="using clang : : clang++ -Werror ;" USER_CONFIG="using clang : : clang++ ;"
CXXSTD=03,11 CXXSTD=03,11
- compiler: clang - compiler: clang
env: | env: |
USER_CONFIG="using clang : : clang++ -Werror -D_HAS_AUTO_PTR_ETC=0 ;" USER_CONFIG="using clang : : clang++ -D_HAS_AUTO_PTR_ETC=0 ;"
CXXSTD=11 CXXSTD=11
before_script: before_script:
- export BOOST_VERSION=1.66.0 - export BOOST_VERSION=1.67.0
- export BOOST_FILENAME=boost_1_66_0 - export BOOST_FILENAME=boost_1_67_0
- export BOOST_ROOT=${HOME}/boost - export BOOST_ROOT=${HOME}/boost
- cd ${TRAVIS_BUILD_DIR} - cd ${TRAVIS_BUILD_DIR}
- touch Jamroot.jam - touch Jamroot.jam