From c67fe0a9249a304dc4ccdf5059999efc1e5ad267 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Tue, 1 Nov 2016 18:43:47 +0200 Subject: [PATCH 1/2] Add support for BOOST_DISABLE_CURRENT_FUNCTION --- include/boost/current_function.hpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/boost/current_function.hpp b/include/boost/current_function.hpp index 5c113f8..86955cb 100644 --- a/include/boost/current_function.hpp +++ b/include/boost/current_function.hpp @@ -28,7 +28,11 @@ namespace detail inline void current_function_helper() { -#if defined(__GNUC__) || (defined(__MWERKS__) && (__MWERKS__ >= 0x3000)) || (defined(__ICC) && (__ICC >= 600)) || defined(__ghs__) +#if defined( BOOST_DISABLE_CURRENT_FUNCTION ) + +# define BOOST_CURRENT_FUNCTION "(unknown)" + +#elif defined(__GNUC__) || (defined(__MWERKS__) && (__MWERKS__ >= 0x3000)) || (defined(__ICC) && (__ICC >= 600)) || defined(__ghs__) # define BOOST_CURRENT_FUNCTION __PRETTY_FUNCTION__ From 89e5b86c469c993ea4c53ebc7ed4a9b133f785a6 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Tue, 1 Nov 2016 19:07:47 +0200 Subject: [PATCH 2/2] Add .travis.yml, appveyor.yml --- .travis.yml | 37 +++++++++++++++++++++++++++++++++++++ appveyor.yml | 29 +++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 .travis.yml create mode 100644 appveyor.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..8db244e --- /dev/null +++ b/.travis.yml @@ -0,0 +1,37 @@ +# Copyright 2016 Peter Dimov +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt) + +language: cpp + +sudo: false + +os: + - linux + - osx + +branches: + only: + - master + - develop + +install: + - cd .. + - git clone -b $TRAVIS_BRANCH https://github.com/boostorg/boost.git boost-root + - cd boost-root + - git submodule init libs/config + - git submodule init libs/core + - git submodule init tools/build + - git submodule update + - cp -r $TRAVIS_BUILD_DIR/* libs/assert + - ./bootstrap.sh + - ./b2 headers + +script: + - TOOLSET=gcc,clang + - if [ $TRAVIS_OS_NAME == osx ]; then TOOLSET=clang; fi + - ./b2 libs/assert/test toolset=$TOOLSET + +notifications: + email: + on_success: always diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 0000000..5a75678 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,29 @@ +# Copyright 2016 Peter Dimov +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE_1_0.txt or copy at http://boost.org/LICENSE_1_0.txt) + +version: 1.0.{build}-{branch} + +shallow_clone: true + +branches: + only: + - master + - develop + +install: + - cd .. + - git clone -b %APPVEYOR_REPO_BRANCH% https://github.com/boostorg/boost.git boost-root + - cd boost-root + - git submodule init libs/config + - git submodule init libs/core + - git submodule init tools/build + - git submodule update + - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\assert + - bootstrap + - b2 headers + +build: off + +test_script: + - b2 libs/assert/test toolset=msvc-9.0,msvc-10.0,msvc-11.0,msvc-14.0