From 27302e439a818a16601a1a610e12f23eb2f88efd Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Wed, 4 Mar 2015 09:34:29 -0600 Subject: [PATCH 01/53] Remove library target (in preference of automatic modular method soon to come). --- build.jam | 6 ------ 1 file changed, 6 deletions(-) diff --git a/build.jam b/build.jam index 0f9a53b..5ee09af 100644 --- a/build.jam +++ b/build.jam @@ -4,9 +4,3 @@ # http://www.boost.org/LICENSE_1_0.txt) path-constant BOOST_PREDEF_ROOT : . ; - -project - : usage-requirements include - ; - -alias library ; From d2adcf2b81d62affceb26108ab6bcddca61a7e86 Mon Sep 17 00:00:00 2001 From: Edward Diener Date: Mon, 4 May 2015 18:40:54 -0400 Subject: [PATCH 02/53] Fixed example for predef-check --- doc/predef.qbk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/predef.qbk b/doc/predef.qbk index 07807cd..7abc2ed 100644 --- a/doc/predef.qbk +++ b/doc/predef.qbk @@ -673,7 +673,7 @@ import path-to-predef-src/check/predef exe my_special_exe : source.cpp : [ predef-check "BOOST_OS_WINDOWS == 0" - : ENABLE_WMF=0 + : : ENABLE_WMF=0 : ENABLE_WMF=1 ] ; `` [c++] From 77561daca9136556fc3f022952ad8f0bb1007cb9 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 18 May 2015 11:07:21 -0500 Subject: [PATCH 03/53] Fix MAKE_YYYYMM macro to correctly limit the month to a somewhat less invalid range. Thanks to rick68/gmail.com for finding this. --- include/boost/predef/make.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/boost/predef/make.h b/include/boost/predef/make.h index f8c28d1..f997a0a 100644 --- a/include/boost/predef/make.h +++ b/include/boost/predef/make.h @@ -84,6 +84,6 @@ If the day is not available, but the month is, the 1st of the month is used as t /*` `BOOST_PREDEF_MAKE_YYYY(V)` */ #define BOOST_PREDEF_MAKE_YYYY(V) BOOST_PREDEF_MAKE_DATE(V,1,1) /*` `BOOST_PREDEF_MAKE_YYYYMM(V)` */ -#define BOOST_PREDEF_MAKE_YYYYMM(V) BOOST_PREDEF_MAKE_DATE((V)/100,(V),1) +#define BOOST_PREDEF_MAKE_YYYYMM(V) BOOST_PREDEF_MAKE_DATE((V)/100,(V)%100,1) #endif From d9d0ed3d889c1f657f678e01851cecc30fede343 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 18 May 2015 11:12:56 -0500 Subject: [PATCH 04/53] Fix BOOST_ARCH_PARISC (was BOOST_ARCH_PARISK) reference for detecting endianess. Thanks to Graham Hanson for finding this. --- include/boost/predef/other/endian.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/boost/predef/other/endian.h b/include/boost/predef/other/endian.h index 85a028d..048cc5d 100644 --- a/include/boost/predef/other/endian.h +++ b/include/boost/predef/other/endian.h @@ -140,7 +140,7 @@ information and acquired knowledge: !BOOST_ENDIAN_LITTLE_BYTE && !BOOST_ENDIAN_LITTLE_WORD # include # if BOOST_ARCH_M68K || \ - BOOST_ARCH_PARISK || \ + BOOST_ARCH_PARISC || \ BOOST_ARCH_SPARC || \ BOOST_ARCH_SYS370 || \ BOOST_ARCH_SYS390 || \ From 99bd64cd1130d92cb151fa81faa0616f09a3638d Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 18 May 2015 21:54:31 -0500 Subject: [PATCH 05/53] Fix incorrect check expression eval. It turns out the expression eval was just not implemented and only really worked for the require checks as those are ok with duplicate properties. Now full and/or expression parsing an evaluation is implemented. --- check/predef.jam | 146 ++++++++++++++++++++++++++++++++++++------- test/build.jam | 3 +- test/check_value.cpp | 26 ++++++++ 3 files changed, 151 insertions(+), 24 deletions(-) create mode 100644 test/check_value.cpp diff --git a/check/predef.jam b/check/predef.jam index 0638703..795c333 100644 --- a/check/predef.jam +++ b/check/predef.jam @@ -13,6 +13,7 @@ import string ; import toolset ; import modules ; import path ; +import "class" : new ; # Create a project for our targets. project.extension predef check ; @@ -54,35 +55,42 @@ rule check ( expressions + : language ? : true-properties * : false-properties * local project_target = [ project.target $(__name__) ] ; project.push-current $(project_target) ; + local terms ; local result ; for expression in $(expressions) { - # The check program to use. - local exe_target = [ $(_check_exe_($(language))).name ] ; - exe_target = /check/predef//$(exe_target) ; - - # Create the check run if we don't have one yet. - local key = [ MD5 $(language)::$(expression) ] ; - if ! ( $(key) in $(_checks_) ) + if $(expression:L) in "and" "or" { - _checks_ += $(key) ; - make - $(key).txt : - $(exe_target) : - @$(__name__).predef_check_action : - $(expression) ; - explicit - $(key).txt ; + terms += $(expression:L) ; + } + else + { + # The check program to use. + local exe_target = [ $(_check_exe_($(language))).name ] ; + exe_target = /check/predef//$(exe_target) ; + + # Create the check run if we don't have one yet. + local key = [ MD5 $(language)::$(expression) ] ; + if ! ( $(key) in $(_checks_) ) + { + _checks_ += $(key) ; + _message_(/check/predef//$(key).txt) = $(expression) ; + make + $(key).txt : + $(exe_target) : + @$(__name__).predef_check_action : + $(expression) ; + explicit + $(key).txt ; + } + + terms += /check/predef//$(key).txt ; } - - local check_target = [ check-target-builds - /check/predef//$(key).txt $(expression) - : $(true-properties) - : $(false-properties) ] ; - - result += $(check_target) ; } - project.pop-current ; + local instance = [ new check-expression-evaluator + $(terms) : $(true-properties) : $(false-properties) ] ; + result = @$(instance).check ; + project.pop-current ; return $(result) ; } @@ -104,3 +112,95 @@ actions predef_check_action bind PREDEF_CHECK_EXPRESSION { $(>) "$(PREDEF_CHECK_EXPRESSION)" > $(<) } + +class check-expression-evaluator +{ + import configure ; + + rule __init__ ( expression + : true-properties * : false-properties * ) + { + self.expression = $(expression) ; + self.true-properties = $(true-properties) ; + self.false-properties = $(false-properties) ; + } + + rule check ( properties * ) + { + local to-eval ; + local tokens = "and" "or" ; + # Go through the expression and: eval the target values, + # and normalize to a full expression. + for local term in $(self.expression) + { + if ! ( $(term:L) in $(tokens) ) + { + # A value is a target reference that will evan to "true" + # or "false". + if $(to-eval[-1]:L) && ! ( $(to-eval[-1]:L) in $(tokens) ) + { + # Default to "and" operation. + to-eval += "and" ; + } + local message = [ modules.peek predef : _message_($(term)) ] ; + if [ configure.builds $(term) : $(properties) : $(message) ] + { + to-eval += "true" ; + } + else + { + to-eval += "false" ; + } + } + else + { + to-eval += $(term) ; + } + } + # Eval full the expression. + local eval-result = [ eval $(to-eval) ] ; + # And resolve true/false properties. + if $(eval-result) = "true" + { + return $(self.true-properties) ; + } + else + { + return $(self.false-properties) ; + } + } + + rule eval ( e * ) + { + local r ; + if $(e[1]) && $(e[2]) && $(e[3]) + { + if $(e[2]) = "and" + { + if $(e[1]) = "true" && $(e[3]) = "true" + { + r = [ eval "true" $(e[4-]) ] ; + } + else + { + r = [ eval "false" $(e[4-]) ] ; + } + } + else if $(e[2]) = "or" + { + if $(e[1]) = "true" || $(e[3]) = "true" + { + r = [ eval "true" $(e[4-]) ] ; + } + else + { + r = [ eval "false" $(e[4-]) ] ; + } + } + } + else + { + r = $(e[1]) ; + } + return $(r) ; + } +} diff --git a/test/build.jam b/test/build.jam index 28e1473..b760f90 100755 --- a/test/build.jam +++ b/test/build.jam @@ -4,7 +4,7 @@ # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) -import ../check/predef : require : predef-require ; +import ../check/predef : require check : predef-require predef-check ; local predef-include-root ; local predef-dependency ; @@ -57,4 +57,5 @@ test-suite predef : [ run make.cpp ] [ compile macos_endian.c : [ predef-require "BOOST_OS_MACOS" : cpp ] ] [ compile macos_vs_bsd.c : [ predef-require "BOOST_OS_MACOS" : cpp ] ] + #[ run check_value.cpp : : : [ predef-check "BOOST_COMP_CLANG >= 4.0" "BOOST_OS_MACOS == 0" : : -DCHECK_VALUE=true : -DCHECK_VALUE=false ] ] ; diff --git a/test/check_value.cpp b/test/check_value.cpp new file mode 100644 index 0000000..86bed68 --- /dev/null +++ b/test/check_value.cpp @@ -0,0 +1,26 @@ +/* +Copyright Rene Rivera 2015 +Distributed under the Boost Software License, Version 1.0. +(See accompanying file LICENSE_1_0.txt or copy at +http://www.boost.org/LICENSE_1_0.txt) +*/ + +/* + * Simple program that just prints out the externally + * defined CHECK_VALUE def. It's used to test the check + * program and the related BB support. + */ + +#include +#include +#include + +#ifndef CHECK_VALUE +#define CHECK_VALUE "undefined" +#endif + +int main(int argc, const char ** argv) +{ + std::cout << "CHECK_VALUE == " << CHECK_VALUE << "\n" ; + return 0; +} From c0ec80bacce215bdb651ca8d2f0577ffbc4c51fe Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Thu, 21 May 2015 10:57:43 -0500 Subject: [PATCH 06/53] Add Travis CI config. --- .travis.yml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..26ec0c6 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,32 @@ +language: cpp + +compiler: + - gcc + - clang + +install: + - wget "https://github.com/boostorg/build/archive/develop.tar.gz" + - tar -xzvf develop.tar.gz + - cd build-develop && ./bootstrap && sudo ./b2 install --prefix=/usr + +before_script: + - echo 'project ROOT : : : build-dir bin ;' > jamroot.jam + +script: + - cd test && b2 -a --verbose-test + +branches: + only: + - develop + - master + +notifications: + email: false + irc: + channels: + - "chat.freenode.net#boost" + template: + - "%{repository}/%{branch} (%{commit} - %{author}): %{build_url}: %{message}" + +os: + - linux From 153e05ea387a3b0540d38f18a2a25669554098f7 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Thu, 21 May 2015 10:58:28 -0500 Subject: [PATCH 07/53] No master branch testing for Travis yet. --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 26ec0c6..14bed21 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,6 @@ script: branches: only: - develop - - master notifications: email: false From 7aa20b752cdd3842d312360bd01a1e815a6f6212 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Thu, 21 May 2015 11:20:09 -0500 Subject: [PATCH 08/53] Add Travis email notify.. To poke the build. --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 14bed21..15ae930 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,8 @@ branches: - develop notifications: - email: false + email: + - grafikrobot@gmail.com irc: channels: - "chat.freenode.net#boost" From f132b81c8c877d4e4a64cab18823bd343ed50dce Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Thu, 21 May 2015 11:33:45 -0500 Subject: [PATCH 09/53] Fix Travis yaml syntax. --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 15ae930..3f3fb45 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ install: - cd build-develop && ./bootstrap && sudo ./b2 install --prefix=/usr before_script: - - echo 'project ROOT : : : build-dir bin ;' > jamroot.jam + - 'echo "project ROOT : : : build-dir bin ;" > jamroot.jam' script: - cd test && b2 -a --verbose-test @@ -27,6 +27,8 @@ notifications: - "chat.freenode.net#boost" template: - "%{repository}/%{branch} (%{commit} - %{author}): %{build_url}: %{message}" + on_success: never + on_failure: always os: - linux From 3ae4a6a6882c86d0c1beff29e8cffdddf3d5ac21 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Thu, 21 May 2015 11:41:49 -0500 Subject: [PATCH 10/53] More Travis fixing. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3f3fb45..b217c1b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ compiler: install: - wget "https://github.com/boostorg/build/archive/develop.tar.gz" - tar -xzvf develop.tar.gz - - cd build-develop && ./bootstrap && sudo ./b2 install --prefix=/usr + - cd build-develop && ./bootstrap.sh && sudo ./b2 install --prefix=/usr before_script: - 'echo "project ROOT : : : build-dir bin ;" > jamroot.jam' From eb05d43616fc2f92f4f954e6612759fc828fd378 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Thu, 21 May 2015 11:58:59 -0500 Subject: [PATCH 11/53] Debugging Travis config. --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index b217c1b..09ca536 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ before_script: - 'echo "project ROOT : : : build-dir bin ;" > jamroot.jam' script: - - cd test && b2 -a --verbose-test + - ls -laF && cd test && ls -laF && b2 -a --verbose-test branches: only: @@ -27,8 +27,8 @@ notifications: - "chat.freenode.net#boost" template: - "%{repository}/%{branch} (%{commit} - %{author}): %{build_url}: %{message}" - on_success: never - on_failure: always + on_success: change + on_failure: change os: - linux From e5b485ccf2bc1e85c29117164772a7d8a408733e Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Thu, 21 May 2015 12:15:35 -0500 Subject: [PATCH 12/53] Fix Travis dir locations. --- .travis.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 09ca536..6c47c3a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,13 +7,18 @@ compiler: install: - wget "https://github.com/boostorg/build/archive/develop.tar.gz" - tar -xzvf develop.tar.gz - - cd build-develop && ./bootstrap.sh && sudo ./b2 install --prefix=/usr + - cd build-develop + - ./bootstrap.sh + - sudo ./b2 install --prefix=/usr + - cd $TRAVIS_BUILD_DIR before_script: + - cd $TRAVIS_BUILD_DIR - 'echo "project ROOT : : : build-dir bin ;" > jamroot.jam' script: - - ls -laF && cd test && ls -laF && b2 -a --verbose-test + - cd $TRAVIS_BUILD_DIR + - cd test && b2 -a --verbose-test branches: only: From b7a00a68aa0385604d4c3a867665d740d65e4f86 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Thu, 21 May 2015 12:46:40 -0500 Subject: [PATCH 13/53] Add toolset to use for Travis. --- .travis.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6c47c3a..3a1faa3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,20 +5,23 @@ compiler: - clang install: + - cd $TRAVIS_BUILD_DIR - wget "https://github.com/boostorg/build/archive/develop.tar.gz" - tar -xzvf develop.tar.gz - cd build-develop - ./bootstrap.sh - sudo ./b2 install --prefix=/usr + - if [ "$CC" = "gcc" ]; then export B2_TOOLSET="gcc"; fi + - if [ "$CC" = "clang" ]; then export B2_TOOLSET="clang"; fi - cd $TRAVIS_BUILD_DIR before_script: - cd $TRAVIS_BUILD_DIR - 'echo "project ROOT : : : build-dir bin ;" > jamroot.jam' + - cd $TRAVIS_BUILD_DIR script: - - cd $TRAVIS_BUILD_DIR - - cd test && b2 -a --verbose-test + - cd test && b2 -a --verbose-test toolset=$B2_TOOLSET branches: only: From 96a395ccacaa1e164cfc1c42cae749e916ffa714 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Thu, 21 May 2015 15:08:06 -0500 Subject: [PATCH 14/53] Trim when Travis sends out emails. --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3a1faa3..4820835 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,10 @@ branches: notifications: email: - - grafikrobot@gmail.com + recipients: + - grafikrobot@gmail.com + on_success: change + on_failure: change irc: channels: - "chat.freenode.net#boost" From 2efb26b810e794e04b99bc6b4496d22a1bf91c84 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sat, 23 May 2015 23:33:43 -0500 Subject: [PATCH 15/53] Switching to Python CI script. --- .travis.yml | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4820835..836923e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,26 +2,6 @@ language: cpp compiler: - gcc - - clang - -install: - - cd $TRAVIS_BUILD_DIR - - wget "https://github.com/boostorg/build/archive/develop.tar.gz" - - tar -xzvf develop.tar.gz - - cd build-develop - - ./bootstrap.sh - - sudo ./b2 install --prefix=/usr - - if [ "$CC" = "gcc" ]; then export B2_TOOLSET="gcc"; fi - - if [ "$CC" = "clang" ]; then export B2_TOOLSET="clang"; fi - - cd $TRAVIS_BUILD_DIR - -before_script: - - cd $TRAVIS_BUILD_DIR - - 'echo "project ROOT : : : build-dir bin ;" > jamroot.jam' - - cd $TRAVIS_BUILD_DIR - -script: - - cd test && b2 -a --verbose-test toolset=$B2_TOOLSET branches: only: @@ -43,3 +23,17 @@ notifications: os: - linux + +before_install: wget "https://raw.githubusercontent.com/boostorg/regression/develop/ci/src/script.py" + +install: python script.py travis_install + +before_script: python script.py travis_before_script + +script: python script.py travis_script + +after_success: python script.py travis_after_success + +after_failure: python script.py travis_after_failure + +after_script: python script.py travis_after_script From 283d4c406d3957089c48750052fdf88de063cd9c Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 24 May 2015 07:47:15 -0500 Subject: [PATCH 16/53] Use Travis matrix with TOOLSET env spec. --- .travis.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 836923e..6c07e3d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,5 @@ language: cpp -compiler: - - gcc - branches: only: - develop @@ -24,16 +21,15 @@ notifications: os: - linux +matrix: + include: + - compiler: gcc + env: TOOLSET=gcc-4.7 + before_install: wget "https://raw.githubusercontent.com/boostorg/regression/develop/ci/src/script.py" - install: python script.py travis_install - before_script: python script.py travis_before_script - script: python script.py travis_script - after_success: python script.py travis_after_success - after_failure: python script.py travis_after_failure - after_script: python script.py travis_after_script From 5b12d3b1d94d57a17b9d5f4ef345811100ebed93 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 24 May 2015 07:54:06 -0500 Subject: [PATCH 17/53] Add/switch to clang Travis to poke build. --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6c07e3d..7cee263 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,8 +23,10 @@ os: matrix: include: - - compiler: gcc - env: TOOLSET=gcc-4.7 + - compiler: clang + env: TOOLSET=clang-3.4 + #- compiler: gcc + # env: TOOLSET=gcc-4.7 before_install: wget "https://raw.githubusercontent.com/boostorg/regression/develop/ci/src/script.py" install: python script.py travis_install From eb7ebad4956836cb87b655f01a6cbc4b46bb8106 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 24 May 2015 08:01:32 -0500 Subject: [PATCH 18/53] Poke Travis. And another clang version. --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7cee263..ea219b8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,7 +24,9 @@ os: matrix: include: - compiler: clang - env: TOOLSET=clang-3.4 + env: TOOLSET=clang-3.3 + #- compiler: clang + # env: TOOLSET=clang-3.4 #- compiler: gcc # env: TOOLSET=gcc-4.7 From 6dbb3f5435780b7e900328e82a622b2f10ffc89b Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 24 May 2015 08:06:06 -0500 Subject: [PATCH 19/53] Fix bad clang version in Travis matrix. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ea219b8..1ea25df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,10 +23,10 @@ os: matrix: include: - - compiler: clang - env: TOOLSET=clang-3.3 #- compiler: clang # env: TOOLSET=clang-3.4 + - compiler: clang + env: TOOLSET=clang-3.5 #- compiler: gcc # env: TOOLSET=gcc-4.7 From 64c7199ba22ede5c59d2f39328852f043cc5b3bb Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 24 May 2015 08:15:59 -0500 Subject: [PATCH 20/53] Poke Travis, by adding gcc-4.8 to matrix. --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1ea25df..2d014b8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,10 +25,12 @@ matrix: include: #- compiler: clang # env: TOOLSET=clang-3.4 - - compiler: clang - env: TOOLSET=clang-3.5 + #- compiler: clang + # env: TOOLSET=clang-3.5 #- compiler: gcc # env: TOOLSET=gcc-4.7 + - compiler: gcc + env: TOOLSET=gcc-4.8 before_install: wget "https://raw.githubusercontent.com/boostorg/regression/develop/ci/src/script.py" install: python script.py travis_install From 9bf2130032cea234276779c45843274dd43311f1 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 24 May 2015 16:53:26 -0500 Subject: [PATCH 21/53] Poke Travis, by adding gcc-4.9 to matrix. --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2d014b8..d0fa781 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,8 +29,10 @@ matrix: # env: TOOLSET=clang-3.5 #- compiler: gcc # env: TOOLSET=gcc-4.7 + #- compiler: gcc + # env: TOOLSET=gcc-4.8 - compiler: gcc - env: TOOLSET=gcc-4.8 + env: TOOLSET=gcc-4.9 before_install: wget "https://raw.githubusercontent.com/boostorg/regression/develop/ci/src/script.py" install: python script.py travis_install From 28f3abb20719ea790377ba8c951beaefb62f1758 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 24 May 2015 17:21:10 -0500 Subject: [PATCH 22/53] Poke Travis, by changing target compiler matrix. --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index d0fa781..f91628c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,16 +23,16 @@ os: matrix: include: - #- compiler: clang - # env: TOOLSET=clang-3.4 + - compiler: clang + env: TOOLSET=clang-3.4 #- compiler: clang # env: TOOLSET=clang-3.5 #- compiler: gcc # env: TOOLSET=gcc-4.7 #- compiler: gcc # env: TOOLSET=gcc-4.8 - - compiler: gcc - env: TOOLSET=gcc-4.9 + #- compiler: gcc + # env: TOOLSET=gcc-4.9 before_install: wget "https://raw.githubusercontent.com/boostorg/regression/develop/ci/src/script.py" install: python script.py travis_install From 6bb7b5486b77980a61e40a4e2bb0d2799afd93f2 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 24 May 2015 17:28:05 -0500 Subject: [PATCH 23/53] Poke Travis. --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f91628c..ef47c96 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,10 +23,10 @@ os: matrix: include: - - compiler: clang - env: TOOLSET=clang-3.4 #- compiler: clang - # env: TOOLSET=clang-3.5 + # env: TOOLSET=clang-3.4 + - compiler: clang + env: TOOLSET=clang-3.5 #- compiler: gcc # env: TOOLSET=gcc-4.7 #- compiler: gcc From 7eee3c5ef832f298f3585841aafa232ac45374a8 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 24 May 2015 20:54:22 -0500 Subject: [PATCH 24/53] Poke Travis. --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index ef47c96..256c8ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,10 +25,10 @@ matrix: include: #- compiler: clang # env: TOOLSET=clang-3.4 - - compiler: clang - env: TOOLSET=clang-3.5 - #- compiler: gcc - # env: TOOLSET=gcc-4.7 + #- compiler: clang + # env: TOOLSET=clang-3.5 + - compiler: gcc + env: TOOLSET=gcc-4.7 #- compiler: gcc # env: TOOLSET=gcc-4.8 #- compiler: gcc From 55509ea0c1db33df9bea931664b23c40c6a70c3b Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 24 May 2015 21:05:34 -0500 Subject: [PATCH 25/53] Poke Travis. --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 256c8ea..a59e48d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,10 +27,10 @@ matrix: # env: TOOLSET=clang-3.4 #- compiler: clang # env: TOOLSET=clang-3.5 - - compiler: gcc - env: TOOLSET=gcc-4.7 #- compiler: gcc - # env: TOOLSET=gcc-4.8 + # env: TOOLSET=gcc-4.7 + - compiler: gcc + env: TOOLSET=gcc-4.8 #- compiler: gcc # env: TOOLSET=gcc-4.9 From 82f14477e01aa229657c284f50a9675ae438067d Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Sun, 24 May 2015 21:50:54 -0500 Subject: [PATCH 26/53] Poke Travis. --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index a59e48d..d0fa781 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,10 +29,10 @@ matrix: # env: TOOLSET=clang-3.5 #- compiler: gcc # env: TOOLSET=gcc-4.7 - - compiler: gcc - env: TOOLSET=gcc-4.8 #- compiler: gcc - # env: TOOLSET=gcc-4.9 + # env: TOOLSET=gcc-4.8 + - compiler: gcc + env: TOOLSET=gcc-4.9 before_install: wget "https://raw.githubusercontent.com/boostorg/regression/develop/ci/src/script.py" install: python script.py travis_install From db5f8b2fa8631961b04ab321d9c07470fd588807 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 25 May 2015 07:20:58 -0500 Subject: [PATCH 27/53] Poke Travis. --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index d0fa781..f91628c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,16 +23,16 @@ os: matrix: include: - #- compiler: clang - # env: TOOLSET=clang-3.4 + - compiler: clang + env: TOOLSET=clang-3.4 #- compiler: clang # env: TOOLSET=clang-3.5 #- compiler: gcc # env: TOOLSET=gcc-4.7 #- compiler: gcc # env: TOOLSET=gcc-4.8 - - compiler: gcc - env: TOOLSET=gcc-4.9 + #- compiler: gcc + # env: TOOLSET=gcc-4.9 before_install: wget "https://raw.githubusercontent.com/boostorg/regression/develop/ci/src/script.py" install: python script.py travis_install From 8ea31f2e633ce5f0a60cba8824561bdecbf23611 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 25 May 2015 07:29:25 -0500 Subject: [PATCH 28/53] Poke Travis. --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f91628c..ef47c96 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,10 +23,10 @@ os: matrix: include: - - compiler: clang - env: TOOLSET=clang-3.4 #- compiler: clang - # env: TOOLSET=clang-3.5 + # env: TOOLSET=clang-3.4 + - compiler: clang + env: TOOLSET=clang-3.5 #- compiler: gcc # env: TOOLSET=gcc-4.7 #- compiler: gcc From 43903afcd3fd08dfd908a7e53f8033f75185b108 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 25 May 2015 10:31:06 -0500 Subject: [PATCH 29/53] Poke Travis. --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index ef47c96..256c8ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,10 +25,10 @@ matrix: include: #- compiler: clang # env: TOOLSET=clang-3.4 - - compiler: clang - env: TOOLSET=clang-3.5 - #- compiler: gcc - # env: TOOLSET=gcc-4.7 + #- compiler: clang + # env: TOOLSET=clang-3.5 + - compiler: gcc + env: TOOLSET=gcc-4.7 #- compiler: gcc # env: TOOLSET=gcc-4.8 #- compiler: gcc From 77e94305e6641418d6ab49cab47d4765e2f1312f Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 26 May 2015 09:02:02 -0500 Subject: [PATCH 30/53] Poke Travis. --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 256c8ea..a59e48d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,10 +27,10 @@ matrix: # env: TOOLSET=clang-3.4 #- compiler: clang # env: TOOLSET=clang-3.5 - - compiler: gcc - env: TOOLSET=gcc-4.7 #- compiler: gcc - # env: TOOLSET=gcc-4.8 + # env: TOOLSET=gcc-4.7 + - compiler: gcc + env: TOOLSET=gcc-4.8 #- compiler: gcc # env: TOOLSET=gcc-4.9 From 8d6ff7a54049a57c39307b43315ed6d4b234d562 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 26 May 2015 09:09:20 -0500 Subject: [PATCH 31/53] Poke Travis. --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index a59e48d..d0fa781 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,10 +29,10 @@ matrix: # env: TOOLSET=clang-3.5 #- compiler: gcc # env: TOOLSET=gcc-4.7 - - compiler: gcc - env: TOOLSET=gcc-4.8 #- compiler: gcc - # env: TOOLSET=gcc-4.9 + # env: TOOLSET=gcc-4.8 + - compiler: gcc + env: TOOLSET=gcc-4.9 before_install: wget "https://raw.githubusercontent.com/boostorg/regression/develop/ci/src/script.py" install: python script.py travis_install From 344562f72b8cbad42caea6b0f8e012bef66afcac Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 26 May 2015 09:20:01 -0500 Subject: [PATCH 32/53] Poke Travis. --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index d0fa781..f91628c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,16 +23,16 @@ os: matrix: include: - #- compiler: clang - # env: TOOLSET=clang-3.4 + - compiler: clang + env: TOOLSET=clang-3.4 #- compiler: clang # env: TOOLSET=clang-3.5 #- compiler: gcc # env: TOOLSET=gcc-4.7 #- compiler: gcc # env: TOOLSET=gcc-4.8 - - compiler: gcc - env: TOOLSET=gcc-4.9 + #- compiler: gcc + # env: TOOLSET=gcc-4.9 before_install: wget "https://raw.githubusercontent.com/boostorg/regression/develop/ci/src/script.py" install: python script.py travis_install From 13f25010975fb4037cf816aeaac074b63ecbce96 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 26 May 2015 09:26:08 -0500 Subject: [PATCH 33/53] Enable the full toolset Travis matrix. --- .travis.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index f91628c..69c0c28 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,14 +25,14 @@ matrix: include: - compiler: clang env: TOOLSET=clang-3.4 - #- compiler: clang - # env: TOOLSET=clang-3.5 - #- compiler: gcc - # env: TOOLSET=gcc-4.7 - #- compiler: gcc - # env: TOOLSET=gcc-4.8 - #- compiler: gcc - # env: TOOLSET=gcc-4.9 + - compiler: clang + env: TOOLSET=clang-3.5 + - compiler: gcc + env: TOOLSET=gcc-4.7 + - compiler: gcc + env: TOOLSET=gcc-4.8 + - compiler: gcc + env: TOOLSET=gcc-4.9 before_install: wget "https://raw.githubusercontent.com/boostorg/regression/develop/ci/src/script.py" install: python script.py travis_install From 0dec25945ac7e7887aba30483796c8430b1dd1ca Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 26 May 2015 10:49:24 -0500 Subject: [PATCH 34/53] Add check test to debug failing VMD option tests. --- test/build.jam | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/build.jam b/test/build.jam index b760f90..d488349 100755 --- a/test/build.jam +++ b/test/build.jam @@ -57,5 +57,6 @@ test-suite predef : [ run make.cpp ] [ compile macos_endian.c : [ predef-require "BOOST_OS_MACOS" : cpp ] ] [ compile macos_vs_bsd.c : [ predef-require "BOOST_OS_MACOS" : cpp ] ] - #[ run check_value.cpp : : : [ predef-check "BOOST_COMP_CLANG >= 4.0" "BOOST_OS_MACOS == 0" : : -DCHECK_VALUE=true : -DCHECK_VALUE=false ] ] + [ run check_value.cpp : : : always_show_run_output + [ predef-check "BOOST_COMP_GNUC >= 4.3" "BOOST_OS_QNX == 0" : : -DCHECK_VALUE=true : -DCHECK_VALUE=false ] ] ; From ca54bcad607821871366a647c5057cd318ec46f3 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 26 May 2015 20:57:50 -0500 Subject: [PATCH 35/53] Add 'minimal' test target. --- test/build.jam | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/build.jam b/test/build.jam index d488349..b5ce135 100755 --- a/test/build.jam +++ b/test/build.jam @@ -60,3 +60,8 @@ test-suite predef : [ run check_value.cpp : : : always_show_run_output [ predef-check "BOOST_COMP_GNUC >= 4.3" "BOOST_OS_QNX == 0" : : -DCHECK_VALUE=true : -DCHECK_VALUE=false ] ] ; + +# Minimal testing done for predef for CI. Since +# we don't have many we can just do all of them. +alias minimal : predef ; +explicit minimal ; From 79b23019371444b444593014ac789fe70ea4dc20 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 26 May 2015 22:37:53 -0500 Subject: [PATCH 36/53] Add latest clang and gcc versions. --- .travis.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 69c0c28..7d45465 100644 --- a/.travis.yml +++ b/.travis.yml @@ -27,12 +27,16 @@ matrix: env: TOOLSET=clang-3.4 - compiler: clang env: TOOLSET=clang-3.5 + - compiler: clang + env: TOOLSET=clang-3.6 - compiler: gcc env: TOOLSET=gcc-4.7 - compiler: gcc env: TOOLSET=gcc-4.8 - compiler: gcc env: TOOLSET=gcc-4.9 + - compiler: gcc + env: TOOLSET=gcc-5.1 before_install: wget "https://raw.githubusercontent.com/boostorg/regression/develop/ci/src/script.py" install: python script.py travis_install From 58c23226b1ebed2579d0f3296faaff958f5c424d Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Wed, 27 May 2015 20:36:27 -0500 Subject: [PATCH 37/53] Update SunPro to accomodate latest versions of compiler form Oracle. And update to Oracle name. --- include/boost/predef/compiler/sunpro.h | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/include/boost/predef/compiler/sunpro.h b/include/boost/predef/compiler/sunpro.h index bd3da27..79f3128 100644 --- a/include/boost/predef/compiler/sunpro.h +++ b/include/boost/predef/compiler/sunpro.h @@ -14,7 +14,7 @@ http://www.boost.org/LICENSE_1_0.txt) /*` [heading `BOOST_COMP_SUNPRO`] -[@http://en.wikipedia.org/wiki/Sun_Studio_%28software%29 Sun Studio] compiler. +[@http://en.wikipedia.org/wiki/Oracle_Solaris_Studio Oracle Solaris Studio] compiler. Version number available as major, minor, and patch. [table @@ -25,6 +25,8 @@ Version number available as major, minor, and patch. [[`__SUNPRO_CC`] [V.R.P]] [[`__SUNPRO_C`] [V.R.P]] + [[`__SUNPRO_CC`] [VV.RR.P]] + [[`__SUNPRO_C`] [VV.RR.P]] ] */ @@ -32,10 +34,18 @@ Version number available as major, minor, and patch. #if defined(__SUNPRO_CC) || defined(__SUNPRO_C) # if !defined(BOOST_COMP_SUNPRO_DETECTION) && defined(__SUNPRO_CC) -# define BOOST_COMP_SUNPRO_DETECTION BOOST_PREDEF_MAKE_0X_VRP(__SUNPRO_CC) +# if (__SUNPRO_CC < 0x5100) +# define BOOST_COMP_SUNPRO_DETECTION BOOST_PREDEF_MAKE_0X_VRP(__SUNPRO_CC) +# else +# define BOOST_COMP_SUNPRO_DETECTION BOOST_PREDEF_MAKE_0X_VVRRP(__SUNPRO_CC) +# endif # endif # if !defined(BOOST_COMP_SUNPRO_DETECTION) && defined(__SUNPRO_C) -# define BOOST_COMP_SUNPRO_DETECTION BOOST_PREDEF_MAKE_0X_VRP(__SUNPRO_C) +# if (__SUNPRO_C < 0x5100) +# define BOOST_COMP_SUNPRO_DETECTION BOOST_PREDEF_MAKE_0X_VRP(__SUNPRO_C) +# else +# define BOOST_COMP_SUNPRO_DETECTION BOOST_PREDEF_MAKE_0X_VVRRP(__SUNPRO_C) +# endif # endif # if !defined(BOOST_COMP_SUNPRO_DETECTION) # define BOOST_COMP_SUNPRO_DETECTION BOOST_VERSION_NUMBER_AVAILABLE @@ -53,7 +63,7 @@ Version number available as major, minor, and patch. # include #endif -#define BOOST_COMP_SUNPRO_NAME "Sun Studio" +#define BOOST_COMP_SUNPRO_NAME "Oracle Solaris Studio" #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_SUNPRO,BOOST_COMP_SUNPRO_NAME) From 27cbb3c604fac182fbcb34f45a34553019d92f9a Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 1 Jun 2015 09:26:43 -0500 Subject: [PATCH 38/53] Update CI to use new command names for common CI test script. --- .travis.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7d45465..9c0099f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,9 +39,9 @@ matrix: env: TOOLSET=gcc-5.1 before_install: wget "https://raw.githubusercontent.com/boostorg/regression/develop/ci/src/script.py" -install: python script.py travis_install -before_script: python script.py travis_before_script -script: python script.py travis_script -after_success: python script.py travis_after_success -after_failure: python script.py travis_after_failure -after_script: python script.py travis_after_script +install: python script.py install +before_script: python script.py before_script +script: python script.py script +after_success: python script.py after_success +after_failure: python script.py after_failure +after_script: python script.py after_script From 7c88275ada67b7289ef53dd25e1af353c35a8b6a Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 1 Jun 2015 09:49:38 -0500 Subject: [PATCH 39/53] Add Appveyor configuration. --- appveyor.yml | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 appveyor.yml diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 0000000..9051290 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,40 @@ +version: 1.0.{build}-{branch} + +branches: + only: + - develop + +skip_tags: true + +notifications: + - provider: Email + to: + - grafikrobot@gmail.com + on_build_status_changed: true + +matrix: + - environment: + TOOLSET: vs-2008 + - environment: + TOOLSET: vs-2010 + - environment: + TOOLSET: vs-2012 + - environment: + TOOLSET: vs-2013 + - environment: + TOOLSET: vs-2015 + os: Visual Studio 2015 RC + +init: + - choco install wget + - wget "https://raw.githubusercontent.com/boostorg/regression/develop/ci/src/script.py" +install: python script.py install +before_build: python script.py before_build +build_script: python script.py build_script +after_build: python script.py after_build +before_test: python script.py before_test +test_script: python script.py test_script +after_test: python script.py after_test +on_success: python script.py on_success +on_failure: python script.py on_failure +on_finish: python script.py on_finish From cb0f1fb5efe5854ff506546812b306869f2417b5 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 1 Jun 2015 11:48:31 -0500 Subject: [PATCH 40/53] Fix env matrix setup, and use appveyor download utility to get CI script. --- appveyor.yml | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 9051290..a3b8e1d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,22 +12,15 @@ notifications: - grafikrobot@gmail.com on_build_status_changed: true -matrix: - - environment: - TOOLSET: vs-2008 - - environment: - TOOLSET: vs-2010 - - environment: - TOOLSET: vs-2012 - - environment: - TOOLSET: vs-2013 - - environment: - TOOLSET: vs-2015 - os: Visual Studio 2015 RC +environment: + matrix: + - TOOLSET: vs-2008 + - TOOLSET: vs-2010 + - TOOLSET: vs-2012 + - TOOLSET: vs-2013 init: - - choco install wget - - wget "https://raw.githubusercontent.com/boostorg/regression/develop/ci/src/script.py" + - appveyor DownloadFile "https://raw.githubusercontent.com/boostorg/regression/develop/ci/src/script.py" install: python script.py install before_build: python script.py before_build build_script: python script.py build_script From e69a13e8493d381bcdff32e96a5e931a4caa817d Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 1 Jun 2015 12:33:10 -0500 Subject: [PATCH 41/53] Add debug dir output for init. Change version to not have redundant 1.0. --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index a3b8e1d..6f4c016 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 1.0.{build}-{branch} +version: {build}-{branch} branches: only: @@ -21,6 +21,7 @@ environment: init: - appveyor DownloadFile "https://raw.githubusercontent.com/boostorg/regression/develop/ci/src/script.py" + - dir install: python script.py install before_build: python script.py before_build build_script: python script.py build_script From 475d10c941576f8ecbaabc844f2c3093541c50cb Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 1 Jun 2015 12:35:33 -0500 Subject: [PATCH 42/53] Just get rid of Appveyor version.. It's useless. --- appveyor.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 6f4c016..b56264f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,3 @@ -version: {build}-{branch} - branches: only: - develop From fbeda38b97dcf62c6d7e66640c81ba45f93113cc Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 1 Jun 2015 12:53:17 -0500 Subject: [PATCH 43/53] Avoid putting CI script in default location as that is the pre-clone dir in Appveyor. --- appveyor.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index b56264f..7bf1721 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -18,15 +18,15 @@ environment: - TOOLSET: vs-2013 init: - - appveyor DownloadFile "https://raw.githubusercontent.com/boostorg/regression/develop/ci/src/script.py" + - appveyor DownloadFile "https://raw.githubusercontent.com/boostorg/regression/develop/ci/src/script.py" -FileName /script.py - dir -install: python script.py install -before_build: python script.py before_build -build_script: python script.py build_script -after_build: python script.py after_build -before_test: python script.py before_test -test_script: python script.py test_script -after_test: python script.py after_test -on_success: python script.py on_success -on_failure: python script.py on_failure -on_finish: python script.py on_finish +install: python /script.py install +before_build: python /script.py before_build +build_script: python /script.py build_script +after_build: python /script.py after_build +before_test: python /script.py before_test +test_script: python /script.py test_script +after_test: python /script.py after_test +on_success: python /script.py on_success +on_failure: python /script.py on_failure +on_finish: python /script.py on_finish From bbcf9161a251bdef4f7ab64aa106bae63ec5e80d Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 1 Jun 2015 13:10:00 -0500 Subject: [PATCH 44/53] Another attempt at moving CI script file. --- appveyor.yml | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 7bf1721..e21201c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -18,15 +18,16 @@ environment: - TOOLSET: vs-2013 init: - - appveyor DownloadFile "https://raw.githubusercontent.com/boostorg/regression/develop/ci/src/script.py" -FileName /script.py + - cd .. + - appveyor DownloadFile "https://raw.githubusercontent.com/boostorg/regression/develop/ci/src/script.py" - dir -install: python /script.py install -before_build: python /script.py before_build -build_script: python /script.py build_script -after_build: python /script.py after_build -before_test: python /script.py before_test -test_script: python /script.py test_script -after_test: python /script.py after_test -on_success: python /script.py on_success -on_failure: python /script.py on_failure -on_finish: python /script.py on_finish +install: python ../script.py install +before_build: python ../script.py before_build +build_script: python ../script.py build_script +after_build: python ../script.py after_build +before_test: python ../script.py before_test +test_script: python ../script.py test_script +after_test: python ../script.py after_test +on_success: python ../script.py on_success +on_failure: python ../script.py on_failure +on_finish: python ../script.py on_finish From 93c39a536fd6c4362ba924b4d34aa3f30f573538 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 1 Jun 2015 13:44:05 -0500 Subject: [PATCH 45/53] Appveyor steps are not isolated, so fix init step to restore CWD. --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index e21201c..4f4b2f3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -18,9 +18,10 @@ environment: - TOOLSET: vs-2013 init: - - cd .. + - cd %APPVEYOR_BUILD_FOLDER%/.. - appveyor DownloadFile "https://raw.githubusercontent.com/boostorg/regression/develop/ci/src/script.py" - dir + - cd %APPVEYOR_BUILD_FOLDER% install: python ../script.py install before_build: python ../script.py before_build build_script: python ../script.py build_script From 8fd39047e42274471220db36c1a6a10ea913c636 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 9 Jun 2015 15:26:31 -0500 Subject: [PATCH 46/53] Alter check value test to further debug check expression eval. --- test/build.jam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/build.jam b/test/build.jam index b5ce135..b9eb9f1 100755 --- a/test/build.jam +++ b/test/build.jam @@ -58,7 +58,7 @@ test-suite predef : [ compile macos_endian.c : [ predef-require "BOOST_OS_MACOS" : cpp ] ] [ compile macos_vs_bsd.c : [ predef-require "BOOST_OS_MACOS" : cpp ] ] [ run check_value.cpp : : : always_show_run_output - [ predef-check "BOOST_COMP_GNUC >= 4.3" "BOOST_OS_QNX == 0" : : -DCHECK_VALUE=true : -DCHECK_VALUE=false ] ] + [ predef-check "BOOST_COMP_CLANG > 0" "BOOST_OS_WINDOWS == 0" : : -DCHECK_VALUE=true : -DCHECK_VALUE=false ] ] ; # Minimal testing done for predef for CI. Since From 631dd730384a8a22b9dcf18abb698431a3f9c80b Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 9 Jun 2015 16:07:44 -0500 Subject: [PATCH 47/53] Change to get a "true" && "false" check result. --- test/build.jam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/build.jam b/test/build.jam index b9eb9f1..62e3b90 100755 --- a/test/build.jam +++ b/test/build.jam @@ -58,7 +58,7 @@ test-suite predef : [ compile macos_endian.c : [ predef-require "BOOST_OS_MACOS" : cpp ] ] [ compile macos_vs_bsd.c : [ predef-require "BOOST_OS_MACOS" : cpp ] ] [ run check_value.cpp : : : always_show_run_output - [ predef-check "BOOST_COMP_CLANG > 0" "BOOST_OS_WINDOWS == 0" : : -DCHECK_VALUE=true : -DCHECK_VALUE=false ] ] + [ predef-check "BOOST_COMP_CLANG > 0" "BOOST_OS_LINUX == 0" : : -DCHECK_VALUE=true : -DCHECK_VALUE=false ] ] ; # Minimal testing done for predef for CI. Since From d77608cf708c0c7cc3911ee70abbb2279c17576a Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 9 Jun 2015 22:31:53 -0500 Subject: [PATCH 48/53] Check if having only one property causes problems with the checks. --- test/build.jam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/build.jam b/test/build.jam index 62e3b90..1ac1f58 100755 --- a/test/build.jam +++ b/test/build.jam @@ -58,7 +58,7 @@ test-suite predef : [ compile macos_endian.c : [ predef-require "BOOST_OS_MACOS" : cpp ] ] [ compile macos_vs_bsd.c : [ predef-require "BOOST_OS_MACOS" : cpp ] ] [ run check_value.cpp : : : always_show_run_output - [ predef-check "BOOST_COMP_CLANG > 0" "BOOST_OS_LINUX == 0" : : -DCHECK_VALUE=true : -DCHECK_VALUE=false ] ] + [ predef-check "BOOST_COMP_CLANG > 0" "BOOST_OS_LINUX == 0" : : -DCHECK_VALUE=true ] ] ; # Minimal testing done for predef for CI. Since From 83ff76d7456c3218fa3afa0d59230a08f1a0c793 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Thu, 11 Jun 2015 21:24:27 -0500 Subject: [PATCH 49/53] Add address-model and variant specs for Appveyor CI. --- appveyor.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 4f4b2f3..8c84f48 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -17,6 +17,14 @@ environment: - TOOLSET: vs-2012 - TOOLSET: vs-2013 +platform: + - 32 + - 64 + +configuration: + - debug + - release + init: - cd %APPVEYOR_BUILD_FOLDER%/.. - appveyor DownloadFile "https://raw.githubusercontent.com/boostorg/regression/develop/ci/src/script.py" From 0f113b0871832aafdffed45a5def8f473161cdab Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Mon, 29 Jun 2015 18:49:33 -0500 Subject: [PATCH 50/53] Fix non-standard test feature test collection. I.e. make the feature collection no rely on implementioned defined behaviour. And fix check program handling of no-expression invocations vs expression invocations. --- check/predef_check.h | 98 +++++++++++++++ check/predef_check_as_c.c | 114 +----------------- check/predef_check_as_cpp.cpp | 8 +- check/predef_check_as_objc.m | 8 +- check/predef_check_as_objcpp.mm | 8 +- include/boost/predef.h | 4 +- include/boost/predef/architecture.h | 4 +- include/boost/predef/architecture/alpha.h | 5 +- include/boost/predef/architecture/arm.h | 5 +- include/boost/predef/architecture/blackfin.h | 5 +- include/boost/predef/architecture/convex.h | 6 +- include/boost/predef/architecture/ia64.h | 4 +- include/boost/predef/architecture/m68k.h | 5 +- include/boost/predef/architecture/mips.h | 5 +- include/boost/predef/architecture/parisc.h | 5 +- include/boost/predef/architecture/ppc.h | 5 +- include/boost/predef/architecture/pyramid.h | 5 +- include/boost/predef/architecture/rs6k.h | 6 +- include/boost/predef/architecture/sparc.h | 5 +- include/boost/predef/architecture/superh.h | 5 +- include/boost/predef/architecture/sys370.h | 5 +- include/boost/predef/architecture/sys390.h | 5 +- include/boost/predef/architecture/x86.h | 10 +- include/boost/predef/architecture/x86/32.h | 6 +- include/boost/predef/architecture/x86/64.h | 6 +- include/boost/predef/architecture/z.h | 5 +- include/boost/predef/compiler.h | 4 +- include/boost/predef/compiler/borland.h | 5 +- include/boost/predef/compiler/clang.h | 5 +- include/boost/predef/compiler/comeau.h | 5 +- include/boost/predef/compiler/compaq.h | 5 +- include/boost/predef/compiler/diab.h | 5 +- include/boost/predef/compiler/digitalmars.h | 5 +- include/boost/predef/compiler/dignus.h | 5 +- include/boost/predef/compiler/edg.h | 5 +- include/boost/predef/compiler/ekopath.h | 5 +- include/boost/predef/compiler/gcc.h | 5 +- include/boost/predef/compiler/gcc_xml.h | 4 +- include/boost/predef/compiler/greenhills.h | 5 +- include/boost/predef/compiler/hp_acc.h | 5 +- include/boost/predef/compiler/iar.h | 5 +- include/boost/predef/compiler/ibm.h | 5 +- include/boost/predef/compiler/intel.h | 5 +- include/boost/predef/compiler/kai.h | 5 +- include/boost/predef/compiler/llvm.h | 5 +- include/boost/predef/compiler/metaware.h | 5 +- include/boost/predef/compiler/metrowerks.h | 5 +- include/boost/predef/compiler/microtec.h | 5 +- include/boost/predef/compiler/mpw.h | 5 +- include/boost/predef/compiler/palm.h | 5 +- include/boost/predef/compiler/pgi.h | 5 +- include/boost/predef/compiler/sgi_mipspro.h | 5 +- include/boost/predef/compiler/sunpro.h | 5 +- include/boost/predef/compiler/tendra.h | 5 +- include/boost/predef/compiler/visualc.h | 5 +- include/boost/predef/compiler/watcom.h | 5 +- include/boost/predef/detail/test_def.h | 71 +++++++++++ include/boost/predef/language.h | 4 +- include/boost/predef/language/objc.h | 5 +- include/boost/predef/language/stdc.h | 5 +- include/boost/predef/language/stdcpp.h | 19 ++- include/boost/predef/library.h | 4 +- include/boost/predef/library/c.h | 4 +- include/boost/predef/library/c/gnu.h | 5 +- include/boost/predef/library/c/uc.h | 5 +- include/boost/predef/library/c/vms.h | 5 +- include/boost/predef/library/c/zos.h | 5 +- include/boost/predef/library/std.h | 4 +- include/boost/predef/library/std/cxx.h | 5 +- include/boost/predef/library/std/dinkumware.h | 5 +- include/boost/predef/library/std/libcomo.h | 5 +- include/boost/predef/library/std/modena.h | 5 +- include/boost/predef/library/std/msl.h | 5 +- include/boost/predef/library/std/roguewave.h | 5 +- include/boost/predef/library/std/sgi.h | 5 +- include/boost/predef/library/std/stdcpp3.h | 5 +- include/boost/predef/library/std/stlport.h | 5 +- include/boost/predef/library/std/vacpp.h | 5 +- include/boost/predef/os.h | 4 +- include/boost/predef/os/aix.h | 5 +- include/boost/predef/os/amigaos.h | 5 +- include/boost/predef/os/android.h | 5 +- include/boost/predef/os/beos.h | 5 +- include/boost/predef/os/bsd.h | 12 +- include/boost/predef/os/bsd/bsdi.h | 4 +- include/boost/predef/os/bsd/dragonfly.h | 4 +- include/boost/predef/os/bsd/free.h | 4 +- include/boost/predef/os/bsd/net.h | 4 +- include/boost/predef/os/bsd/open.h | 4 +- include/boost/predef/os/cygwin.h | 5 +- include/boost/predef/os/haiku.h | 5 +- include/boost/predef/os/hpux.h | 5 +- include/boost/predef/os/ios.h | 5 +- include/boost/predef/os/irix.h | 5 +- include/boost/predef/os/linux.h | 5 +- include/boost/predef/os/macos.h | 5 +- include/boost/predef/os/os400.h | 5 +- include/boost/predef/os/qnxnto.h | 5 +- include/boost/predef/os/solaris.h | 5 +- include/boost/predef/os/unix.h | 4 +- include/boost/predef/os/vms.h | 5 +- include/boost/predef/os/windows.h | 4 +- include/boost/predef/other.h | 4 +- include/boost/predef/other/endian.h | 5 +- include/boost/predef/platform.h | 4 +- include/boost/predef/platform/mingw.h | 5 +- .../boost/predef/platform/windows_desktop.h | 4 +- include/boost/predef/platform/windows_phone.h | 4 +- .../boost/predef/platform/windows_runtime.h | 4 +- include/boost/predef/platform/windows_store.h | 4 +- test/info_as_c.c | 73 +---------- test/info_as_cpp.cpp | 87 +------------ test/info_as_objc.m | 4 +- test/info_as_objcpp.mm | 4 +- test/predef_info.h | 46 +++++++ 115 files changed, 483 insertions(+), 565 deletions(-) create mode 100644 check/predef_check.h create mode 100644 include/boost/predef/detail/test_def.h create mode 100644 test/predef_info.h diff --git a/check/predef_check.h b/check/predef_check.h new file mode 100644 index 0000000..a6917c1 --- /dev/null +++ b/check/predef_check.h @@ -0,0 +1,98 @@ +/* +Copyright Rene Rivera 2011-2015 +Distributed under the Boost Software License, Version 1.0. +(See accompanying file LICENSE_1_0.txt or copy at +http://www.boost.org/LICENSE_1_0.txt) +*/ +#include + +const char * str_token(const char ** str, const char * space) +{ + unsigned span; + char * token; + for (; **str != 0; *str += 1) + { + if (0 == strchr(space, **str)) + { + break; + } + } + span = strcspn(*str, space); + token = (char *)malloc(span+1); + strncpy(token, *str, span); + token[span] = 0; + for (*str += span; **str != 0; *str += 1) + { + if (0 == strchr(space, **str)) + { + break; + } + } + return token; +} + +const char * whitespace = " "; +const char * dot = "."; + +int main(int argc, const char ** argv) +{ + unsigned x = 0; + int argi = 1; + create_predef_entries(); +#if 0 + qsort(generated_predef_info,generated_predef_info_count, + sizeof(predef_info),predef_info_compare); + for (x = 0; x < generated_predef_info_count; ++x) + { + printf("%s: %d\n", generated_predef_info[x].name, generated_predef_info[x].value); + } +#endif + int result = -1; + for (argi = 1; argi < argc; ++argi) + { + const char * exp = argv[argi]; + const char * exp_name = str_token(&exp, whitespace); + const char * exp_op = str_token(&exp, whitespace); + const char * exp_val = str_token(&exp, whitespace); + unsigned exp_version = 0; + if (*exp_val != 0) + { + exp = exp_val; + const char * exp_val_a = str_token(&exp, dot); + const char * exp_val_b = str_token(&exp, dot); + const char * exp_val_c = str_token(&exp, dot); + exp_version = BOOST_VERSION_NUMBER(atoi(exp_val_a), atoi(exp_val_b),atoi(exp_val_c)); + } + for (x = 0; x < generated_predef_info_count; ++x) + { + if (*exp_op == 0 && + generated_predef_info[x].value > 0 && + strcmp(exp_name, generated_predef_info[x].name) == 0) + { + /* Expression of the form "BOOST_x_yy" is true. */ + result = 0; + break; + } + else if (*exp_op == 0 && + generated_predef_info[x].value == 0 && + strcmp(exp_name, generated_predef_info[x].name) == 0) + { + /* Expression of the form "BOOST_x_yy" is false. */ + return argi; + } + else if (*exp_op != 0 && *exp_val != 0 && + strcmp(exp_name, generated_predef_info[x].name) == 0) + { + /* Expression of the form "BOOST_x_yy op val". */ + result = 0; + if (0 == strcmp(">",exp_op) && !(generated_predef_info[x].value > exp_version)) return argi; + if (0 == strcmp("<",exp_op) && !(generated_predef_info[x].value < exp_version)) return argi; + if (0 == strcmp(">=",exp_op) && !(generated_predef_info[x].value >= exp_version)) return argi; + if (0 == strcmp("<=",exp_op) && !(generated_predef_info[x].value <= exp_version)) return argi; + if (0 == strcmp("==",exp_op) && !(generated_predef_info[x].value == exp_version)) return argi; + if (0 == strcmp("!=",exp_op) && !(generated_predef_info[x].value != exp_version)) return argi; + } + } + } + return result; +} diff --git a/check/predef_check_as_c.c b/check/predef_check_as_c.c index dcb7d6a..352c18b 100644 --- a/check/predef_check_as_c.c +++ b/check/predef_check_as_c.c @@ -4,116 +4,4 @@ Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ -#include -#include -#include - -#define BOOST_PREDEF_INTERNAL_GENERATE_TESTS - -typedef struct predef_info -{ - unsigned tag; - const char * name; - const char * description; - unsigned value; -} predef_info; - -predef_info first_predef_info = { 0x43210DEF , "-" , "-" , 0xFFFFFFFF }; - -#define BOOST_PREDEF_DECLARE_TEST(x,s) \ - predef_info x##_predef_info = { 0x67890DEF , #x , s , x }; -#include - -predef_info last_predef_info = { 0xFFFFFFFF , "-" , "-" , 0x43210DEF }; - -int predef_info_compare(const void * a, const void * b) -{ - const predef_info ** i = (const predef_info **)a; - const predef_info ** j = (const predef_info **)b; - return strcmp((*i)->name,(*j)->name); -} - -const char * str_token(const char ** str, const char * space) -{ - unsigned span; - char * token; - for (; **str != 0; *str += 1) - { - if (0 == strchr(space, **str)) - { - break; - } - } - span = strcspn(*str, space); - token = (char *)malloc(span+1); - strncpy(token, *str, span); - token[span] = 0; - for (*str += span; **str != 0; *str += 1) - { - if (0 == strchr(space, **str)) - { - break; - } - } - return token; -} - -const char * whitespace = " "; -const char * dot = "."; - -int main(int argc, const char ** argv) -{ - unsigned x = 0; - int argi = 1; - predef_info ** predefs = 0; - unsigned predef_count = 0; - unsigned * i = &first_predef_info.tag; - unsigned * e = &last_predef_info.tag; - while (i < e) - { - i += 1; - if (*i == 0x67890DEF) - { - predef_count += 1; - predefs = (predef_info**)realloc(predefs,predef_count*sizeof(predef_info*)); - predefs[predef_count-1] = (predef_info*)i; - } - } - qsort(predefs,predef_count,sizeof(predef_info*),predef_info_compare); - for (argi = 1; argi < argc; ++argi) - { - const char * exp = argv[argi]; - const char * exp_name = str_token(&exp, whitespace); - const char * exp_op = str_token(&exp, whitespace); - const char * exp_val = str_token(&exp, whitespace); - unsigned exp_version = 0; - if (*exp_val != 0) - { - exp = exp_val; - const char * exp_val_a = str_token(&exp, dot); - const char * exp_val_b = str_token(&exp, dot); - const char * exp_val_c = str_token(&exp, dot); - exp_version = BOOST_VERSION_NUMBER(atoi(exp_val_a), atoi(exp_val_b),atoi(exp_val_c)); - } - for (x = 0; x < predef_count; ++x) - { - if (*exp_op == 0 && - predefs[x]->value == 0 && - strcmp(exp_name, predefs[x]->name) == 0) - { - return argi; - } - else if (*exp_op != 0 && *exp_val != 0 && - strcmp(exp_name, predefs[x]->name) == 0) - { - if (0 == strcmp(">",exp_op) && !(predefs[x]->value > exp_version)) return argi; - if (0 == strcmp("<",exp_op) && !(predefs[x]->value < exp_version)) return argi; - if (0 == strcmp(">=",exp_op) && !(predefs[x]->value >= exp_version)) return argi; - if (0 == strcmp("<=",exp_op) && !(predefs[x]->value <= exp_version)) return argi; - if (0 == strcmp("==",exp_op) && !(predefs[x]->value == exp_version)) return argi; - if (0 == strcmp("!=",exp_op) && !(predefs[x]->value != exp_version)) return argi; - } - } - } - return 0; -} +#include "predef_check.h" diff --git a/check/predef_check_as_cpp.cpp b/check/predef_check_as_cpp.cpp index c58abe7..352c18b 100644 --- a/check/predef_check_as_cpp.cpp +++ b/check/predef_check_as_cpp.cpp @@ -1 +1,7 @@ -#include "predef_check_as_c.c" +/* +Copyright Rene Rivera 2011-2015 +Distributed under the Boost Software License, Version 1.0. +(See accompanying file LICENSE_1_0.txt or copy at +http://www.boost.org/LICENSE_1_0.txt) +*/ +#include "predef_check.h" diff --git a/check/predef_check_as_objc.m b/check/predef_check_as_objc.m index c58abe7..352c18b 100644 --- a/check/predef_check_as_objc.m +++ b/check/predef_check_as_objc.m @@ -1 +1,7 @@ -#include "predef_check_as_c.c" +/* +Copyright Rene Rivera 2011-2015 +Distributed under the Boost Software License, Version 1.0. +(See accompanying file LICENSE_1_0.txt or copy at +http://www.boost.org/LICENSE_1_0.txt) +*/ +#include "predef_check.h" diff --git a/check/predef_check_as_objcpp.mm b/check/predef_check_as_objcpp.mm index c58abe7..352c18b 100644 --- a/check/predef_check_as_objcpp.mm +++ b/check/predef_check_as_objcpp.mm @@ -1 +1,7 @@ -#include "predef_check_as_c.c" +/* +Copyright Rene Rivera 2011-2015 +Distributed under the Boost Software License, Version 1.0. +(See accompanying file LICENSE_1_0.txt or copy at +http://www.boost.org/LICENSE_1_0.txt) +*/ +#include "predef_check.h" diff --git a/include/boost/predef.h b/include/boost/predef.h index 753cd61..71b1913 100644 --- a/include/boost/predef.h +++ b/include/boost/predef.h @@ -1,12 +1,14 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ +#if !defined(BOOST_PREDEF_H) || defined(BOOST_PREDEF_INTERNAL_GENERATE_TESTS) #ifndef BOOST_PREDEF_H #define BOOST_PREDEF_H +#endif #include #include diff --git a/include/boost/predef/architecture.h b/include/boost/predef/architecture.h index b32701e..c433d43 100644 --- a/include/boost/predef/architecture.h +++ b/include/boost/predef/architecture.h @@ -1,12 +1,14 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ +#if !defined(BOOST_PREDEF_ARCHITECTURE_H) || defined(BOOST_PREDEF_INTERNAL_GENERATE_TESTS) #ifndef BOOST_PREDEF_ARCHITECTURE_H #define BOOST_PREDEF_ARCHITECTURE_H +#endif #include #include diff --git a/include/boost/predef/architecture/alpha.h b/include/boost/predef/architecture/alpha.h index 6365ec4..371b921 100644 --- a/include/boost/predef/architecture/alpha.h +++ b/include/boost/predef/architecture/alpha.h @@ -53,8 +53,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_ARCH_ALPHA_NAME "DEC Alpha" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_ALPHA,BOOST_ARCH_ALPHA_NAME) - - -#endif diff --git a/include/boost/predef/architecture/arm.h b/include/boost/predef/architecture/arm.h index 4974895..7b0c3c2 100644 --- a/include/boost/predef/architecture/arm.h +++ b/include/boost/predef/architecture/arm.h @@ -64,8 +64,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_ARCH_ARM_NAME "ARM" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_ARM,BOOST_ARCH_ARM_NAME) - - -#endif diff --git a/include/boost/predef/architecture/blackfin.h b/include/boost/predef/architecture/blackfin.h index ae3407e..166e6aa 100644 --- a/include/boost/predef/architecture/blackfin.h +++ b/include/boost/predef/architecture/blackfin.h @@ -40,8 +40,7 @@ Blackfin Processors from Analog Devices. #define BOOST_ARCH_BLACKFIN_NAME "Blackfin" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_BLACKFIN,BOOST_ARCH_BLACKFIN_NAME) - - -#endif diff --git a/include/boost/predef/architecture/convex.h b/include/boost/predef/architecture/convex.h index 3b425a0..0c4f4a2 100644 --- a/include/boost/predef/architecture/convex.h +++ b/include/boost/predef/architecture/convex.h @@ -59,9 +59,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_ARCH_CONVEX_NAME "Convex Computer" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_CONVEX,BOOST_ARCH_CONVEX_NAME) - - - -#endif diff --git a/include/boost/predef/architecture/ia64.h b/include/boost/predef/architecture/ia64.h index 4b5a103..8bccbc8 100644 --- a/include/boost/predef/architecture/ia64.h +++ b/include/boost/predef/architecture/ia64.h @@ -43,7 +43,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_ARCH_IA64_NAME "Intel Itanium 64" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_IA64,BOOST_ARCH_IA64_NAME) - -#endif diff --git a/include/boost/predef/architecture/m68k.h b/include/boost/predef/architecture/m68k.h index 09c3cd3..bf48ddb 100644 --- a/include/boost/predef/architecture/m68k.h +++ b/include/boost/predef/architecture/m68k.h @@ -76,8 +76,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_ARCH_M68K_NAME "Motorola 68k" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_M68K,BOOST_ARCH_M68K_NAME) - - -#endif diff --git a/include/boost/predef/architecture/mips.h b/include/boost/predef/architecture/mips.h index ae88428..e1a42fa 100644 --- a/include/boost/predef/architecture/mips.h +++ b/include/boost/predef/architecture/mips.h @@ -67,8 +67,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_ARCH_MIPS_NAME "MIPS" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_MIPS,BOOST_ARCH_MIPS_NAME) - - -#endif diff --git a/include/boost/predef/architecture/parisc.h b/include/boost/predef/architecture/parisc.h index e843dd2..06c7079 100644 --- a/include/boost/predef/architecture/parisc.h +++ b/include/boost/predef/architecture/parisc.h @@ -58,8 +58,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_ARCH_PARISC_NAME "HP/PA RISC" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_PARISC,BOOST_ARCH_PARISC_NAME) - - -#endif diff --git a/include/boost/predef/architecture/ppc.h b/include/boost/predef/architecture/ppc.h index cc743e7..3c1ae4f 100644 --- a/include/boost/predef/architecture/ppc.h +++ b/include/boost/predef/architecture/ppc.h @@ -66,8 +66,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_ARCH_PPC_NAME "PowerPC" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_PPC,BOOST_ARCH_PPC_NAME) - - -#endif diff --git a/include/boost/predef/architecture/pyramid.h b/include/boost/predef/architecture/pyramid.h index 26d5293..dfd8eb6 100644 --- a/include/boost/predef/architecture/pyramid.h +++ b/include/boost/predef/architecture/pyramid.h @@ -36,8 +36,7 @@ Pyramid 9810 architecture. #define BOOST_ARCH_PYRAMID_NAME "Pyramid 9810" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_PYRAMID,BOOST_ARCH_PYRAMID_NAME) - - -#endif diff --git a/include/boost/predef/architecture/rs6k.h b/include/boost/predef/architecture/rs6k.h index 20dd64b..9b37690 100644 --- a/include/boost/predef/architecture/rs6k.h +++ b/include/boost/predef/architecture/rs6k.h @@ -42,9 +42,6 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_ARCH_RS6000_NAME "RS/6000" -#include -BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_RS6000,BOOST_ARCH_RS6000_NAME) - #define BOOST_ARCH_PWR BOOST_ARCH_RS6000 #if BOOST_ARCH_PWR @@ -54,3 +51,6 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_RS6000,BOOST_ARCH_RS6000_NAME) #define BOOST_ARCH_PWR_NAME BOOST_ARCH_RS6000_NAME #endif + +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_RS6000,BOOST_ARCH_RS6000_NAME) diff --git a/include/boost/predef/architecture/sparc.h b/include/boost/predef/architecture/sparc.h index 9c91cda..d7580f5 100644 --- a/include/boost/predef/architecture/sparc.h +++ b/include/boost/predef/architecture/sparc.h @@ -48,8 +48,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_ARCH_SPARC_NAME "SPARC" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_SPARC,BOOST_ARCH_SPARC_NAME) - - -#endif diff --git a/include/boost/predef/architecture/superh.h b/include/boost/predef/architecture/superh.h index ef88242..cc8be65 100644 --- a/include/boost/predef/architecture/superh.h +++ b/include/boost/predef/architecture/superh.h @@ -61,8 +61,7 @@ If available versions \[1-5\] are specifically detected. #define BOOST_ARCH_SH_NAME "SuperH" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_SH,BOOST_ARCH_SH_NAME) - - -#endif diff --git a/include/boost/predef/architecture/sys370.h b/include/boost/predef/architecture/sys370.h index 507ee86..a51470a 100644 --- a/include/boost/predef/architecture/sys370.h +++ b/include/boost/predef/architecture/sys370.h @@ -37,8 +37,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_ARCH_SYS370_NAME "System/370" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_SYS370,BOOST_ARCH_SYS370_NAME) - - -#endif diff --git a/include/boost/predef/architecture/sys390.h b/include/boost/predef/architecture/sys390.h index 070117a..1b537f7 100644 --- a/include/boost/predef/architecture/sys390.h +++ b/include/boost/predef/architecture/sys390.h @@ -37,8 +37,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_ARCH_SYS390_NAME "System/390" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_SYS390,BOOST_ARCH_SYS390_NAME) - - -#endif diff --git a/include/boost/predef/architecture/x86.h b/include/boost/predef/architecture/x86.h index fa9a025..3a8d645 100644 --- a/include/boost/predef/architecture/x86.h +++ b/include/boost/predef/architecture/x86.h @@ -5,12 +5,12 @@ Distributed under the Boost Software License, Version 1.0. http://www.boost.org/LICENSE_1_0.txt) */ -#ifndef BOOST_PREDEF_ARCHITECTURE_X86_H -#define BOOST_PREDEF_ARCHITECTURE_X86_H - #include #include +#ifndef BOOST_PREDEF_ARCHITECTURE_X86_H +#define BOOST_PREDEF_ARCHITECTURE_X86_H + /*` [heading `BOOST_ARCH_X86`] @@ -32,7 +32,7 @@ a category to indicate that either `BOOST_ARCH_X86_32` or #define BOOST_ARCH_X86_NAME "Intel x86" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_X86,BOOST_ARCH_X86_NAME) - -#endif diff --git a/include/boost/predef/architecture/x86/32.h b/include/boost/predef/architecture/x86/32.h index b796f84..5fa1bbe 100644 --- a/include/boost/predef/architecture/x86/32.h +++ b/include/boost/predef/architecture/x86/32.h @@ -79,9 +79,9 @@ If available versions \[3-6\] are specifically detected. #define BOOST_ARCH_X86_32_NAME "Intel x86-32" -#include -BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_X86_32,BOOST_ARCH_X86_32_NAME) - #include #endif + +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_X86_32,BOOST_ARCH_X86_32_NAME) diff --git a/include/boost/predef/architecture/x86/64.h b/include/boost/predef/architecture/x86/64.h index a035c88..2524cdd 100644 --- a/include/boost/predef/architecture/x86/64.h +++ b/include/boost/predef/architecture/x86/64.h @@ -42,9 +42,9 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_ARCH_X86_64_NAME "Intel x86-64" -#include -BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_X86_64,BOOST_ARCH_X86_64_NAME) - #include #endif + +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_X86_64,BOOST_ARCH_X86_64_NAME) diff --git a/include/boost/predef/architecture/z.h b/include/boost/predef/architecture/z.h index 768f342..893c8c1 100644 --- a/include/boost/predef/architecture/z.h +++ b/include/boost/predef/architecture/z.h @@ -36,8 +36,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_ARCH_Z_NAME "z/Architecture" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_ARCH_Z,BOOST_ARCH_Z_NAME) - - -#endif diff --git a/include/boost/predef/compiler.h b/include/boost/predef/compiler.h index 12c4dfc..61a4c52 100644 --- a/include/boost/predef/compiler.h +++ b/include/boost/predef/compiler.h @@ -1,12 +1,14 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ +#if !defined(BOOST_PREDEF_COMPILER_H) || defined(BOOST_PREDEF_INTERNAL_GENERATE_TESTS) #ifndef BOOST_PREDEF_COMPILER_H #define BOOST_PREDEF_COMPILER_H +#endif #include #include diff --git a/include/boost/predef/compiler/borland.h b/include/boost/predef/compiler/borland.h index 01b5de7..89ec27c 100644 --- a/include/boost/predef/compiler/borland.h +++ b/include/boost/predef/compiler/borland.h @@ -52,6 +52,8 @@ Version number available as major, minor, and patch. #define BOOST_COMP_BORLAND_NAME "Borland C++" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_BORLAND,BOOST_COMP_BORLAND_NAME) @@ -59,6 +61,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_BORLAND,BOOST_COMP_BORLAND_NAME) #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_BORLAND_EMULATED,BOOST_COMP_BORLAND_NAME) #endif - - -#endif diff --git a/include/boost/predef/compiler/clang.h b/include/boost/predef/compiler/clang.h index 87dd033..28689ce 100644 --- a/include/boost/predef/compiler/clang.h +++ b/include/boost/predef/compiler/clang.h @@ -45,6 +45,8 @@ Version number available as major, minor, and patch. #define BOOST_COMP_CLANG_NAME "Clang" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_CLANG,BOOST_COMP_CLANG_NAME) @@ -52,6 +54,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_CLANG,BOOST_COMP_CLANG_NAME) #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_CLANG_EMULATED,BOOST_COMP_CLANG_NAME) #endif - - -#endif diff --git a/include/boost/predef/compiler/comeau.h b/include/boost/predef/compiler/comeau.h index 3862184..37c055b 100644 --- a/include/boost/predef/compiler/comeau.h +++ b/include/boost/predef/compiler/comeau.h @@ -50,6 +50,8 @@ Version number available as major, minor, and patch. #define BOOST_COMP_COMO_NAME "Comeau C++" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_COMO,BOOST_COMP_COMO_NAME) @@ -57,6 +59,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_COMO,BOOST_COMP_COMO_NAME) #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_COMO_EMULATED,BOOST_COMP_COMO_NAME) #endif - - -#endif diff --git a/include/boost/predef/compiler/compaq.h b/include/boost/predef/compiler/compaq.h index a922d17..c899cf4 100644 --- a/include/boost/predef/compiler/compaq.h +++ b/include/boost/predef/compiler/compaq.h @@ -55,6 +55,8 @@ Version number available as major, minor, and patch. #define BOOST_COMP_DEC_NAME "Compaq C/C++" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_DEC,BOOST_COMP_DEC_NAME) @@ -62,6 +64,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_DEC,BOOST_COMP_DEC_NAME) #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_DEC_EMULATED,BOOST_COMP_DEC_NAME) #endif - - -#endif diff --git a/include/boost/predef/compiler/diab.h b/include/boost/predef/compiler/diab.h index 2cba03b..ecb8294 100644 --- a/include/boost/predef/compiler/diab.h +++ b/include/boost/predef/compiler/diab.h @@ -45,6 +45,8 @@ Version number available as major, minor, and patch. #define BOOST_COMP_DIAB_NAME "Diab C/C++" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_DIAB,BOOST_COMP_DIAB_NAME) @@ -52,6 +54,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_DIAB,BOOST_COMP_DIAB_NAME) #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_DIAB_EMULATED,BOOST_COMP_DIAB_NAME) #endif - - -#endif diff --git a/include/boost/predef/compiler/digitalmars.h b/include/boost/predef/compiler/digitalmars.h index 2306a7e..d816214 100644 --- a/include/boost/predef/compiler/digitalmars.h +++ b/include/boost/predef/compiler/digitalmars.h @@ -45,6 +45,8 @@ Version number available as major, minor, and patch. #define BOOST_COMP_DMC_NAME "Digital Mars" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_DMC,BOOST_COMP_DMC_NAME) @@ -52,6 +54,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_DMC,BOOST_COMP_DMC_NAME) #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_DMC_EMULATED,BOOST_COMP_DMC_NAME) #endif - - -#endif diff --git a/include/boost/predef/compiler/dignus.h b/include/boost/predef/compiler/dignus.h index 33c3560..e02f9cc 100644 --- a/include/boost/predef/compiler/dignus.h +++ b/include/boost/predef/compiler/dignus.h @@ -45,6 +45,8 @@ Version number available as major, minor, and patch. #define BOOST_COMP_SYSC_NAME "Dignus Systems/C++" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_SYSC,BOOST_COMP_SYSC_NAME) @@ -52,6 +54,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_SYSC,BOOST_COMP_SYSC_NAME) #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_SYSC_EMULATED,BOOST_COMP_SYSC_NAME) #endif - - -#endif diff --git a/include/boost/predef/compiler/edg.h b/include/boost/predef/compiler/edg.h index d53a5ff..b6baeef 100644 --- a/include/boost/predef/compiler/edg.h +++ b/include/boost/predef/compiler/edg.h @@ -45,6 +45,8 @@ Version number available as major, minor, and patch. #define BOOST_COMP_EDG_NAME "EDG C++ Frontend" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_EDG,BOOST_COMP_EDG_NAME) @@ -52,6 +54,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_EDG,BOOST_COMP_EDG_NAME) #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_EDG_EMULATED,BOOST_COMP_EDG_NAME) #endif - - -#endif diff --git a/include/boost/predef/compiler/ekopath.h b/include/boost/predef/compiler/ekopath.h index 4d7dabe..4bebc60 100644 --- a/include/boost/predef/compiler/ekopath.h +++ b/include/boost/predef/compiler/ekopath.h @@ -46,6 +46,8 @@ Version number available as major, minor, and patch. #define BOOST_COMP_PATH_NAME "EKOpath" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_PATH,BOOST_COMP_PATH_NAME) @@ -53,6 +55,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_PATH,BOOST_COMP_PATH_NAME) #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_PATH_EMULATED,BOOST_COMP_PATH_NAME) #endif - - -#endif diff --git a/include/boost/predef/compiler/gcc.h b/include/boost/predef/compiler/gcc.h index 5b226bd..53fb646 100644 --- a/include/boost/predef/compiler/gcc.h +++ b/include/boost/predef/compiler/gcc.h @@ -57,6 +57,8 @@ Version number available as major, minor, and patch (if available). #define BOOST_COMP_GNUC_NAME "Gnu GCC C/C++" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_GNUC,BOOST_COMP_GNUC_NAME) @@ -64,6 +66,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_GNUC,BOOST_COMP_GNUC_NAME) #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_GNUC_EMULATED,BOOST_COMP_GNUC_NAME) #endif - - -#endif diff --git a/include/boost/predef/compiler/gcc_xml.h b/include/boost/predef/compiler/gcc_xml.h index ef55f5d..efbd1b1 100644 --- a/include/boost/predef/compiler/gcc_xml.h +++ b/include/boost/predef/compiler/gcc_xml.h @@ -42,6 +42,8 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_COMP_GCCXML_NAME "GCC XML" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_GCCXML,BOOST_COMP_GCCXML_NAME) @@ -49,5 +51,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_GCCXML,BOOST_COMP_GCCXML_NAME) #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_GCCXML_EMULATED,BOOST_COMP_GCCXML_NAME) #endif - -#endif diff --git a/include/boost/predef/compiler/greenhills.h b/include/boost/predef/compiler/greenhills.h index 462f57b..2f76ad7 100644 --- a/include/boost/predef/compiler/greenhills.h +++ b/include/boost/predef/compiler/greenhills.h @@ -55,6 +55,8 @@ Version number available as major, minor, and patch. #define BOOST_COMP_GHS_NAME "Green Hills C/C++" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_GHS,BOOST_COMP_GHS_NAME) @@ -62,6 +64,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_GHS,BOOST_COMP_GHS_NAME) #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_GHS_EMULATED,BOOST_COMP_GHS_NAME) #endif - - -#endif diff --git a/include/boost/predef/compiler/hp_acc.h b/include/boost/predef/compiler/hp_acc.h index 8cb7022..a727739 100644 --- a/include/boost/predef/compiler/hp_acc.h +++ b/include/boost/predef/compiler/hp_acc.h @@ -50,6 +50,8 @@ Version number available as major, minor, and patch. #define BOOST_COMP_HPACC_NAME "HP aC++" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_HPACC,BOOST_COMP_HPACC_NAME) @@ -57,6 +59,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_HPACC,BOOST_COMP_HPACC_NAME) #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_HPACC_EMULATED,BOOST_COMP_HPACC_NAME) #endif - - -#endif diff --git a/include/boost/predef/compiler/iar.h b/include/boost/predef/compiler/iar.h index dd6bc0e..04a056d 100644 --- a/include/boost/predef/compiler/iar.h +++ b/include/boost/predef/compiler/iar.h @@ -45,6 +45,8 @@ Version number available as major, minor, and patch. #define BOOST_COMP_IAR_NAME "IAR C/C++" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_IAR,BOOST_COMP_IAR_NAME) @@ -52,6 +54,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_IAR,BOOST_COMP_IAR_NAME) #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_IAR_EMULATED,BOOST_COMP_IAR_NAME) #endif - - -#endif diff --git a/include/boost/predef/compiler/ibm.h b/include/boost/predef/compiler/ibm.h index 1edc93c..9a1ba02 100644 --- a/include/boost/predef/compiler/ibm.h +++ b/include/boost/predef/compiler/ibm.h @@ -61,6 +61,8 @@ Version number available as major, minor, and patch. #define BOOST_COMP_IBM_NAME "IBM XL C/C++" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_IBM,BOOST_COMP_IBM_NAME) @@ -68,6 +70,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_IBM,BOOST_COMP_IBM_NAME) #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_IBM_EMULATED,BOOST_COMP_IBM_NAME) #endif - - -#endif diff --git a/include/boost/predef/compiler/intel.h b/include/boost/predef/compiler/intel.h index 60220c7..9cee0a5 100644 --- a/include/boost/predef/compiler/intel.h +++ b/include/boost/predef/compiler/intel.h @@ -54,6 +54,8 @@ Version number available as major, minor, and patch. #define BOOST_COMP_INTEL_NAME "Intel C/C++" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_INTEL,BOOST_COMP_INTEL_NAME) @@ -61,6 +63,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_INTEL,BOOST_COMP_INTEL_NAME) #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_INTEL_EMULATED,BOOST_COMP_INTEL_NAME) #endif - - -#endif diff --git a/include/boost/predef/compiler/kai.h b/include/boost/predef/compiler/kai.h index 4aadbe3..c68a6fd 100644 --- a/include/boost/predef/compiler/kai.h +++ b/include/boost/predef/compiler/kai.h @@ -45,6 +45,8 @@ Version number available as major, minor, and patch. #define BOOST_COMP_KCC_NAME "Kai C++" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_KCC,BOOST_COMP_KCC_NAME) @@ -52,6 +54,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_KCC,BOOST_COMP_KCC_NAME) #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_KCC_EMULATED,BOOST_COMP_KCC_NAME) #endif - - -#endif diff --git a/include/boost/predef/compiler/llvm.h b/include/boost/predef/compiler/llvm.h index c7e634c..340b3c7 100644 --- a/include/boost/predef/compiler/llvm.h +++ b/include/boost/predef/compiler/llvm.h @@ -46,6 +46,8 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_COMP_LLVM_NAME "LLVM" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_LLVM,BOOST_COMP_LLVM_NAME) @@ -53,6 +55,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_LLVM,BOOST_COMP_LLVM_NAME) #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_LLVM_EMULATED,BOOST_COMP_LLVM_NAME) #endif - - -#endif diff --git a/include/boost/predef/compiler/metaware.h b/include/boost/predef/compiler/metaware.h index 5e13de8..7bbc22c 100644 --- a/include/boost/predef/compiler/metaware.h +++ b/include/boost/predef/compiler/metaware.h @@ -42,6 +42,8 @@ MetaWare High C/C++ compiler. #define BOOST_COMP_HIGHC_NAME "MetaWare High C/C++" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_HIGHC,BOOST_COMP_HIGHC_NAME) @@ -49,6 +51,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_HIGHC,BOOST_COMP_HIGHC_NAME) #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_HIGHC_EMULATED,BOOST_COMP_HIGHC_NAME) #endif - - -#endif diff --git a/include/boost/predef/compiler/metrowerks.h b/include/boost/predef/compiler/metrowerks.h index 409282b..d6bd68b 100644 --- a/include/boost/predef/compiler/metrowerks.h +++ b/include/boost/predef/compiler/metrowerks.h @@ -66,6 +66,8 @@ Version number available as major, minor, and patch. #define BOOST_COMP_MWERKS_NAME "Metrowerks CodeWarrior" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_MWERKS,BOOST_COMP_MWERKS_NAME) @@ -73,6 +75,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_MWERKS,BOOST_COMP_MWERKS_NAME) #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_MWERKS_EMULATED,BOOST_COMP_MWERKS_NAME) #endif - - -#endif diff --git a/include/boost/predef/compiler/microtec.h b/include/boost/predef/compiler/microtec.h index 6bd6279..a311e35 100644 --- a/include/boost/predef/compiler/microtec.h +++ b/include/boost/predef/compiler/microtec.h @@ -42,6 +42,8 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_COMP_MRI_NAME "Microtec C/C++" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_MRI,BOOST_COMP_MRI_NAME) @@ -49,6 +51,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_MRI,BOOST_COMP_MRI_NAME) #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_MRI_EMULATED,BOOST_COMP_MRI_NAME) #endif - - -#endif diff --git a/include/boost/predef/compiler/mpw.h b/include/boost/predef/compiler/mpw.h index 3a48f6f..aa982b8 100644 --- a/include/boost/predef/compiler/mpw.h +++ b/include/boost/predef/compiler/mpw.h @@ -52,6 +52,8 @@ Version number available as major, and minor. #define BOOST_COMP_MPW_NAME "MPW C++" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_MPW,BOOST_COMP_MPW_NAME) @@ -59,6 +61,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_MPW,BOOST_COMP_MPW_NAME) #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_MPW_EMULATED,BOOST_COMP_MPW_NAME) #endif - - -#endif diff --git a/include/boost/predef/compiler/palm.h b/include/boost/predef/compiler/palm.h index eb1da97..5998d86 100644 --- a/include/boost/predef/compiler/palm.h +++ b/include/boost/predef/compiler/palm.h @@ -45,6 +45,8 @@ Version number available as major, minor, and patch. #define BOOST_COMP_PALM_NAME "Palm C/C++" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_PALM,BOOST_COMP_PALM_NAME) @@ -52,6 +54,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_PALM,BOOST_COMP_PALM_NAME) #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_PALM_EMULATED,BOOST_COMP_PALM_NAME) #endif - - -#endif diff --git a/include/boost/predef/compiler/pgi.h b/include/boost/predef/compiler/pgi.h index 563335f..df304f7 100644 --- a/include/boost/predef/compiler/pgi.h +++ b/include/boost/predef/compiler/pgi.h @@ -49,6 +49,8 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_COMP_PGI_NAME "Portland Group C/C++" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_PGI,BOOST_COMP_PGI_NAME) @@ -56,6 +58,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_PGI,BOOST_COMP_PGI_NAME) #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_PGI_EMULATED,BOOST_COMP_PGI_NAME) #endif - - -#endif diff --git a/include/boost/predef/compiler/sgi_mipspro.h b/include/boost/predef/compiler/sgi_mipspro.h index c212b19..9f44dd4 100644 --- a/include/boost/predef/compiler/sgi_mipspro.h +++ b/include/boost/predef/compiler/sgi_mipspro.h @@ -55,6 +55,8 @@ Version number available as major, minor, and patch. #define BOOST_COMP_SGI_NAME "SGI MIPSpro" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_SGI,BOOST_COMP_SGI_NAME) @@ -62,6 +64,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_SGI,BOOST_COMP_SGI_NAME) #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_SGI_EMULATED,BOOST_COMP_SGI_NAME) #endif - - -#endif diff --git a/include/boost/predef/compiler/sunpro.h b/include/boost/predef/compiler/sunpro.h index 79f3128..43498e2 100644 --- a/include/boost/predef/compiler/sunpro.h +++ b/include/boost/predef/compiler/sunpro.h @@ -65,6 +65,8 @@ Version number available as major, minor, and patch. #define BOOST_COMP_SUNPRO_NAME "Oracle Solaris Studio" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_SUNPRO,BOOST_COMP_SUNPRO_NAME) @@ -72,6 +74,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_SUNPRO,BOOST_COMP_SUNPRO_NAME) #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_SUNPRO_EMULATED,BOOST_COMP_SUNPRO_NAME) #endif - - -#endif diff --git a/include/boost/predef/compiler/tendra.h b/include/boost/predef/compiler/tendra.h index 194f0af..38f8da5 100644 --- a/include/boost/predef/compiler/tendra.h +++ b/include/boost/predef/compiler/tendra.h @@ -42,6 +42,8 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_COMP_TENDRA_NAME "TenDRA C/C++" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_TENDRA,BOOST_COMP_TENDRA_NAME) @@ -49,6 +51,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_TENDRA,BOOST_COMP_TENDRA_NAME) #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_TENDRA_EMULATED,BOOST_COMP_TENDRA_NAME) #endif - - -#endif diff --git a/include/boost/predef/compiler/visualc.h b/include/boost/predef/compiler/visualc.h index 959d38f..5e6f81e 100644 --- a/include/boost/predef/compiler/visualc.h +++ b/include/boost/predef/compiler/visualc.h @@ -80,6 +80,8 @@ Version number available as major, minor, and patch. #define BOOST_COMP_MSVC_NAME "Microsoft Visual C/C++" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_MSVC,BOOST_COMP_MSVC_NAME) @@ -87,6 +89,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_MSVC,BOOST_COMP_MSVC_NAME) #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_MSVC_EMULATED,BOOST_COMP_MSVC_NAME) #endif - - -#endif diff --git a/include/boost/predef/compiler/watcom.h b/include/boost/predef/compiler/watcom.h index 832d10c..958fae8 100644 --- a/include/boost/predef/compiler/watcom.h +++ b/include/boost/predef/compiler/watcom.h @@ -45,6 +45,8 @@ Version number available as major, and minor. #define BOOST_COMP_WATCOM_NAME "Watcom C++" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_WATCOM,BOOST_COMP_WATCOM_NAME) @@ -52,6 +54,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_WATCOM,BOOST_COMP_WATCOM_NAME) #include BOOST_PREDEF_DECLARE_TEST(BOOST_COMP_WATCOM_EMULATED,BOOST_COMP_WATCOM_NAME) #endif - - -#endif diff --git a/include/boost/predef/detail/test_def.h b/include/boost/predef/detail/test_def.h new file mode 100644 index 0000000..c2f195b --- /dev/null +++ b/include/boost/predef/detail/test_def.h @@ -0,0 +1,71 @@ +/* +Copyright Rene Rivera 2011-2015 +Distributed under the Boost Software License, Version 1.0. +(See accompanying file LICENSE_1_0.txt or copy at +http://www.boost.org/LICENSE_1_0.txt) +*/ +#include + +#define BOOST_PREDEF_INTERNAL_GENERATE_TESTS + +void * add_predef_entry(const char * name, const char * description, unsigned value); +#undef BOOST_PREDEF_DECLARE_TEST +#define BOOST_PREDEF_DECLARE_TEST(x,s) void predef_entry_##x() { add_predef_entry(#x, s, x); } +#include + +#undef BOOST_PREDEF_DECLARE_TEST +#define BOOST_PREDEF_DECLARE_TEST(x,s) predef_entry_##x(); +void create_predef_entries() +{ +#include +} + +#ifdef __cplusplus +#include +#include +#include +using namespace std; +#else +#include +#include +#include +#endif + +typedef struct predef_info +{ + const char * name; + const char * description; + unsigned value; +} predef_info; + +#ifdef __cplusplus +using namespace std; +#endif + +unsigned generated_predef_info_count = 0; +predef_info* generated_predef_info = 0; +void * add_predef_entry(const char * name, const char * description, unsigned value) +{ + if (0 == generated_predef_info_count) + { + generated_predef_info_count = 1; + generated_predef_info = (predef_info*)malloc(sizeof(predef_info)); + } + else + { + generated_predef_info_count += 1; + generated_predef_info = (predef_info*)realloc(generated_predef_info, + generated_predef_info_count*sizeof(predef_info)); + } + generated_predef_info[generated_predef_info_count-1].name = name; + generated_predef_info[generated_predef_info_count-1].description = description; + generated_predef_info[generated_predef_info_count-1].value = value; + return 0; +} + +int predef_info_compare(const void * a, const void * b) +{ + const predef_info * i = (const predef_info *)a; + const predef_info * j = (const predef_info *)b; + return strcmp(i->name,j->name); +} diff --git a/include/boost/predef/language.h b/include/boost/predef/language.h index c9251c5..0a317d5 100644 --- a/include/boost/predef/language.h +++ b/include/boost/predef/language.h @@ -1,12 +1,14 @@ /* -Copyright Rene Rivera 2011-2012 +Copyright Rene Rivera 2011-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ +#if !defined(BOOST_PREDEF_LANGUAGE_H) || defined(BOOST_PREDEF_INTERNAL_GENERATE_TESTS) #ifndef BOOST_PREDEF_LANGUAGE_H #define BOOST_PREDEF_LANGUAGE_H +#endif #include #include diff --git a/include/boost/predef/language/objc.h b/include/boost/predef/language/objc.h index 27a32b6..ce2f2ed 100644 --- a/include/boost/predef/language/objc.h +++ b/include/boost/predef/language/objc.h @@ -36,8 +36,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_LANG_OBJC_NAME "Objective-C" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_LANG_OBJC,BOOST_LANG_OBJC_NAME) - - -#endif diff --git a/include/boost/predef/language/stdc.h b/include/boost/predef/language/stdc.h index 59a4e0b..2df24a6 100644 --- a/include/boost/predef/language/stdc.h +++ b/include/boost/predef/language/stdc.h @@ -47,8 +47,7 @@ If available, the year of the standard is detected as YYYY.MM.1 from the Epoc da #define BOOST_LANG_STDC_NAME "Standard C" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_LANG_STDC,BOOST_LANG_STDC_NAME) - - -#endif diff --git a/include/boost/predef/language/stdcpp.h b/include/boost/predef/language/stdcpp.h index 693c67b..e8ee722 100644 --- a/include/boost/predef/language/stdcpp.h +++ b/include/boost/predef/language/stdcpp.h @@ -52,10 +52,6 @@ Specifically the defined versions are: #define BOOST_LANG_STDCPP_NAME "Standard C++" -#include -BOOST_PREDEF_DECLARE_TEST(BOOST_LANG_STDCPP,BOOST_LANG_STDCPP_NAME) - - /*` [heading `BOOST_LANG_STDCPPCLI`] @@ -88,10 +84,6 @@ If available, the year of the standard is detected as YYYY.MM.1 from the Epoc da #define BOOST_LANG_STDCPPCLI_NAME "Standard C++/CLI" -#include -BOOST_PREDEF_DECLARE_TEST(BOOST_LANG_STDCPPCLI,BOOST_LANG_STDCPPCLI_NAME) - - /*` [heading `BOOST_LANG_STDECPP`] @@ -117,8 +109,13 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_LANG_STDCPPCLI,BOOST_LANG_STDCPPCLI_NAME) #define BOOST_LANG_STDECPP_NAME "Standard Embedded C++" +#endif + +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_LANG_STDCPP,BOOST_LANG_STDCPP_NAME) + +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_LANG_STDCPPCLI,BOOST_LANG_STDCPPCLI_NAME) + #include BOOST_PREDEF_DECLARE_TEST(BOOST_LANG_STDECPP,BOOST_LANG_STDECPP_NAME) - - -#endif diff --git a/include/boost/predef/library.h b/include/boost/predef/library.h index a474323..40518a9 100644 --- a/include/boost/predef/library.h +++ b/include/boost/predef/library.h @@ -1,12 +1,14 @@ /* -Copyright Rene Rivera 2008-2012 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ +#if !defined(BOOST_PREDEF_LIBRARY_H) || defined(BOOST_PREDEF_INTERNAL_GENERATE_TESTS) #ifndef BOOST_PREDEF_LIBRARY_H #define BOOST_PREDEF_LIBRARY_H +#endif #include #include diff --git a/include/boost/predef/library/c.h b/include/boost/predef/library/c.h index 733e6a7..fa8841e 100644 --- a/include/boost/predef/library/c.h +++ b/include/boost/predef/library/c.h @@ -1,12 +1,14 @@ /* -Copyright Rene Rivera 2008-2012 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ +#if !defined(BOOST_PREDEF_LIBRARY_C_H) || defined(BOOST_PREDEF_INTERNAL_GENERATE_TESTS) #ifndef BOOST_PREDEF_LIBRARY_C_H #define BOOST_PREDEF_LIBRARY_C_H +#endif #include diff --git a/include/boost/predef/library/c/gnu.h b/include/boost/predef/library/c/gnu.h index 8ed9f76..223ae43 100644 --- a/include/boost/predef/library/c/gnu.h +++ b/include/boost/predef/library/c/gnu.h @@ -55,8 +55,7 @@ Version number available as major, and minor. #define BOOST_LIB_C_GNU_NAME "GNU" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_LIB_C_GNU,BOOST_LIB_C_GNU_NAME) - - -#endif diff --git a/include/boost/predef/library/c/uc.h b/include/boost/predef/library/c/uc.h index 8b47de1..8e4e505 100644 --- a/include/boost/predef/library/c/uc.h +++ b/include/boost/predef/library/c/uc.h @@ -41,8 +41,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_LIB_C_UC_NAME "uClibc" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_LIB_C_UC,BOOST_LIB_C_UC_NAME) - - -#endif diff --git a/include/boost/predef/library/c/vms.h b/include/boost/predef/library/c/vms.h index 0357d05..d5d8139 100644 --- a/include/boost/predef/library/c/vms.h +++ b/include/boost/predef/library/c/vms.h @@ -41,8 +41,7 @@ Version number available as major, minor, and patch. #define BOOST_LIB_C_VMS_NAME "VMS" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_LIB_C_VMS,BOOST_LIB_C_VMS_NAME) - - -#endif diff --git a/include/boost/predef/library/c/zos.h b/include/boost/predef/library/c/zos.h index 4c6f058..dfadaa1 100644 --- a/include/boost/predef/library/c/zos.h +++ b/include/boost/predef/library/c/zos.h @@ -50,8 +50,7 @@ Version number available as major, minor, and patch. #define BOOST_LIB_C_ZOS_NAME "z/OS" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_LIB_C_ZOS,BOOST_LIB_C_ZOS_NAME) - - -#endif diff --git a/include/boost/predef/library/std.h b/include/boost/predef/library/std.h index 9ab0a86..403b6ff 100644 --- a/include/boost/predef/library/std.h +++ b/include/boost/predef/library/std.h @@ -1,11 +1,13 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ +#if !defined(BOOST_PREDEF_LIBRARY_STD_H) || defined(BOOST_PREDEF_INTERNAL_GENERATE_TESTS) #ifndef BOOST_PREDEF_LIBRARY_STD_H #define BOOST_PREDEF_LIBRARY_STD_H +#endif #include diff --git a/include/boost/predef/library/std/cxx.h b/include/boost/predef/library/std/cxx.h index 1d0cf5f..658a997 100644 --- a/include/boost/predef/library/std/cxx.h +++ b/include/boost/predef/library/std/cxx.h @@ -40,8 +40,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_LIB_STD_CXX_NAME "libc++" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_LIB_STD_CXX,BOOST_LIB_STD_CXX_NAME) - - -#endif diff --git a/include/boost/predef/library/std/dinkumware.h b/include/boost/predef/library/std/dinkumware.h index 394e866..83f759d 100644 --- a/include/boost/predef/library/std/dinkumware.h +++ b/include/boost/predef/library/std/dinkumware.h @@ -46,8 +46,7 @@ If available version number as major, minor, and patch. #define BOOST_LIB_STD_DINKUMWARE_NAME "Dinkumware" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_LIB_STD_DINKUMWARE,BOOST_LIB_STD_DINKUMWARE_NAME) - - -#endif diff --git a/include/boost/predef/library/std/libcomo.h b/include/boost/predef/library/std/libcomo.h index 41bbe67..6b8ebaa 100644 --- a/include/boost/predef/library/std/libcomo.h +++ b/include/boost/predef/library/std/libcomo.h @@ -41,8 +41,7 @@ Version number available as major. #define BOOST_LIB_STD_COMO_NAME "Comeau Computing" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_LIB_STD_COMO,BOOST_LIB_STD_COMO_NAME) - - -#endif diff --git a/include/boost/predef/library/std/modena.h b/include/boost/predef/library/std/modena.h index fa7c061..1ec0022 100644 --- a/include/boost/predef/library/std/modena.h +++ b/include/boost/predef/library/std/modena.h @@ -39,8 +39,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_LIB_STD_MSIPL_NAME "Modena Software Lib++" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_LIB_STD_MSIPL,BOOST_LIB_STD_MSIPL_NAME) - - -#endif diff --git a/include/boost/predef/library/std/msl.h b/include/boost/predef/library/std/msl.h index 16ddec6..94a5ac6 100644 --- a/include/boost/predef/library/std/msl.h +++ b/include/boost/predef/library/std/msl.h @@ -47,8 +47,7 @@ Version number available as major, minor, and patch. #define BOOST_LIB_STD_MSL_NAME "Metrowerks" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_LIB_STD_MSL,BOOST_LIB_STD_MSL_NAME) - - -#endif diff --git a/include/boost/predef/library/std/roguewave.h b/include/boost/predef/library/std/roguewave.h index 38471d0..dcea39f 100644 --- a/include/boost/predef/library/std/roguewave.h +++ b/include/boost/predef/library/std/roguewave.h @@ -50,8 +50,7 @@ If available version number as major, minor, and patch. #define BOOST_LIB_STD_RW_NAME "Roguewave" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_LIB_STD_RW,BOOST_LIB_STD_RW_NAME) - - -#endif diff --git a/include/boost/predef/library/std/sgi.h b/include/boost/predef/library/std/sgi.h index 16f0db1..96e6a33 100644 --- a/include/boost/predef/library/std/sgi.h +++ b/include/boost/predef/library/std/sgi.h @@ -45,8 +45,7 @@ If available version number as major, minor, and patch. #define BOOST_LIB_STD_SGI_NAME "SGI" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_LIB_STD_SGI,BOOST_LIB_STD_SGI_NAME) - - -#endif diff --git a/include/boost/predef/library/std/stdcpp3.h b/include/boost/predef/library/std/stdcpp3.h index 19ebc86..255bdbc 100644 --- a/include/boost/predef/library/std/stdcpp3.h +++ b/include/boost/predef/library/std/stdcpp3.h @@ -47,8 +47,7 @@ Version number available as year (from 1970), month, and day. #define BOOST_LIB_STD_GNU_NAME "GNU" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_LIB_STD_GNU,BOOST_LIB_STD_GNU_NAME) - - -#endif diff --git a/include/boost/predef/library/std/stlport.h b/include/boost/predef/library/std/stlport.h index 1b6cebb..8c89882 100644 --- a/include/boost/predef/library/std/stlport.h +++ b/include/boost/predef/library/std/stlport.h @@ -53,8 +53,7 @@ Version number available as major, minor, and patch. #define BOOST_LIB_STD_STLPORT_NAME "STLport" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_LIB_STD_STLPORT,BOOST_LIB_STD_STLPORT_NAME) - - -#endif diff --git a/include/boost/predef/library/std/vacpp.h b/include/boost/predef/library/std/vacpp.h index 1c259c5..d7102d1 100644 --- a/include/boost/predef/library/std/vacpp.h +++ b/include/boost/predef/library/std/vacpp.h @@ -38,8 +38,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_LIB_STD_IBM_NAME "IBM VACPP" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_LIB_STD_IBM,BOOST_LIB_STD_IBM_NAME) - - -#endif diff --git a/include/boost/predef/os.h b/include/boost/predef/os.h index abd6666..bedf99e 100644 --- a/include/boost/predef/os.h +++ b/include/boost/predef/os.h @@ -1,13 +1,15 @@ /* -Copyright Rene Rivera 2008-2012 +Copyright Rene Rivera 2008-2015 Copyright Franz Detro 2014 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ +#if !defined(BOOST_PREDEF_OS_H) || defined(BOOST_PREDEF_INTERNAL_GENERATE_TESTS) #ifndef BOOST_PREDEF_OS_H #define BOOST_PREDEF_OS_H +#endif #include #include diff --git a/include/boost/predef/os/aix.h b/include/boost/predef/os/aix.h index 07523c8..308e35d 100644 --- a/include/boost/predef/os/aix.h +++ b/include/boost/predef/os/aix.h @@ -60,8 +60,7 @@ Version number available as major, minor, and patch. #define BOOST_OS_AIX_NAME "IBM AIX" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_OS_AIX,BOOST_OS_AIX_NAME) - - -#endif diff --git a/include/boost/predef/os/amigaos.h b/include/boost/predef/os/amigaos.h index fae2408..11fe19f 100644 --- a/include/boost/predef/os/amigaos.h +++ b/include/boost/predef/os/amigaos.h @@ -40,8 +40,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_OS_AMIGAOS_NAME "AmigaOS" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_OS_AMIGAOS,BOOST_OS_AMIGAOS_NAME) - - -#endif diff --git a/include/boost/predef/os/android.h b/include/boost/predef/os/android.h index 0de5870..c0d8119 100644 --- a/include/boost/predef/os/android.h +++ b/include/boost/predef/os/android.h @@ -39,8 +39,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_OS_ANDROID_NAME "Android" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_OS_ANDROID,BOOST_OS_ANDROID_NAME) - - -#endif diff --git a/include/boost/predef/os/beos.h b/include/boost/predef/os/beos.h index 7a92b94..8a8bc4b 100644 --- a/include/boost/predef/os/beos.h +++ b/include/boost/predef/os/beos.h @@ -39,8 +39,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_OS_BEOS_NAME "BeOS" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_OS_BEOS,BOOST_OS_BEOS_NAME) - - -#endif diff --git a/include/boost/predef/os/bsd.h b/include/boost/predef/os/bsd.h index f370f56..226eb3e 100644 --- a/include/boost/predef/os/bsd.h +++ b/include/boost/predef/os/bsd.h @@ -89,7 +89,15 @@ of BSD. If the above variants is detected the corresponding macro is also set.] #define BOOST_OS_BSD_NAME "BSD" -#include -BOOST_PREDEF_DECLARE_TEST(BOOST_OS_BSD,BOOST_OS_BSD_NAME) +#else + +#include +#include +#include +#include +#include #endif + +#include +BOOST_PREDEF_DECLARE_TEST(BOOST_OS_BSD,BOOST_OS_BSD_NAME) diff --git a/include/boost/predef/os/bsd/bsdi.h b/include/boost/predef/os/bsd/bsdi.h index cb57e1b..e2f738a 100644 --- a/include/boost/predef/os/bsd/bsdi.h +++ b/include/boost/predef/os/bsd/bsdi.h @@ -42,7 +42,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_OS_BSD_BSDI_NAME "BSDi BSD/OS" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_OS_BSD_BSDI,BOOST_OS_BSD_BSDI_NAME) - -#endif diff --git a/include/boost/predef/os/bsd/dragonfly.h b/include/boost/predef/os/bsd/dragonfly.h index 202f8a1..aacda9a 100644 --- a/include/boost/predef/os/bsd/dragonfly.h +++ b/include/boost/predef/os/bsd/dragonfly.h @@ -44,7 +44,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_OS_BSD_DRAGONFLY_NAME "DragonFly BSD" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_OS_BSD_DRAGONFLY,BOOST_OS_BSD_DRAGONFLY_NAME) - -#endif diff --git a/include/boost/predef/os/bsd/free.h b/include/boost/predef/os/bsd/free.h index 404e8ed..cfdfc97 100644 --- a/include/boost/predef/os/bsd/free.h +++ b/include/boost/predef/os/bsd/free.h @@ -54,7 +54,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_OS_BSD_FREE_NAME "Free BSD" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_OS_BSD_FREE,BOOST_OS_BSD_FREE_NAME) - -#endif diff --git a/include/boost/predef/os/bsd/net.h b/include/boost/predef/os/bsd/net.h index dcc4131..5e38bf0 100644 --- a/include/boost/predef/os/bsd/net.h +++ b/include/boost/predef/os/bsd/net.h @@ -78,7 +78,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_OS_BSD_NET_NAME "DragonFly BSD" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_OS_BSD_NET,BOOST_OS_BSD_NET_NAME) - -#endif diff --git a/include/boost/predef/os/bsd/open.h b/include/boost/predef/os/bsd/open.h index e81ebc6..5ed6c8f 100644 --- a/include/boost/predef/os/bsd/open.h +++ b/include/boost/predef/os/bsd/open.h @@ -165,7 +165,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_OS_BSD_OPEN_NAME "OpenBSD" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_OS_BSD_OPEN,BOOST_OS_BSD_OPEN_NAME) - -#endif diff --git a/include/boost/predef/os/cygwin.h b/include/boost/predef/os/cygwin.h index 04ee399..9b1d5d7 100644 --- a/include/boost/predef/os/cygwin.h +++ b/include/boost/predef/os/cygwin.h @@ -39,8 +39,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_OS_CYGWIN_NAME "Cygwin" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_OS_CYGWIN,BOOST_OS_CYGWIN_NAME) - - -#endif diff --git a/include/boost/predef/os/haiku.h b/include/boost/predef/os/haiku.h index 4d741cf..17ed382 100644 --- a/include/boost/predef/os/haiku.h +++ b/include/boost/predef/os/haiku.h @@ -40,8 +40,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_OS_HAIKU_NAME "Haiku" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_OS_HAIKU,BOOST_OS_HAIKU_NAME) - - -#endif diff --git a/include/boost/predef/os/hpux.h b/include/boost/predef/os/hpux.h index 946196f..b4da30d 100644 --- a/include/boost/predef/os/hpux.h +++ b/include/boost/predef/os/hpux.h @@ -41,8 +41,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_OS_HPUX_NAME "HP-UX" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_OS_HPUX,BOOST_OS_HPUX_NAME) - - -#endif diff --git a/include/boost/predef/os/ios.h b/include/boost/predef/os/ios.h index b83a9db..d07513d 100644 --- a/include/boost/predef/os/ios.h +++ b/include/boost/predef/os/ios.h @@ -44,8 +44,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_OS_IOS_NAME "iOS" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_OS_IOS,BOOST_OS_IOS_NAME) - - -#endif diff --git a/include/boost/predef/os/irix.h b/include/boost/predef/os/irix.h index a9e63b8..35cf0b3 100644 --- a/include/boost/predef/os/irix.h +++ b/include/boost/predef/os/irix.h @@ -40,8 +40,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_OS_IRIX_NAME "IRIX" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_OS_IRIX,BOOST_OS_IRIX_NAME) - - -#endif diff --git a/include/boost/predef/os/linux.h b/include/boost/predef/os/linux.h index b436e3f..ed47b9b 100644 --- a/include/boost/predef/os/linux.h +++ b/include/boost/predef/os/linux.h @@ -40,8 +40,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_OS_LINUX_NAME "Linux" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_OS_LINUX,BOOST_OS_LINUX_NAME) - - -#endif diff --git a/include/boost/predef/os/macos.h b/include/boost/predef/os/macos.h index cdcf2cb..a686ce4 100644 --- a/include/boost/predef/os/macos.h +++ b/include/boost/predef/os/macos.h @@ -59,8 +59,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_OS_MACOS_NAME "Mac OS" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_OS_MACOS,BOOST_OS_MACOS_NAME) - - -#endif diff --git a/include/boost/predef/os/os400.h b/include/boost/predef/os/os400.h index f7aacf5..b26e56c 100644 --- a/include/boost/predef/os/os400.h +++ b/include/boost/predef/os/os400.h @@ -39,8 +39,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_OS_OS400_NAME "IBM OS/400" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_OS_OS400,BOOST_OS_OS400_NAME) - - -#endif diff --git a/include/boost/predef/os/qnxnto.h b/include/boost/predef/os/qnxnto.h index dff536f..7d444f7 100644 --- a/include/boost/predef/os/qnxnto.h +++ b/include/boost/predef/os/qnxnto.h @@ -53,8 +53,7 @@ version 4 is specifically detected. #define BOOST_OS_QNX_NAME "QNX" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_OS_QNX,BOOST_OS_QNX_NAME) - - -#endif diff --git a/include/boost/predef/os/solaris.h b/include/boost/predef/os/solaris.h index 4d47dfe..7e71c31 100644 --- a/include/boost/predef/os/solaris.h +++ b/include/boost/predef/os/solaris.h @@ -40,8 +40,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_OS_SOLARIS_NAME "Solaris" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_OS_SOLARIS,BOOST_OS_SOLARIS_NAME) - - -#endif diff --git a/include/boost/predef/os/unix.h b/include/boost/predef/os/unix.h index 3636dda..38b4652 100644 --- a/include/boost/predef/os/unix.h +++ b/include/boost/predef/os/unix.h @@ -69,8 +69,8 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_OS_SVR4_NAME "SVR4 Environment" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_OS_UNIX,BOOST_OS_UNIX_NAME) BOOST_PREDEF_DECLARE_TEST(BOOST_OS_SVR4,BOOST_OS_SVR4_NAME) - -#endif diff --git a/include/boost/predef/os/vms.h b/include/boost/predef/os/vms.h index 3d34f63..13cde57 100644 --- a/include/boost/predef/os/vms.h +++ b/include/boost/predef/os/vms.h @@ -46,8 +46,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_OS_VMS_NAME "VMS" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_OS_VMS,BOOST_OS_VMS_NAME) - - -#endif diff --git a/include/boost/predef/os/windows.h b/include/boost/predef/os/windows.h index 9072539..2dd94be 100644 --- a/include/boost/predef/os/windows.h +++ b/include/boost/predef/os/windows.h @@ -45,7 +45,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_OS_WINDOWS_NAME "Microsoft Windows" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_OS_WINDOWS,BOOST_OS_WINDOWS_NAME) - -#endif diff --git a/include/boost/predef/other.h b/include/boost/predef/other.h index 04aad16..c09ad49 100644 --- a/include/boost/predef/other.h +++ b/include/boost/predef/other.h @@ -1,12 +1,14 @@ /* -Copyright Rene Rivera 2013 +Copyright Rene Rivera 2013-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ +#if !defined(BOOST_PREDEF_OTHER_H) || defined(BOOST_PREDEF_INTERNAL_GENERATE_TESTS) #ifndef BOOST_PREDEF_OTHER_H #define BOOST_PREDEF_OTHER_H +#endif #include /*#include */ diff --git a/include/boost/predef/other/endian.h b/include/boost/predef/other/endian.h index 048cc5d..d1d9ff1 100644 --- a/include/boost/predef/other/endian.h +++ b/include/boost/predef/other/endian.h @@ -189,6 +189,8 @@ information and acquired knowledge: #define BOOST_ENDIAN_LITTLE_BYTE_NAME "Byte-Swapped Little-Endian" #define BOOST_ENDIAN_LITTLE_WORD_NAME "Word-Swapped Little-Endian" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_ENDIAN_BIG_BYTE,BOOST_ENDIAN_BIG_BYTE_NAME) @@ -200,6 +202,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_ENDIAN_LITTLE_BYTE,BOOST_ENDIAN_LITTLE_BYTE_NAME #include BOOST_PREDEF_DECLARE_TEST(BOOST_ENDIAN_LITTLE_WORD,BOOST_ENDIAN_LITTLE_WORD_NAME) - - -#endif diff --git a/include/boost/predef/platform.h b/include/boost/predef/platform.h index 468a90d..c0c8706 100644 --- a/include/boost/predef/platform.h +++ b/include/boost/predef/platform.h @@ -1,13 +1,15 @@ /* -Copyright Rene Rivera 2013 +Copyright Rene Rivera 2013-2015 Copyright (c) Microsoft Corporation 2014 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ +#if !defined(BOOST_PREDEF_PLATFORM_H) || defined(BOOST_PREDEF_INTERNAL_GENERATE_TESTS) #ifndef BOOST_PREDEF_PLATFORM_H #define BOOST_PREDEF_PLATFORM_H +#endif #include #include diff --git a/include/boost/predef/platform/mingw.h b/include/boost/predef/platform/mingw.h index 6c8d873..d7f8e3f 100644 --- a/include/boost/predef/platform/mingw.h +++ b/include/boost/predef/platform/mingw.h @@ -58,6 +58,8 @@ Version number available as major, minor, and patch. #define BOOST_PLAT_MINGW_NAME "MinGW" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_PLAT_MINGW,BOOST_PLAT_MINGW_NAME) @@ -65,6 +67,3 @@ BOOST_PREDEF_DECLARE_TEST(BOOST_PLAT_MINGW,BOOST_PLAT_MINGW_NAME) #include BOOST_PREDEF_DECLARE_TEST(BOOST_PLAT_MINGW_EMULATED,BOOST_PLAT_MINGW_NAME) #endif - - -#endif diff --git a/include/boost/predef/platform/windows_desktop.h b/include/boost/predef/platform/windows_desktop.h index 286c273..7bb847e 100644 --- a/include/boost/predef/platform/windows_desktop.h +++ b/include/boost/predef/platform/windows_desktop.h @@ -38,7 +38,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_PLAT_WINDOWS_DESKTOP_NAME "Windows Desktop" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_PLAT_WINDOWS_DESKTOP,BOOST_PLAT_WINDOWS_DESKTOP_NAME) - -#endif diff --git a/include/boost/predef/platform/windows_phone.h b/include/boost/predef/platform/windows_phone.h index cdf79d1..be488af 100644 --- a/include/boost/predef/platform/windows_phone.h +++ b/include/boost/predef/platform/windows_phone.h @@ -36,7 +36,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_PLAT_WINDOWS_PHONE_NAME "Windows Phone" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_PLAT_WINDOWS_PHONE,BOOST_PLAT_WINDOWS_PHONE_NAME) - -#endif diff --git a/include/boost/predef/platform/windows_runtime.h b/include/boost/predef/platform/windows_runtime.h index 1444938..5c4da63 100644 --- a/include/boost/predef/platform/windows_runtime.h +++ b/include/boost/predef/platform/windows_runtime.h @@ -38,7 +38,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_PLAT_WINDOWS_RUNTIME_NAME "Windows Runtime" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_PLAT_WINDOWS_RUNTIME,BOOST_PLAT_WINDOWS_RUNTIME_NAME) - -#endif diff --git a/include/boost/predef/platform/windows_store.h b/include/boost/predef/platform/windows_store.h index 0487c0f..9330f5d 100644 --- a/include/boost/predef/platform/windows_store.h +++ b/include/boost/predef/platform/windows_store.h @@ -36,7 +36,7 @@ http://www.boost.org/LICENSE_1_0.txt) #define BOOST_PLAT_WINDOWS_STORE_NAME "Windows Store" +#endif + #include BOOST_PREDEF_DECLARE_TEST(BOOST_PLAT_WINDOWS_STORE,BOOST_PLAT_WINDOWS_STORE_NAME) - -#endif diff --git a/test/info_as_c.c b/test/info_as_c.c index ba84947..44f7e8d 100644 --- a/test/info_as_c.c +++ b/test/info_as_c.c @@ -1,76 +1,7 @@ /* -Copyright Rene Rivera 2011-2012 +Copyright Rene Rivera 2011-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ -#include -#include -#include - -#define BOOST_PREDEF_INTERNAL_GENERATE_TESTS - -typedef struct predef_info -{ - unsigned tag; - const char * name; - const char * description; - unsigned value; -} predef_info; - -predef_info first_predef_info = { 0x43210DEF , "-" , "-" , 0xFFFFFFFF }; - -#define BOOST_PREDEF_DECLARE_TEST(x,s) \ - predef_info x##_predef_info = { 0x67890DEF , #x , s , x }; -#include - -predef_info last_predef_info = { 0xFFFFFFFF , "-" , "-" , 0x43210DEF }; - -int predef_info_compare(const void * a, const void * b) -{ - const predef_info ** i = (const predef_info **)a; - const predef_info ** j = (const predef_info **)b; - return strcmp((*i)->name,(*j)->name); -} - -int main() -{ - unsigned x = 0; - predef_info ** predefs = 0; - unsigned predef_count = 0; - unsigned * i = &first_predef_info.tag; - unsigned * e = &last_predef_info.tag; - while (i < e) - { - i += 1; - if (*i == 0x67890DEF) - { - predef_count += 1; - predefs = (predef_info**)realloc(predefs,predef_count*sizeof(predef_info*)); - predefs[predef_count-1] = (predef_info*)i; - } - } - qsort(predefs,predef_count,sizeof(predef_info*),predef_info_compare); - puts("** Detected **"); - for (x = 0; x < predef_count; ++x) - { - if (predefs[x]->value > 0) - printf("%s = %u (%u,%u,%u) | %s\n", - predefs[x]->name, - predefs[x]->value, - (predefs[x]->value/10000000)%100, - (predefs[x]->value/100000)%100, - (predefs[x]->value)%100000, - predefs[x]->description); - } - puts("** Not Detected **"); - for (x = 0; x < predef_count; ++x) - { - if (predefs[x]->value == 0) - printf("%s = %u | %s\n", - predefs[x]->name, - predefs[x]->value, - predefs[x]->description); - } - return 0; -} +#include "predef_info.h" diff --git a/test/info_as_cpp.cpp b/test/info_as_cpp.cpp index e484312..44f7e8d 100644 --- a/test/info_as_cpp.cpp +++ b/test/info_as_cpp.cpp @@ -1,90 +1,7 @@ /* -Copyright Rene Rivera 2011-2012 +Copyright Rene Rivera 2011-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ -#include -#include -#include - -#define BOOST_PREDEF_INTERNAL_GENERATE_TESTS - -namespace -{ - struct predef_info - { - std::string name; - std::string description; - unsigned value; - - predef_info( - std::string const & n, - std::string const & d, - unsigned v); - - predef_info( - predef_info const & other) - : name(other.name) - , description(other.description) - , value(other.value) - { - } - - bool operator < (predef_info const & other) const - { - return name < other.name; - } - }; - - std::set * predefs = 0; - - predef_info::predef_info( - std::string const & n, - std::string const & d, - unsigned v) - : name(n) - , description(d) - , value(v) - { - if (!predefs) - { - predefs = new std::set(); - } - predefs->insert(*this); - } -} - -#define BOOST_PREDEF_DECLARE_TEST(x,s) \ - namespace { \ - predef_info x##_predef_init(#x,s,x); \ - } -#include - -int main() -{ - std::set::iterator i; - std::set::iterator e = predefs->end(); - std::cout << "** Detected **" << std::endl; - for (i = predefs->begin(); i != e; ++i) - { - if (i->value > 0) - std::cout - << i->name << " = " - << i->value - << " (" << (i->value/10000000)%100 << "," << (i->value/100000)%100 << "," << (i->value)%100000 << ") | " - << i->description - << std::endl; - } - std::cout << "** Not Detected **" << std::endl; - for (i = predefs->begin(); i != e; ++i) - { - if (i->value == 0) - std::cout - << i->name << " = " - << i->value << " | " - << i->description - << std::endl; - } - return 0; -} +#include "predef_info.h" diff --git a/test/info_as_objc.m b/test/info_as_objc.m index 79dc80f..44f7e8d 100644 --- a/test/info_as_objc.m +++ b/test/info_as_objc.m @@ -1,7 +1,7 @@ /* -Copyright Rene Rivera 2011 +Copyright Rene Rivera 2011-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ -#include "info_as_c.c" +#include "predef_info.h" diff --git a/test/info_as_objcpp.mm b/test/info_as_objcpp.mm index 5d8c92a..44f7e8d 100644 --- a/test/info_as_objcpp.mm +++ b/test/info_as_objcpp.mm @@ -1,7 +1,7 @@ /* -Copyright Rene Rivera 2011 +Copyright Rene Rivera 2011-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ -#include "info_as_cpp.cpp" +#include "predef_info.h" diff --git a/test/predef_info.h b/test/predef_info.h new file mode 100644 index 0000000..2adb638 --- /dev/null +++ b/test/predef_info.h @@ -0,0 +1,46 @@ +/* +Copyright Rene Rivera 2011-2015 +Distributed under the Boost Software License, Version 1.0. +(See accompanying file LICENSE_1_0.txt or copy at +http://www.boost.org/LICENSE_1_0.txt) +*/ +#include + +int main(int argc, const char ** argv) +{ + unsigned x = 0; + create_predef_entries(); + qsort(generated_predef_info,generated_predef_info_count, + sizeof(predef_info),predef_info_compare); + /* + for (x = 0; x < generated_predef_info_count; ++x) + { + printf("%s: %d\n", generated_predef_info[x].name, generated_predef_info[x].value); + } + */ + puts("** Detected **"); + for (x = 0; x < generated_predef_info_count; ++x) + { + if (generated_predef_info[x].value > 0) + printf("%s = %u (%u,%u,%u) | %s\n", + generated_predef_info[x].name, + generated_predef_info[x].value, + (generated_predef_info[x].value/10000000)%100, + (generated_predef_info[x].value/100000)%100, + (generated_predef_info[x].value)%100000, + generated_predef_info[x].description); + } + puts("** Not Detected **"); + for (x = 0; x < generated_predef_info_count; ++x) + { + if (generated_predef_info[x].value == 0) + printf("%s = %u | %s\n", + generated_predef_info[x].name, + generated_predef_info[x].value, + generated_predef_info[x].description); + } + if (generated_predef_info_count > 0) + return 0; + else + return 1; +} From a3dffe8f1a24ddc45905f408501b8855d3d71715 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Wed, 1 Jul 2015 17:19:29 -0500 Subject: [PATCH 51/53] Update docs for check utility changes and for 1.3 release. Bump versions for release of 1.3. Update copyrights that I forgot on the previous commits. --- doc/history.qbk | 9 +++++ doc/html/boostbook.css | 16 ++++++++ doc/html/index.html | 11 +++--- doc/html/predef/acknoledgements.html | 7 ++-- doc/html/predef/adding_new_predefs.html | 7 ++-- doc/html/predef/check_utilities.html | 20 ++++++++-- doc/html/predef/history.html | 37 +++++++++++++++++-- doc/html/predef/introduction.html | 9 +++-- doc/html/predef/reference.html | 7 ++-- .../boost_arch_architecture_macros.html | 5 ++- .../reference/boost_comp_compiler_macros.html | 33 +++++++++++++++-- .../boost_lang_language_standards_ma.html | 5 ++- .../reference/boost_lib_library_macros.html | 5 ++- .../boost_os_operating_system_macros.html | 5 ++- .../reference/boost_plat_platform_macros.html | 5 ++- doc/html/predef/reference/other_macros.html | 5 ++- .../reference/version_definition_macros.html | 5 ++- doc/html/predef/to_do.html | 7 ++-- doc/html/predef/using_the_predefs.html | 7 ++-- doc/predef.qbk | 19 +++++++++- include/boost/predef.h | 2 + include/boost/predef/architecture/alpha.h | 2 +- include/boost/predef/architecture/arm.h | 2 +- include/boost/predef/architecture/blackfin.h | 2 +- include/boost/predef/architecture/convex.h | 2 +- include/boost/predef/architecture/ia64.h | 2 +- include/boost/predef/architecture/m68k.h | 2 +- include/boost/predef/architecture/mips.h | 2 +- include/boost/predef/architecture/parisc.h | 2 +- include/boost/predef/architecture/ppc.h | 2 +- include/boost/predef/architecture/pyramid.h | 2 +- include/boost/predef/architecture/rs6k.h | 2 +- include/boost/predef/architecture/sparc.h | 2 +- include/boost/predef/architecture/superh.h | 2 +- include/boost/predef/architecture/sys370.h | 2 +- include/boost/predef/architecture/sys390.h | 2 +- include/boost/predef/architecture/x86.h | 2 +- include/boost/predef/architecture/x86/32.h | 2 +- include/boost/predef/architecture/x86/64.h | 2 +- include/boost/predef/architecture/z.h | 2 +- include/boost/predef/compiler/borland.h | 2 +- include/boost/predef/compiler/clang.h | 2 +- include/boost/predef/compiler/comeau.h | 2 +- include/boost/predef/compiler/compaq.h | 2 +- include/boost/predef/compiler/diab.h | 2 +- include/boost/predef/compiler/digitalmars.h | 2 +- include/boost/predef/compiler/dignus.h | 2 +- include/boost/predef/compiler/edg.h | 2 +- include/boost/predef/compiler/ekopath.h | 2 +- include/boost/predef/compiler/gcc.h | 2 +- include/boost/predef/compiler/gcc_xml.h | 2 +- include/boost/predef/compiler/greenhills.h | 2 +- include/boost/predef/compiler/hp_acc.h | 2 +- include/boost/predef/compiler/iar.h | 2 +- include/boost/predef/compiler/ibm.h | 2 +- include/boost/predef/compiler/intel.h | 2 +- include/boost/predef/compiler/kai.h | 2 +- include/boost/predef/compiler/llvm.h | 2 +- include/boost/predef/compiler/metaware.h | 2 +- include/boost/predef/compiler/metrowerks.h | 2 +- include/boost/predef/compiler/microtec.h | 2 +- include/boost/predef/compiler/mpw.h | 2 +- include/boost/predef/compiler/palm.h | 2 +- include/boost/predef/compiler/pgi.h | 2 +- include/boost/predef/compiler/sgi_mipspro.h | 2 +- include/boost/predef/compiler/sunpro.h | 2 +- include/boost/predef/compiler/tendra.h | 2 +- include/boost/predef/compiler/visualc.h | 2 +- include/boost/predef/compiler/watcom.h | 2 +- include/boost/predef/language/objc.h | 2 +- include/boost/predef/language/stdc.h | 2 +- include/boost/predef/language/stdcpp.h | 2 +- include/boost/predef/library/c/gnu.h | 2 +- include/boost/predef/library/c/uc.h | 2 +- include/boost/predef/library/c/vms.h | 2 +- include/boost/predef/library/c/zos.h | 2 +- include/boost/predef/library/std/cxx.h | 2 +- include/boost/predef/library/std/dinkumware.h | 2 +- include/boost/predef/library/std/libcomo.h | 2 +- include/boost/predef/library/std/modena.h | 2 +- include/boost/predef/library/std/msl.h | 2 +- include/boost/predef/library/std/roguewave.h | 2 +- include/boost/predef/library/std/sgi.h | 2 +- include/boost/predef/library/std/stdcpp3.h | 2 +- include/boost/predef/library/std/stlport.h | 2 +- include/boost/predef/library/std/vacpp.h | 2 +- include/boost/predef/make.h | 2 +- include/boost/predef/os/aix.h | 2 +- include/boost/predef/os/amigaos.h | 2 +- include/boost/predef/os/android.h | 2 +- include/boost/predef/os/beos.h | 2 +- include/boost/predef/os/bsd.h | 2 +- include/boost/predef/os/bsd/bsdi.h | 2 +- include/boost/predef/os/bsd/dragonfly.h | 2 +- include/boost/predef/os/bsd/free.h | 2 +- include/boost/predef/os/bsd/net.h | 2 +- include/boost/predef/os/bsd/open.h | 2 +- include/boost/predef/os/cygwin.h | 2 +- include/boost/predef/os/haiku.h | 2 +- include/boost/predef/os/hpux.h | 2 +- include/boost/predef/os/ios.h | 1 + include/boost/predef/os/irix.h | 2 +- include/boost/predef/os/linux.h | 2 +- include/boost/predef/os/macos.h | 2 +- include/boost/predef/os/os400.h | 2 +- include/boost/predef/os/qnxnto.h | 2 +- include/boost/predef/os/solaris.h | 2 +- include/boost/predef/os/unix.h | 2 +- include/boost/predef/os/vms.h | 2 +- include/boost/predef/os/windows.h | 2 +- include/boost/predef/other/endian.h | 2 +- include/boost/predef/platform/mingw.h | 2 +- .../boost/predef/platform/windows_desktop.h | 1 + include/boost/predef/platform/windows_phone.h | 1 + .../boost/predef/platform/windows_runtime.h | 1 + include/boost/predef/platform/windows_store.h | 1 + include/boost/predef/version.h | 4 +- include/boost/predef/version_number.h | 3 +- 118 files changed, 272 insertions(+), 146 deletions(-) diff --git a/doc/history.qbk b/doc/history.qbk index 5df5bf1..4c8833f 100644 --- a/doc/history.qbk +++ b/doc/history.qbk @@ -7,6 +7,15 @@ http://www.boost.org/LICENSE_1_0.txt) [section History] +[heading 1.3] + +* Fix many problems with `predef_check` functionality. +* Update SunPro detection to accomodate latest version of compiler from Oracle. +* Addition of Travis-CI and Appveyor testing. +* Add `and` and `or` logical operators for `predef_check` expression on the Boost Build side. +* Fix `BOOST_ARCH_PARISC` to correctly spelled name (from Graham Hanson). +* Fix `MAKE_YYYYM` macros to correctly limit the month (from rick68). + [heading 1.2] * Account for skip in Visual Studio product version vs. compiler version. diff --git a/doc/html/boostbook.css b/doc/html/boostbook.css index d42b3c0..28f8935 100644 --- a/doc/html/boostbook.css +++ b/doc/html/boostbook.css @@ -289,6 +289,22 @@ Tables border: none !important; } +/*============================================================================= +Suppress margins in tables +=============================================================================*/ + + table th > *:first-child, + table td > *:first-child + { + margin-top: 0; + } + + table th > *:last-child, + table td > *:last-child + { + margin-bottom: 0; + } + /*============================================================================= Blurbs =============================================================================*/ diff --git a/doc/html/index.html b/doc/html/index.html index 8a4dde7..4e9d22c 100644 --- a/doc/html/index.html +++ b/doc/html/index.html @@ -1,10 +1,10 @@ -Predef 1.2 +Predef 1.3 - + @@ -13,11 +13,12 @@

-Predef 1.2

+Predef 1.3

Rene Rivera

-

Copyright © 2005, 2008-2014 Rene Rivera

+

Copyright © 2005, 2008-2015 Rene + Rivera

Distributed under the Boost Software License, Version 1.0. (See accompanying @@ -53,7 +54,7 @@

- +

Last revised: January 29, 2015 at 21:39:36 GMT

Last revised: July 01, 2015 at 22:17:15 GMT
diff --git a/doc/html/predef/acknoledgements.html b/doc/html/predef/acknoledgements.html index 9f73605..1a97b32 100644 --- a/doc/html/predef/acknoledgements.html +++ b/doc/html/predef/acknoledgements.html @@ -4,8 +4,8 @@ Acknoledgements - - + + @@ -35,7 +35,8 @@
-
Copyright © 2005, 2008-2014 Rene Rivera

+

Copyright © 2005, 2008-2015 Rene + Rivera

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/predef/adding_new_predefs.html b/doc/html/predef/adding_new_predefs.html index 37f49d4..82c1985 100644 --- a/doc/html/predef/adding_new_predefs.html +++ b/doc/html/predef/adding_new_predefs.html @@ -4,8 +4,8 @@ Adding new predefs - - + + @@ -289,7 +289,8 @@ Documentation about what is detected.
-
Copyright © 2005, 2008-2014 Rene Rivera

+

Copyright © 2005, 2008-2015 Rene + Rivera

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/predef/check_utilities.html b/doc/html/predef/check_utilities.html index 1664b19..26b29dd 100644 --- a/doc/html/predef/check_utilities.html +++ b/doc/html/predef/check_utilities.html @@ -4,8 +4,8 @@ Check Utilities - - + + @@ -102,6 +102,17 @@ lib my_special_lib : source.cpp return [ check $(expressions) : $(language) : : <build>no ] ; } +

+ The expression can also use explicit "and", "or" logical + operators to for more complex checks: +

+
import path-to-predef-src/check/predef
+    : check require
+    : predef-check predef-require ;
+
+lib my_special_lib : source.cpp
+    : [ predef-require "BOOST_OS_WINDOWS" or "BOOST_OS_VMS"] ;
+

You can use the check rule for more control and to implement something other than control of what gets built. The definition for the check @@ -122,7 +133,7 @@ lib my_special_lib : source.cpp exe my_special_exe : source.cpp : [ predef-check "BOOST_OS_WINDOWS == 0" - : <define>ENABLE_WMF=0 + : : <define>ENABLE_WMF=0 : <define>ENABLE_WMF=1 ] ;

@@ -134,7 +145,8 @@ exe my_special_exe : source.cpp

-
Copyright © 2005, 2008-2014 Rene Rivera

+

Copyright © 2005, 2008-2015 Rene + Rivera

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/predef/history.html b/doc/html/predef/history.html index 883817d..d6cf318 100644 --- a/doc/html/predef/history.html +++ b/doc/html/predef/history.html @@ -4,8 +4,8 @@ History - - + + @@ -19,6 +19,34 @@

+ 1.3 +

+
    +
  • + Fix many problems with predef_check + functionality. +
    • +
  • + Update SunPro detection to accomodate latest version of compiler from Oracle. +
    • +
  • + Addition of Travis-CI and Appveyor testing. +
    • +
  • + Add and and or logical operators for predef_check + expression on the Boost Build side. +
    • +
  • + Fix BOOST_ARCH_PARISC to + correctly spelled name (from Graham Hanson). +
    • +
  • + Fix MAKE_YYYYM macros to + correctly limit the month (from rick68). +
    • +
+

+ 1.2

    @@ -42,7 +70,7 @@

- + 1.1

    @@ -84,7 +112,8 @@
-
Copyright © 2005, 2008-2014 Rene Rivera

+

Copyright © 2005, 2008-2015 Rene + Rivera

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/predef/introduction.html b/doc/html/predef/introduction.html index ef085b0..d2fe676 100644 --- a/doc/html/predef/introduction.html +++ b/doc/html/predef/introduction.html @@ -4,9 +4,9 @@ Introduction - - - + + + @@ -191,7 +191,8 @@
-
Copyright © 2005, 2008-2014 Rene Rivera

+

Copyright © 2005, 2008-2015 Rene + Rivera

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/predef/reference.html b/doc/html/predef/reference.html index 9414b8f..a06d9dc 100644 --- a/doc/html/predef/reference.html +++ b/doc/html/predef/reference.html @@ -4,8 +4,8 @@ Reference - - + + @@ -31,7 +31,8 @@
-
Copyright © 2005, 2008-2014 Rene Rivera

+

Copyright © 2005, 2008-2015 Rene + Rivera

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/predef/reference/boost_arch_architecture_macros.html b/doc/html/predef/reference/boost_arch_architecture_macros.html index bd15aca..61d7d4e 100644 --- a/doc/html/predef/reference/boost_arch_architecture_macros.html +++ b/doc/html/predef/reference/boost_arch_architecture_macros.html @@ -4,7 +4,7 @@ BOOST_ARCH architecture macros - + @@ -2137,7 +2137,8 @@
-
Copyright © 2005, 2008-2014 Rene Rivera

+

Copyright © 2005, 2008-2015 Rene + Rivera

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/predef/reference/boost_comp_compiler_macros.html b/doc/html/predef/reference/boost_comp_compiler_macros.html index 3376fd0..2236ed7 100644 --- a/doc/html/predef/reference/boost_comp_compiler_macros.html +++ b/doc/html/predef/reference/boost_comp_compiler_macros.html @@ -4,7 +4,7 @@ BOOST_COMP compiler macros - + @@ -1537,8 +1537,8 @@ BOOST_COMP_SUNPRO

- Sun Studio - compiler. Version number available as major, minor, and patch. + Oracle Solaris + Studio compiler. Version number available as major, minor, and patch.

@@ -1606,6 +1606,30 @@

+ + + + + + + +
+

+ __SUNPRO_CC +

+ 		+

+ VV.RR.P +

+
+

+ __SUNPRO_C +

+ 		+

+ VV.RR.P +

+
@@ -1765,7 +1789,8 @@
-
Copyright © 2005, 2008-2014 Rene Rivera

+

Copyright © 2005, 2008-2015 Rene + Rivera

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/predef/reference/boost_lang_language_standards_ma.html b/doc/html/predef/reference/boost_lang_language_standards_ma.html index 7623fc4..46537fb 100644 --- a/doc/html/predef/reference/boost_lang_language_standards_ma.html +++ b/doc/html/predef/reference/boost_lang_language_standards_ma.html @@ -4,7 +4,7 @@ BOOST_LANG language standards macros - + @@ -320,7 +320,8 @@
-
Copyright © 2005, 2008-2014 Rene Rivera

+

Copyright © 2005, 2008-2015 Rene + Rivera

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/predef/reference/boost_lib_library_macros.html b/doc/html/predef/reference/boost_lib_library_macros.html index 6e9a5ff..82575f5 100644 --- a/doc/html/predef/reference/boost_lib_library_macros.html +++ b/doc/html/predef/reference/boost_lib_library_macros.html @@ -4,7 +4,7 @@ BOOST_LIB library macros - + @@ -882,7 +882,8 @@
-
Copyright © 2005, 2008-2014 Rene Rivera

+

Copyright © 2005, 2008-2015 Rene + Rivera

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/predef/reference/boost_os_operating_system_macros.html b/doc/html/predef/reference/boost_os_operating_system_macros.html index ca12588..e32b5f1 100644 --- a/doc/html/predef/reference/boost_os_operating_system_macros.html +++ b/doc/html/predef/reference/boost_os_operating_system_macros.html @@ -4,7 +4,7 @@ BOOST_OS operating system macros - + @@ -1906,7 +1906,8 @@
-
Copyright © 2005, 2008-2014 Rene Rivera

+

Copyright © 2005, 2008-2015 Rene + Rivera

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/predef/reference/boost_plat_platform_macros.html b/doc/html/predef/reference/boost_plat_platform_macros.html index 9321e06..fc56862 100644 --- a/doc/html/predef/reference/boost_plat_platform_macros.html +++ b/doc/html/predef/reference/boost_plat_platform_macros.html @@ -4,7 +4,7 @@ BOOST_PLAT platform macros - + @@ -262,7 +262,8 @@
-
Copyright © 2005, 2008-2014 Rene Rivera

+

Copyright © 2005, 2008-2015 Rene + Rivera

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/predef/reference/other_macros.html b/doc/html/predef/reference/other_macros.html index 802f689..3df6ee5 100644 --- a/doc/html/predef/reference/other_macros.html +++ b/doc/html/predef/reference/other_macros.html @@ -4,7 +4,7 @@ Other macros - + @@ -70,7 +70,8 @@
-
Copyright © 2005, 2008-2014 Rene Rivera

+

Copyright © 2005, 2008-2015 Rene + Rivera

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/predef/reference/version_definition_macros.html b/doc/html/predef/reference/version_definition_macros.html index 0451ca1..f946d8a 100644 --- a/doc/html/predef/reference/version_definition_macros.html +++ b/doc/html/predef/reference/version_definition_macros.html @@ -4,7 +4,7 @@ Version definition macros - + @@ -173,7 +173,8 @@
-
Copyright © 2005, 2008-2014 Rene Rivera

+

Copyright © 2005, 2008-2015 Rene + Rivera

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/predef/to_do.html b/doc/html/predef/to_do.html index 7c01101..a48e704 100644 --- a/doc/html/predef/to_do.html +++ b/doc/html/predef/to_do.html @@ -4,8 +4,8 @@ To Do - - + + @@ -28,7 +28,8 @@
-
Copyright © 2005, 2008-2014 Rene Rivera

+

Copyright © 2005, 2008-2015 Rene + Rivera

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/html/predef/using_the_predefs.html b/doc/html/predef/using_the_predefs.html index c659ce6..5c6ee30 100644 --- a/doc/html/predef/using_the_predefs.html +++ b/doc/html/predef/using_the_predefs.html @@ -4,8 +4,8 @@ Using the predefs - - + + @@ -211,7 +211,8 @@
-
Copyright © 2005, 2008-2014 Rene Rivera

+

Copyright © 2005, 2008-2015 Rene + Rivera

Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

diff --git a/doc/predef.qbk b/doc/predef.qbk index 7abc2ed..6558d19 100644 --- a/doc/predef.qbk +++ b/doc/predef.qbk @@ -1,8 +1,8 @@ [article Predef [quickbook 1.7] - [version 1.2] + [version 1.3] [authors [Rivera, Rene]] - [copyright 2005, 2008-2014 Rene Rivera] + [copyright 2005, 2008-2015 Rene Rivera] [purpose Identification and specification of predefined macros.] [license Distributed under the Boost Software License, Version 1.0. @@ -649,6 +649,21 @@ rule require ( expressions + : language ? ) `` [c++] +The expression can also use explicit "and", "or" logical operators +to for more complex checks: + + +[teletype] +`` +import path-to-predef-src/check/predef + : check require + : predef-check predef-require ; + +lib my_special_lib : source.cpp + : [ predef-require "BOOST_OS_WINDOWS" or "BOOST_OS_VMS"] ; +`` +[c++] + You can use the [^check] rule for more control and to implement something other than control of what gets built. The definition for the [^check] rule is: diff --git a/include/boost/predef.h b/include/boost/predef.h index 71b1913..36d731f 100644 --- a/include/boost/predef.h +++ b/include/boost/predef.h @@ -18,4 +18,6 @@ http://www.boost.org/LICENSE_1_0.txt) #include #include +#include + #endif diff --git a/include/boost/predef/architecture/alpha.h b/include/boost/predef/architecture/alpha.h index 371b921..5bcade1 100644 --- a/include/boost/predef/architecture/alpha.h +++ b/include/boost/predef/architecture/alpha.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/architecture/arm.h b/include/boost/predef/architecture/arm.h index 7b0c3c2..b200c62 100644 --- a/include/boost/predef/architecture/arm.h +++ b/include/boost/predef/architecture/arm.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Copyright Franz Detro 2014 Copyright (c) Microsoft Corporation 2014 Distributed under the Boost Software License, Version 1.0. diff --git a/include/boost/predef/architecture/blackfin.h b/include/boost/predef/architecture/blackfin.h index 166e6aa..84c58a2 100644 --- a/include/boost/predef/architecture/blackfin.h +++ b/include/boost/predef/architecture/blackfin.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2013 +Copyright Rene Rivera 2013-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/architecture/convex.h b/include/boost/predef/architecture/convex.h index 0c4f4a2..ac783a9 100644 --- a/include/boost/predef/architecture/convex.h +++ b/include/boost/predef/architecture/convex.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2011-2013 +Copyright Rene Rivera 2011-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/architecture/ia64.h b/include/boost/predef/architecture/ia64.h index 8bccbc8..9b1972b 100644 --- a/include/boost/predef/architecture/ia64.h +++ b/include/boost/predef/architecture/ia64.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/architecture/m68k.h b/include/boost/predef/architecture/m68k.h index bf48ddb..63ed5f8 100644 --- a/include/boost/predef/architecture/m68k.h +++ b/include/boost/predef/architecture/m68k.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/architecture/mips.h b/include/boost/predef/architecture/mips.h index e1a42fa..0189d7d 100644 --- a/include/boost/predef/architecture/mips.h +++ b/include/boost/predef/architecture/mips.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/architecture/parisc.h b/include/boost/predef/architecture/parisc.h index 06c7079..7c7625f 100644 --- a/include/boost/predef/architecture/parisc.h +++ b/include/boost/predef/architecture/parisc.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/architecture/ppc.h b/include/boost/predef/architecture/ppc.h index 3c1ae4f..e8c57c9 100644 --- a/include/boost/predef/architecture/ppc.h +++ b/include/boost/predef/architecture/ppc.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/architecture/pyramid.h b/include/boost/predef/architecture/pyramid.h index dfd8eb6..4f13253 100644 --- a/include/boost/predef/architecture/pyramid.h +++ b/include/boost/predef/architecture/pyramid.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2011-2013 +Copyright Rene Rivera 2011-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/architecture/rs6k.h b/include/boost/predef/architecture/rs6k.h index 9b37690..8a6e9b6 100644 --- a/include/boost/predef/architecture/rs6k.h +++ b/include/boost/predef/architecture/rs6k.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/architecture/sparc.h b/include/boost/predef/architecture/sparc.h index d7580f5..a89a510 100644 --- a/include/boost/predef/architecture/sparc.h +++ b/include/boost/predef/architecture/sparc.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2014 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/architecture/superh.h b/include/boost/predef/architecture/superh.h index cc8be65..da0529e 100644 --- a/include/boost/predef/architecture/superh.h +++ b/include/boost/predef/architecture/superh.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/architecture/sys370.h b/include/boost/predef/architecture/sys370.h index a51470a..cfd85dc 100644 --- a/include/boost/predef/architecture/sys370.h +++ b/include/boost/predef/architecture/sys370.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/architecture/sys390.h b/include/boost/predef/architecture/sys390.h index 1b537f7..47aff6a 100644 --- a/include/boost/predef/architecture/sys390.h +++ b/include/boost/predef/architecture/sys390.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/architecture/x86.h b/include/boost/predef/architecture/x86.h index 3a8d645..0ef3ef4 100644 --- a/include/boost/predef/architecture/x86.h +++ b/include/boost/predef/architecture/x86.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/architecture/x86/32.h b/include/boost/predef/architecture/x86/32.h index 5fa1bbe..17fbff5 100644 --- a/include/boost/predef/architecture/x86/32.h +++ b/include/boost/predef/architecture/x86/32.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/architecture/x86/64.h b/include/boost/predef/architecture/x86/64.h index 2524cdd..f761c92 100644 --- a/include/boost/predef/architecture/x86/64.h +++ b/include/boost/predef/architecture/x86/64.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/architecture/z.h b/include/boost/predef/architecture/z.h index 893c8c1..3d218aa 100644 --- a/include/boost/predef/architecture/z.h +++ b/include/boost/predef/architecture/z.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/borland.h b/include/boost/predef/compiler/borland.h index 89ec27c..3677cca 100644 --- a/include/boost/predef/compiler/borland.h +++ b/include/boost/predef/compiler/borland.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2014 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/clang.h b/include/boost/predef/compiler/clang.h index 28689ce..56678fe 100644 --- a/include/boost/predef/compiler/clang.h +++ b/include/boost/predef/compiler/clang.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2014 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/comeau.h b/include/boost/predef/compiler/comeau.h index 37c055b..841598f 100644 --- a/include/boost/predef/compiler/comeau.h +++ b/include/boost/predef/compiler/comeau.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2014 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/compaq.h b/include/boost/predef/compiler/compaq.h index c899cf4..96a79e6 100644 --- a/include/boost/predef/compiler/compaq.h +++ b/include/boost/predef/compiler/compaq.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2014 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/diab.h b/include/boost/predef/compiler/diab.h index ecb8294..f5a37de 100644 --- a/include/boost/predef/compiler/diab.h +++ b/include/boost/predef/compiler/diab.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2014 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/digitalmars.h b/include/boost/predef/compiler/digitalmars.h index d816214..9bd5850 100644 --- a/include/boost/predef/compiler/digitalmars.h +++ b/include/boost/predef/compiler/digitalmars.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2014 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/dignus.h b/include/boost/predef/compiler/dignus.h index e02f9cc..c65d3dc 100644 --- a/include/boost/predef/compiler/dignus.h +++ b/include/boost/predef/compiler/dignus.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2014 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/edg.h b/include/boost/predef/compiler/edg.h index b6baeef..2ffb9b0 100644 --- a/include/boost/predef/compiler/edg.h +++ b/include/boost/predef/compiler/edg.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2014 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/ekopath.h b/include/boost/predef/compiler/ekopath.h index 4bebc60..e5cde36 100644 --- a/include/boost/predef/compiler/ekopath.h +++ b/include/boost/predef/compiler/ekopath.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2014 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/gcc.h b/include/boost/predef/compiler/gcc.h index 53fb646..c2d7fff 100644 --- a/include/boost/predef/compiler/gcc.h +++ b/include/boost/predef/compiler/gcc.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2014 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/gcc_xml.h b/include/boost/predef/compiler/gcc_xml.h index efbd1b1..acae600 100644 --- a/include/boost/predef/compiler/gcc_xml.h +++ b/include/boost/predef/compiler/gcc_xml.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2014 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/greenhills.h b/include/boost/predef/compiler/greenhills.h index 2f76ad7..23b8f01 100644 --- a/include/boost/predef/compiler/greenhills.h +++ b/include/boost/predef/compiler/greenhills.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2014 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/hp_acc.h b/include/boost/predef/compiler/hp_acc.h index a727739..7b3ffe9 100644 --- a/include/boost/predef/compiler/hp_acc.h +++ b/include/boost/predef/compiler/hp_acc.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2014 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/iar.h b/include/boost/predef/compiler/iar.h index 04a056d..237f492 100644 --- a/include/boost/predef/compiler/iar.h +++ b/include/boost/predef/compiler/iar.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2014 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/ibm.h b/include/boost/predef/compiler/ibm.h index 9a1ba02..6931ebd 100644 --- a/include/boost/predef/compiler/ibm.h +++ b/include/boost/predef/compiler/ibm.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2014 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/intel.h b/include/boost/predef/compiler/intel.h index 9cee0a5..65bde67 100644 --- a/include/boost/predef/compiler/intel.h +++ b/include/boost/predef/compiler/intel.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2014 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/kai.h b/include/boost/predef/compiler/kai.h index c68a6fd..68ce84e 100644 --- a/include/boost/predef/compiler/kai.h +++ b/include/boost/predef/compiler/kai.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2014 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/llvm.h b/include/boost/predef/compiler/llvm.h index 340b3c7..de654eb 100644 --- a/include/boost/predef/compiler/llvm.h +++ b/include/boost/predef/compiler/llvm.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2014 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/metaware.h b/include/boost/predef/compiler/metaware.h index 7bbc22c..1a32039 100644 --- a/include/boost/predef/compiler/metaware.h +++ b/include/boost/predef/compiler/metaware.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2014 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/metrowerks.h b/include/boost/predef/compiler/metrowerks.h index d6bd68b..f2d739b 100644 --- a/include/boost/predef/compiler/metrowerks.h +++ b/include/boost/predef/compiler/metrowerks.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2014 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/microtec.h b/include/boost/predef/compiler/microtec.h index a311e35..066a6d2 100644 --- a/include/boost/predef/compiler/microtec.h +++ b/include/boost/predef/compiler/microtec.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2014 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/mpw.h b/include/boost/predef/compiler/mpw.h index aa982b8..1183306 100644 --- a/include/boost/predef/compiler/mpw.h +++ b/include/boost/predef/compiler/mpw.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2014 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/palm.h b/include/boost/predef/compiler/palm.h index 5998d86..707925a 100644 --- a/include/boost/predef/compiler/palm.h +++ b/include/boost/predef/compiler/palm.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2014 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/pgi.h b/include/boost/predef/compiler/pgi.h index df304f7..e016aeb 100644 --- a/include/boost/predef/compiler/pgi.h +++ b/include/boost/predef/compiler/pgi.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2014 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/sgi_mipspro.h b/include/boost/predef/compiler/sgi_mipspro.h index 9f44dd4..00739f0 100644 --- a/include/boost/predef/compiler/sgi_mipspro.h +++ b/include/boost/predef/compiler/sgi_mipspro.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2014 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/sunpro.h b/include/boost/predef/compiler/sunpro.h index 43498e2..92c3926 100644 --- a/include/boost/predef/compiler/sunpro.h +++ b/include/boost/predef/compiler/sunpro.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2014 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/tendra.h b/include/boost/predef/compiler/tendra.h index 38f8da5..c2bc5e4 100644 --- a/include/boost/predef/compiler/tendra.h +++ b/include/boost/predef/compiler/tendra.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2014 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/visualc.h b/include/boost/predef/compiler/visualc.h index 5e6f81e..9481d9d 100644 --- a/include/boost/predef/compiler/visualc.h +++ b/include/boost/predef/compiler/visualc.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2014 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/compiler/watcom.h b/include/boost/predef/compiler/watcom.h index 958fae8..b0e7776 100644 --- a/include/boost/predef/compiler/watcom.h +++ b/include/boost/predef/compiler/watcom.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2014 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/language/objc.h b/include/boost/predef/language/objc.h index ce2f2ed..24e3ad3 100644 --- a/include/boost/predef/language/objc.h +++ b/include/boost/predef/language/objc.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2011-2013 +Copyright Rene Rivera 2011-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/language/stdc.h b/include/boost/predef/language/stdc.h index 2df24a6..db25c12 100644 --- a/include/boost/predef/language/stdc.h +++ b/include/boost/predef/language/stdc.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2011-2012 +Copyright Rene Rivera 2011-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/language/stdcpp.h b/include/boost/predef/language/stdcpp.h index e8ee722..34dc8c7 100644 --- a/include/boost/predef/language/stdcpp.h +++ b/include/boost/predef/language/stdcpp.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2011-2013 +Copyright Rene Rivera 2011-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/library/c/gnu.h b/include/boost/predef/library/c/gnu.h index 223ae43..9e4ca89 100644 --- a/include/boost/predef/library/c/gnu.h +++ b/include/boost/predef/library/c/gnu.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/library/c/uc.h b/include/boost/predef/library/c/uc.h index 8e4e505..03081e9 100644 --- a/include/boost/predef/library/c/uc.h +++ b/include/boost/predef/library/c/uc.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/library/c/vms.h b/include/boost/predef/library/c/vms.h index d5d8139..685f1a7 100644 --- a/include/boost/predef/library/c/vms.h +++ b/include/boost/predef/library/c/vms.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/library/c/zos.h b/include/boost/predef/library/c/zos.h index dfadaa1..222d355 100644 --- a/include/boost/predef/library/c/zos.h +++ b/include/boost/predef/library/c/zos.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/library/std/cxx.h b/include/boost/predef/library/std/cxx.h index 658a997..07b52cd 100644 --- a/include/boost/predef/library/std/cxx.h +++ b/include/boost/predef/library/std/cxx.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2011-2013 +Copyright Rene Rivera 2011-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/library/std/dinkumware.h b/include/boost/predef/library/std/dinkumware.h index 83f759d..0fc0776 100644 --- a/include/boost/predef/library/std/dinkumware.h +++ b/include/boost/predef/library/std/dinkumware.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/library/std/libcomo.h b/include/boost/predef/library/std/libcomo.h index 6b8ebaa..97d4a53 100644 --- a/include/boost/predef/library/std/libcomo.h +++ b/include/boost/predef/library/std/libcomo.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/library/std/modena.h b/include/boost/predef/library/std/modena.h index 1ec0022..b67ac62 100644 --- a/include/boost/predef/library/std/modena.h +++ b/include/boost/predef/library/std/modena.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/library/std/msl.h b/include/boost/predef/library/std/msl.h index 94a5ac6..d73c74c 100644 --- a/include/boost/predef/library/std/msl.h +++ b/include/boost/predef/library/std/msl.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/library/std/roguewave.h b/include/boost/predef/library/std/roguewave.h index dcea39f..9c3f288 100644 --- a/include/boost/predef/library/std/roguewave.h +++ b/include/boost/predef/library/std/roguewave.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/library/std/sgi.h b/include/boost/predef/library/std/sgi.h index 96e6a33..5d19bba 100644 --- a/include/boost/predef/library/std/sgi.h +++ b/include/boost/predef/library/std/sgi.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/library/std/stdcpp3.h b/include/boost/predef/library/std/stdcpp3.h index 255bdbc..c980292 100644 --- a/include/boost/predef/library/std/stdcpp3.h +++ b/include/boost/predef/library/std/stdcpp3.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/library/std/stlport.h b/include/boost/predef/library/std/stlport.h index 8c89882..c09483b 100644 --- a/include/boost/predef/library/std/stlport.h +++ b/include/boost/predef/library/std/stlport.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/library/std/vacpp.h b/include/boost/predef/library/std/vacpp.h index d7102d1..632f846 100644 --- a/include/boost/predef/library/std/vacpp.h +++ b/include/boost/predef/library/std/vacpp.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/make.h b/include/boost/predef/make.h index f997a0a..4f2f9ee 100644 --- a/include/boost/predef/make.h +++ b/include/boost/predef/make.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/aix.h b/include/boost/predef/os/aix.h index 308e35d..3e5a953 100644 --- a/include/boost/predef/os/aix.h +++ b/include/boost/predef/os/aix.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/amigaos.h b/include/boost/predef/os/amigaos.h index 11fe19f..7b32ddf 100644 --- a/include/boost/predef/os/amigaos.h +++ b/include/boost/predef/os/amigaos.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/android.h b/include/boost/predef/os/android.h index c0d8119..00836e7 100644 --- a/include/boost/predef/os/android.h +++ b/include/boost/predef/os/android.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2013 +Copyright Rene Rivera 2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/beos.h b/include/boost/predef/os/beos.h index 8a8bc4b..19f4cb7 100644 --- a/include/boost/predef/os/beos.h +++ b/include/boost/predef/os/beos.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/bsd.h b/include/boost/predef/os/bsd.h index 226eb3e..fad9aed 100644 --- a/include/boost/predef/os/bsd.h +++ b/include/boost/predef/os/bsd.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/bsd/bsdi.h b/include/boost/predef/os/bsd/bsdi.h index e2f738a..afdcd3e 100644 --- a/include/boost/predef/os/bsd/bsdi.h +++ b/include/boost/predef/os/bsd/bsdi.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2012-2013 +Copyright Rene Rivera 2012-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/bsd/dragonfly.h b/include/boost/predef/os/bsd/dragonfly.h index aacda9a..1d07579 100644 --- a/include/boost/predef/os/bsd/dragonfly.h +++ b/include/boost/predef/os/bsd/dragonfly.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2012-2013 +Copyright Rene Rivera 2012-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/bsd/free.h b/include/boost/predef/os/bsd/free.h index cfdfc97..248011a 100644 --- a/include/boost/predef/os/bsd/free.h +++ b/include/boost/predef/os/bsd/free.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2012-2013 +Copyright Rene Rivera 2012-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/bsd/net.h b/include/boost/predef/os/bsd/net.h index 5e38bf0..387cbde 100644 --- a/include/boost/predef/os/bsd/net.h +++ b/include/boost/predef/os/bsd/net.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2012-2013 +Copyright Rene Rivera 2012-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/bsd/open.h b/include/boost/predef/os/bsd/open.h index 5ed6c8f..423103a 100644 --- a/include/boost/predef/os/bsd/open.h +++ b/include/boost/predef/os/bsd/open.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2012-2013 +Copyright Rene Rivera 2012-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/cygwin.h b/include/boost/predef/os/cygwin.h index 9b1d5d7..1985c97 100644 --- a/include/boost/predef/os/cygwin.h +++ b/include/boost/predef/os/cygwin.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/haiku.h b/include/boost/predef/os/haiku.h index 17ed382..d79dbea 100644 --- a/include/boost/predef/os/haiku.h +++ b/include/boost/predef/os/haiku.h @@ -1,6 +1,6 @@ /* Copyright Jessica Hamilton 2014 -Copyright Rene Rivera 2014 +Copyright Rene Rivera 2014-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/hpux.h b/include/boost/predef/os/hpux.h index b4da30d..29243f4 100644 --- a/include/boost/predef/os/hpux.h +++ b/include/boost/predef/os/hpux.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/ios.h b/include/boost/predef/os/ios.h index d07513d..f853815 100644 --- a/include/boost/predef/os/ios.h +++ b/include/boost/predef/os/ios.h @@ -1,5 +1,6 @@ /* Copyright Franz Detro 2014 +Copyright Rene Rivera 2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/irix.h b/include/boost/predef/os/irix.h index 35cf0b3..fa6ac41 100644 --- a/include/boost/predef/os/irix.h +++ b/include/boost/predef/os/irix.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/linux.h b/include/boost/predef/os/linux.h index ed47b9b..a297d08 100644 --- a/include/boost/predef/os/linux.h +++ b/include/boost/predef/os/linux.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/macos.h b/include/boost/predef/os/macos.h index a686ce4..4afb30d 100644 --- a/include/boost/predef/os/macos.h +++ b/include/boost/predef/os/macos.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Copyright Franz Detro 2014 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at diff --git a/include/boost/predef/os/os400.h b/include/boost/predef/os/os400.h index b26e56c..b3446c2 100644 --- a/include/boost/predef/os/os400.h +++ b/include/boost/predef/os/os400.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2011-2013 +Copyright Rene Rivera 2011-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/qnxnto.h b/include/boost/predef/os/qnxnto.h index 7d444f7..e76fbf2 100644 --- a/include/boost/predef/os/qnxnto.h +++ b/include/boost/predef/os/qnxnto.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/solaris.h b/include/boost/predef/os/solaris.h index 7e71c31..75ddc91 100644 --- a/include/boost/predef/os/solaris.h +++ b/include/boost/predef/os/solaris.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/unix.h b/include/boost/predef/os/unix.h index 38b4652..a607104 100644 --- a/include/boost/predef/os/unix.h +++ b/include/boost/predef/os/unix.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/vms.h b/include/boost/predef/os/vms.h index 13cde57..2f8f786 100644 --- a/include/boost/predef/os/vms.h +++ b/include/boost/predef/os/vms.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2011-2013 +Copyright Rene Rivera 2011-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/os/windows.h b/include/boost/predef/os/windows.h index 2dd94be..9db4390 100644 --- a/include/boost/predef/os/windows.h +++ b/include/boost/predef/os/windows.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/other/endian.h b/include/boost/predef/other/endian.h index d1d9ff1..6d1f43f 100644 --- a/include/boost/predef/other/endian.h +++ b/include/boost/predef/other/endian.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2013-2014 +Copyright Rene Rivera 2013-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/platform/mingw.h b/include/boost/predef/platform/mingw.h index d7f8e3f..64c5837 100644 --- a/include/boost/predef/platform/mingw.h +++ b/include/boost/predef/platform/mingw.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2008-2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/platform/windows_desktop.h b/include/boost/predef/platform/windows_desktop.h index 7bb847e..2fd7d5d 100644 --- a/include/boost/predef/platform/windows_desktop.h +++ b/include/boost/predef/platform/windows_desktop.h @@ -1,5 +1,6 @@ /* Copyright (c) Microsoft Corporation 2014 +Copyright Rene Rivera 2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/platform/windows_phone.h b/include/boost/predef/platform/windows_phone.h index be488af..495c918 100644 --- a/include/boost/predef/platform/windows_phone.h +++ b/include/boost/predef/platform/windows_phone.h @@ -1,5 +1,6 @@ /* Copyright (c) Microsoft Corporation 2014 +Copyright Rene Rivera 2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/platform/windows_runtime.h b/include/boost/predef/platform/windows_runtime.h index 5c4da63..902428e 100644 --- a/include/boost/predef/platform/windows_runtime.h +++ b/include/boost/predef/platform/windows_runtime.h @@ -1,5 +1,6 @@ /* Copyright (c) Microsoft Corporation 2014 +Copyright Rene Rivera 2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/platform/windows_store.h b/include/boost/predef/platform/windows_store.h index 9330f5d..d65821c 100644 --- a/include/boost/predef/platform/windows_store.h +++ b/include/boost/predef/platform/windows_store.h @@ -1,5 +1,6 @@ /* Copyright (c) Microsoft Corporation 2014 +Copyright Rene Rivera 2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) diff --git a/include/boost/predef/version.h b/include/boost/predef/version.h index 0439b2c..1d57cbb 100644 --- a/include/boost/predef/version.h +++ b/include/boost/predef/version.h @@ -1,5 +1,5 @@ /* -Copyright Rene Rivera 2014 +Copyright Rene Rivera 2015 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -10,6 +10,6 @@ http://www.boost.org/LICENSE_1_0.txt) #include -#define BOOST_PREDEF_VERSION BOOST_VERSION_NUMBER(1,2,0) +#define BOOST_PREDEF_VERSION BOOST_VERSION_NUMBER(1,3,0) #endif diff --git a/include/boost/predef/version_number.h b/include/boost/predef/version_number.h index b773919..3903a36 100644 --- a/include/boost/predef/version_number.h +++ b/include/boost/predef/version_number.h @@ -1,6 +1,5 @@ /* -Copyright Rene Rivera 2005 -Copyright Rene Rivera 2008-2013 +Copyright Rene Rivera 2005, 2008-2013 Distributed under the Boost Software License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) From 259101e0a1afc6ccbbad5374fcb88dff4db53ee7 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Thu, 2 Jul 2015 12:47:43 -0500 Subject: [PATCH 52/53] Try and limit Appveyor build matrix to set that can actually work. --- appveyor.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 8c84f48..4a5af02 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,13 +13,17 @@ notifications: environment: matrix: - TOOLSET: vs-2008 + platform: 32 - TOOLSET: vs-2010 + platform: 32 - TOOLSET: vs-2012 + platform: 32 + - TOOLSET: vs-2012 + platform: 64 - TOOLSET: vs-2013 - -platform: - - 32 - - 64 + platform: 32 + - TOOLSET: vs-2013 + platform: 64 configuration: - debug From a3f6ac9fb29eed274b3fca43bde4a312be91e4c6 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Wed, 8 Jul 2015 05:27:03 -0600 Subject: [PATCH 53/53] Fix spelling of version macro. Version macro had a "N" instead of an "M". Thanks to Charly Chevalier for spotting that. --- include/boost/predef/compiler/comeau.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/boost/predef/compiler/comeau.h b/include/boost/predef/compiler/comeau.h index 841598f..15a4564 100644 --- a/include/boost/predef/compiler/comeau.h +++ b/include/boost/predef/compiler/comeau.h @@ -29,7 +29,7 @@ Version number available as major, minor, and patch. */ #if defined(__COMO__) -# if !defined(BOOST_COMP_COMO_DETECTION) && defined(__CONO_VERSION__) +# if !defined(BOOST_COMP_COMO_DETECTION) && defined(__COMO_VERSION__) # define BOOST_COMP_COMO_DETECTION BOOST_PREDEF_MAKE_0X_VRP(__COMO_VERSION__) # endif # if !defined(BOOST_COMP_COMO_DETECTION)