Merge remote-tracking branch 'origin/develop'

Fix XSL boost root path.

.travis.yml

@@ -1,119 +1,71 @@
-# Use, modification, and distribution are
-# subject to 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)
-#
-# Copyright Rene Rivera 2015-2016.
+language: cpp
 
-# Setting up notifications like this is optional as the default behavior
-# of Travis is to notify the commiter of problems. But setting a specific
-# recipient this way ensures you get all the communications about the
-# builds.
 notifications:
   email:
     recipients:
       - grafikrobot@gmail.com
+  irc:
+    channels:
+      - "chat.freenode.net#boost"
+    template:
+      - "%{repository}/%{branch} (%{commit} - %{author}): %{build_url}: %{message}"
 
-# For now the CI scripts only support the two main branches available
-# on the boost super-project.
-branches:
-  only:
-    - master
-    - develop
-
-# We specify a generic language instead of C++ as Travis sets up
-# additional environment vars that point to its default toolset
-# instead of the one we install. The extra env doesn't interfere,
-# but at the same time it's misleading. So to avoid confusion and
-# possible unseen side effects we stick with no C++ default setup.
-language: generic
-
-# Speficy the default as Linux here, to avoid duplication in the matrix
-# below. We use Trausty as that's the latest we can use. And it's better
-# supported by the whole range of C++ toolsets we like to test on.
-dist: trusty
-os: linux
-
-# Because we install our own toolsets and other software we need
-# to run the sudo support.
 sudo: required
 
-# Travis has a long standing bug with their rather complicated
-# build matrix evaluation that causes empty jobs to be created.
-# This global matrix entry in combination with the exclusion
-# below works around that bug. This is the suggested fix from
-# the Travis support people.
 env:
   matrix:
     - TRAVIS_EMPTY_JOB_WORKAROUND=true
 
-# This lists all the toolsets we will test with the Boost CI
-# scripts. Predef needs to check all of them as its job is to
-# distiguish between all of them. For other libraries you would
-# want to limit the list to the toolsets that are important
-# for that.
 matrix:
   exclude:
     - env: TRAVIS_EMPTY_JOB_WORKAROUND=true
   include:
     - env: TOOLSET=clang-3.4
+      os: linux
+      dist: precise
     - env: TOOLSET=clang-3.5
+      os: linux
+      dist: precise
     - env: TOOLSET=clang-3.6
-    - env: TOOLSET=clang-3.7
-    - env: TOOLSET=clang-3.8
-    - env: TOOLSET=clang-3.9
-    - env: TOOLSET=clang-4.0 CXXFLAGS=-std=c++03
-    - env: TOOLSET=clang-4.0 CXXFLAGS=-std=c++11
-    - env: TOOLSET=clang-4.0 CXXFLAGS=-std=c++14
-    - env: TOOLSET=clang-4.0 CXXFLAGS=-std=c++1z
+      os: linux
+      dist: precise
     - env: TOOLSET=gcc-4.7
+      os: linux
+      dist: precise
     - env: TOOLSET=gcc-4.8
+      os: linux
+      dist: precise
     - env: TOOLSET=gcc-4.9
-    - env: TOOLSET=gcc-5
-    - env: TOOLSET=gcc-6
-    - env: TOOLSET=gcc-7 CXXFLAGS=-std=c++03
-    - env: TOOLSET=gcc-7 CXXFLAGS=-std=c++11
-    - env: TOOLSET=gcc-7 CXXFLAGS=-std=c++14
-    - env: TOOLSET=gcc-7 CXXFLAGS=-std=c++1z
-    - env: TOOLSET=gcc-7 CXXFLAGS=-std=gnu++03
-    - env: TOOLSET=gcc-7 CXXFLAGS=-std=gnu++11
-    - env: TOOLSET=gcc-7 CXXFLAGS=-std=gnu++14
-    - env: TOOLSET=gcc-7 CXXFLAGS=-std=gnu++1z
+      os: linux
+      dist: precise
+    - env: TOOLSET=gcc-5.1
+      os: linux
+      dist: precise
     - env: TOOLSET=xcode-6.1
       os: osx
+    - env: TOOLSET=xcode-6.2
+      os: osx
+      osx_image: beta-xcode6.2
+    - env: TOOLSET=xcode-6.3
+      os: osx
+      osx_image: beta-xcode6.3
     - env: TOOLSET=xcode-6.4
       os: osx
       osx_image: xcode6.4
-    - env: TOOLSET=xcode-7.3
+    - env: TOOLSET=xcode-7.0
       os: osx
-      osx_image: xcode7.3
-    - env: TOOLSET=xcode-8.3 CXXFLAGS=-std=c++03
+      osx_image: xcode7
+    - env: TOOLSET=xcode-7.1
       os: osx
-      osx_image: xcode8.3
-    - env: TOOLSET=xcode-8.3 CXXFLAGS=-std=c++11
+      osx_image: xcode7.1
+    - env: TOOLSET=xcode-7.2
       os: osx
-      osx_image: xcode8.3
-    - env: TOOLSET=xcode-8.3 CXXFLAGS=-std=c++14
-      os: osx
-      osx_image: xcode8.3
-    - env: TOOLSET=xcode-8.3 CXXFLAGS=-std=c++1z
-      os: osx
-      osx_image: xcode8.3
+      osx_image: xcode7.2
 
-# These are the standard steps to bootstrap the Boost CI scripts
-# and to forward the actions to the scripts.
-before_install:
-  # Fetch the scripts to do the actual building/testing.
-  - |
-    wget "https://raw.githubusercontent.com/boostorg/regression/develop/ci/src/ci_boost_common.py" -P ..
-    wget "https://raw.githubusercontent.com/boostorg/regression/develop/ci/src/ci_boost_library_test.py" -P ..
-
-install: python "${TRAVIS_BUILD_DIR}/../ci_boost_library_test.py" install
-before_script: python "${TRAVIS_BUILD_DIR}/../ci_boost_library_test.py" before_script
-script: python "${TRAVIS_BUILD_DIR}/../ci_boost_library_test.py" script
-before_cache: python "${TRAVIS_BUILD_DIR}/../ci_boost_library_test.py" before_cache
-after_success: python "${TRAVIS_BUILD_DIR}/../ci_boost_library_test.py" after_success
-after_failure: python "${TRAVIS_BUILD_DIR}/../ci_boost_library_test.py" after_failure
-after_script: python "${TRAVIS_BUILD_DIR}/../ci_boost_library_test.py" after_script
-cache:
-  directories:
-    - $HOME/boostorg/boost
+before_install: wget "https://raw.githubusercontent.com/boostorg/regression/develop/ci/src/script.py"
+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

CMakeLists.txt

@@ -1,8 +0,0 @@
-cmake_minimum_required(VERSION 3.5)
-
-include(cmake/BoostVersion.cmake)
-set(BOOST_PROJECT_NAME predef)
-
-project(boost_${BOOST_PROJECT_NAME} VERSION ${BOOST_VERSION} LANGUAGES CXX)
-
-include(cmake/default.cmake)

appveyor.yml

@@ -1,93 +1,42 @@
-# Use, modification, and distribution are
-# subject to 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)
-#
-# Copyright Rene Rivera 2015-2016.
-
-# Set up notifications so that the maintainers of the library get
-# build status messages.
 notifications:
   - provider: Email
     to:
       - grafikrobot@gmail.com
     on_build_status_changed: true
 
-# This lists all the toolsets we will test with the Boost CI
-# scripts. Predef needs to check all of them as its job is to
-# distiguish between all of them. For other libraries you would
-# want to limit the list to the toolsets that are important
-# for that.
-#
-# This also includes setting up how to create the cache. We
-# opt for slightly better compression and solid archives.
-# As we have a lot of files in the boost tree which is what
-# we are putting in the cache.
 environment:
-  APPVEYOR_CACHE_ENTRY_ZIP_ARGS: -t7z -m0=lzma2 -mx=3
   matrix:
   - TOOLSET: vs-2008
     platform: 32
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
   - TOOLSET: vs-2010
     platform: 32
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
   - TOOLSET: vs-2012
     platform: 32
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
   - TOOLSET: vs-2013
     platform: 32
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
   - TOOLSET: vs-2013
     platform: 64
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
   - TOOLSET: vs-2015
     platform: 32
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
   - TOOLSET: vs-2015
     platform: 64
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-  - TOOLSET: vs-2017
-    platform: 32
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-  - TOOLSET: vs-2017
-    platform: 64
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-  - TOOLSET: vs-2017
-    CXXFLAGS: /std:c++14
-    platform: 64
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-  - TOOLSET: vs-2017
-    CXXFLAGS: /std:c++latest
-    platform: 64
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
-  - TOOLSET: mingw-5
-    platform: 32
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-  - TOOLSET: mingw64-6
-    platform: 64
-    APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
 
-# We can also set up configurations for testing which map to
-# the b2 build variants.
 configuration:
   - debug
   - release
 
-# These are the standard steps to bootstrap the Boost CI scripts
-# and to forward the actions to the scripts.
 init:
-  # Fetch the scripts to do the actual building/testing.
   - cd %APPVEYOR_BUILD_FOLDER%/..
-  - appveyor DownloadFile "https://raw.githubusercontent.com/boostorg/regression/develop/ci/src/ci_boost_common.py"
-  - appveyor DownloadFile "https://raw.githubusercontent.com/boostorg/regression/develop/ci/src/ci_boost_library_test.py"
+  - appveyor DownloadFile "https://raw.githubusercontent.com/boostorg/regression/develop/ci/src/script.py"
+  - dir
   - cd %APPVEYOR_BUILD_FOLDER%
-install: python ../ci_boost_library_test.py install
-before_build: python ../ci_boost_library_test.py before_build
-build_script: python ../ci_boost_library_test.py build_script
-after_build: python ../ci_boost_library_test.py after_build
-before_test: python ../ci_boost_library_test.py before_test
-test_script: python ../ci_boost_library_test.py test_script
-after_test: python ../ci_boost_library_test.py after_test
-on_success: python ../ci_boost_library_test.py on_success
-on_failure: python ../ci_boost_library_test.py on_failure
-on_finish: python ../ci_boost_library_test.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

cmake/BoostVersion.cmake

@@ -1 +0,0 @@
-set(BOOST_VERSION 1.65.0)

cmake/Jamfile

@@ -1,20 +0,0 @@
-# Update cmake files
-
-install BoostVersion_ : ../../../BoostVersion.cmake : <location>. ;
-install default_ : ../../../cmake/default.cmake : <location>. ;
-
-# Update dependencies
-
-import path ;
-
-path-constant LIBDIR : .. ;
-
-actions boostdep-cmake
-{
-    "$(LIBDIR)/../../dist/bin/boostdep" --cmake $(LIBDIR:B) > $(1)
-}
-
-make dependencies.cmake : : @boostdep-cmake ;
-always dependencies.cmake ;
-
-install dependencies_ : dependencies.cmake : <location>. ;

cmake/default.cmake

@@ -1,103 +0,0 @@
-#
-# Default CMakeLists.txt contents for a Boost library
-#
-
-# sources.cmake defines ${PROJECT_NAME}_SOURCES
-include(cmake/sources.cmake)
-
-if("${${PROJECT_NAME}_SOURCES}" STREQUAL "")
-
-  # if no sources, this is a header-only library
-  add_library(boost_${BOOST_PROJECT_NAME} INTERFACE)
-
-  # include directory
-  target_include_directories(${PROJECT_NAME} INTERFACE
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include>
-  )
-
-else()
-
-  # a library that requires building
-  add_library(${PROJECT_NAME} ${${PROJECT_NAME}_SOURCES})
-
-  # include directory
-  target_include_directories(${PROJECT_NAME} PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-    $<INSTALL_INTERFACE:include>
-  )
-
-endif()
-
-# add namespaced alias
-add_library(boost::${BOOST_PROJECT_NAME} ALIAS ${PROJECT_NAME})
-
-# set imported target name to the unqualified name, it will be namespaced
-set_property(TARGET ${PROJECT_NAME} PROPERTY EXPORT_NAME ${BOOST_PROJECT_NAME})
-
-# link to dependencies
-include(CMakeFindDependencyMacro)
-
-function(boost_declare_dependency package type target)
-
-  target_link_libraries(${PROJECT_NAME} ${type} ${target})
-
-  if(${CMAKE_CURRENT_SOURCE_DIR} STREQUAL ${CMAKE_SOURCE_DIR})
-
-    find_dependency(${package} ${PROJECT_VERSION} EXACT)
-
-  endif()
-
-endfunction()
-
-include(cmake/dependencies.cmake)
-
-# target installation
-install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}-targets
-    RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib
-    INCLUDES DESTINATION include
-)
-
-# header installation
-install(DIRECTORY include/ DESTINATION include)
-
-# export target info to ${PROJECT_NAME}-targets.cmake, used by -config.cmake
-install(EXPORT ${PROJECT_NAME}-targets
-  FILE ${PROJECT_NAME}-targets.cmake
-  NAMESPACE boost::
-  DESTINATION lib/cmake/${PROJECT_NAME}-${PROJECT_VERSION}
-)
-
-# install -dependencies.cmake, used by -config.cmake
-
-install(FILES cmake/dependencies.cmake
-  DESTINATION lib/cmake/${PROJECT_NAME}-${PROJECT_VERSION}
-  RENAME ${PROJECT_NAME}-dependencies.cmake
-)
-
-# write ${PROJECT_NAME}-config.cmake
-file(WRITE "${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config.cmake" "
-include(\${CMAKE_CURRENT_LIST_DIR}/${PROJECT_NAME}-targets.cmake)
-include(CMakeFindDependencyMacro)
-function(boost_declare_dependency package type target)
-  find_dependency(\${package} ${PROJECT_VERSION} EXACT)
-endfunction()
-include(\${CMAKE_CURRENT_LIST_DIR}/${PROJECT_NAME}-dependencies.cmake)
-")
-
-include(CMakePackageConfigHelpers)
-
-# write ${PROJECT_NAME}-config-version.cmake
-write_basic_package_version_file("${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake"
-  VERSION ${PROJECT_VERSION}
-  COMPATIBILITY AnyNewerVersion
-)
-
-# install -config, -config-version
-install(FILES
-    "${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
-    "${PROJECT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake"
-  DESTINATION lib/cmake/${PROJECT_NAME}-${PROJECT_VERSION}
-)

cmake/dependencies.cmake

@@ -1,2 +0,0 @@
-# Generated file. Do not edit.
-

doc/build.jam

@@ -76,7 +76,7 @@ boostbook standalone
 #   alias boostdoc ;
 #   explicit boostdoc ;
 #
-alias boostdoc : predef ;
+alias boostdoc : predef : : : <implicit-dependency>predef ;
 explicit boostdoc ;
 
 # Target for Boost standalone release documentation building.

doc/history.qbk

@@ -7,25 +7,6 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 [section History]
 
-[heading 1.6]
-
-* Fix Intel C/C++ version 9999 detection to be 12.1.0.
-* Addition of `BOOST_PREDEF_WORKAROUND` and `BOOST_PREDEF_TESTED_AT` macros
-  for defect workarounds and detection.
-* Add ARM64 MSVC SIMD detection. (from Minmin Gong)
-* Add detection of iOS simulator vs device as a platform choice. (from Ruslan
-  Baratov)
-* Fix MinGW incorrect header guard. (from Ruslan Baratov)
-
-[heading 1.5]
-
-* Fix Intel C/C++ compiler version specification.
-* Add `BOOST_VERSION_NUMBER_MAJOR`, `BOOST_VERSION_NUMBER_MINOR`,
-  `BOOST_VERSION_NUMBER_PATCH` macros to extract components from valid version
-  numbers.
-* Change VS version numbering. Version after VS2015 will use the compiler
-  version instead of the varied product versions.
-
 [heading 1.4.1]
 
 * Small fixes for some redefinition errors, and mispelled macros.

doc/predef.qbk

@@ -1,8 +1,8 @@
 [article Boost.Predef
     [quickbook 1.7]
-    [version 1.6]
+    [version 1.4.1]
     [authors [Rivera, Rene]]
-    [copyright 2005-2016 Rene Rivera]
+    [copyright 2005, 2008-2016 Rene Rivera]
     [copyright 2015 Charly Chevalier]
     [copyright 2015 Joel Falcou]
     [purpose Identification and specification of predefined macros.]
@@ -114,8 +114,12 @@ done:
 * Additionally, even if there is no auto-configure style option.. It would be
   good to add optionally included headers so that user can get consistent
   version number definitions for libraries they use.
+* Having a consistent set of version number definitions opens the door to
+  improving the user level syntax of libraries that do checks against version
+  numbers. Specifically Boost Config's `BOOST_WORKAROUND` macro would benefit
+  from a more readable syntax. As would the `BOOST_TESTED_AT` detail macro.
 * And obviously there's lots of work to do in reformulating the existing
-  Boost libraries to use the Predef library.
+  Boost libraries to use the Predef library once it's accepted.
 * And there's the continuing work of adding definitions for present and
   future compilers, platforms, architectures, languages, and libraries.
 

doc/todo.qbk

@@ -1,5 +1,5 @@
 [/
-Copyright 2014-2017 Rene Rivera
+Copyright 2014 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)
@@ -8,5 +8,6 @@ http://www.boost.org/LICENSE_1_0.txt)
 [section To Do]
 
 * Improve reference documentation.
+* Provide BOOST_WORKAROUND style macros for public use.
 
 [endsect]

include/boost/predef/architecture/arm.h

@@ -27,13 +27,11 @@ http://www.boost.org/LICENSE_1_0.txt)
     [[`__TARGET_ARCH_ARM`] [__predef_detection__]]
     [[`__TARGET_ARCH_THUMB`] [__predef_detection__]]
     [[`_M_ARM`] [__predef_detection__]]
-    [[`_M_ARM64`] [__predef_detection__]]
 
     [[`__arm64`] [8.0.0]]
     [[`__TARGET_ARCH_ARM`] [V.0.0]]
     [[`__TARGET_ARCH_THUMB`] [V.0.0]]
     [[`_M_ARM`] [V.0.0]]
-    [[`_M_ARM64`] [8.0.0]]
     ]
  */
 
@@ -41,7 +39,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #if defined(__arm__) || defined(__arm64) || defined(__thumb__) || \
     defined(__TARGET_ARCH_ARM) || defined(__TARGET_ARCH_THUMB) || \
-    defined(_M_ARM) || defined(_M_ARM64)
+    defined(_M_ARM)
 #   undef BOOST_ARCH_ARM
 #   if !defined(BOOST_ARCH_ARM) && defined(__arm64)
 #       define BOOST_ARCH_ARM BOOST_VERSION_NUMBER(8,0,0)
@@ -52,9 +50,6 @@ http://www.boost.org/LICENSE_1_0.txt)
 #   if !defined(BOOST_ARCH_ARM) && defined(__TARGET_ARCH_THUMB)
 #       define BOOST_ARCH_ARM BOOST_VERSION_NUMBER(__TARGET_ARCH_THUMB,0,0)
 #   endif
-#   if !defined(BOOST_ARCH_ARM) && defined(_M_ARM64)
-#       define BOOST_ARCH_ARM BOOST_VERSION_NUMBER(8,0,0)
-#   endif
 #   if !defined(BOOST_ARCH_ARM) && defined(_M_ARM)
 #       define BOOST_ARCH_ARM BOOST_VERSION_NUMBER(_M_ARM,0,0)
 #   endif

include/boost/predef/compiler/intel.h

@@ -1,5 +1,5 @@
 /*
-Copyright Rene Rivera 2008-2017
+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)
@@ -25,8 +25,7 @@ Version number available as major, minor, and patch.
     [[`__ICC`] [__predef_detection__]]
     [[`__ECC`] [__predef_detection__]]
 
-    [[`__INTEL_COMPILER`] [V.R]]
-    [[`__INTEL_COMPILER` and `__INTEL_COMPILER_UPDATE`] [V.R.P]]
+    [[`__INTEL_COMPILER`] [V.R.P]]
     ]
  */
 
@@ -34,21 +33,8 @@ Version number available as major, minor, and patch.
 
 #if defined(__INTEL_COMPILER) || defined(__ICL) || defined(__ICC) || \
     defined(__ECC)
-/*`
-[note Because of an Intel mistake in the release version numbering when
-`__INTEL_COMPILER` is `9999` it is detected as version 12.1.0.]
- */
-#   if !defined(BOOST_COMP_INTEL_DETECTION) && defined(__INTEL_COMPILER) && (__INTEL_COMPILER == 9999)
-#       define BOOST_COMP_INTEL_DETECTION BOOST_VERSION_NUMBER(12,1,0)
-#   endif
-#   if !defined(BOOST_COMP_INTEL_DETECTION) && defined(__INTEL_COMPILER) && defined(__INTEL_COMPILER_UPDATE)
-#       define BOOST_COMP_INTEL_DETECTION BOOST_VERSION_NUMBER( \
-            BOOST_VERSION_NUMBER_MAJOR(BOOST_PREDEF_MAKE_10_VVRR(__INTEL_COMPILER)), \
-            BOOST_VERSION_NUMBER_MINOR(BOOST_PREDEF_MAKE_10_VVRR(__INTEL_COMPILER)), \
-            __INTEL_COMPILER_UPDATE)
-#   endif
 #   if !defined(BOOST_COMP_INTEL_DETECTION) && defined(__INTEL_COMPILER)
-#       define BOOST_COMP_INTEL_DETECTION BOOST_PREDEF_MAKE_10_VVRR(__INTEL_COMPILER)
+#       define BOOST_COMP_INTEL_DETECTION BOOST_PREDEF_MAKE_10_VRP(__INTEL_COMPILER)
 #   endif
 #   if !defined(BOOST_COMP_INTEL_DETECTION)
 #       define BOOST_COMP_INTEL_DETECTION BOOST_VERSION_NUMBER_AVAILABLE

include/boost/predef/compiler/visualc.h

@@ -29,10 +29,6 @@ Version number available as major, minor, and patch.
     [[`_MSC_FULL_VER`] [V.R.P]]
     [[`_MSC_VER`] [V.R.0]]
     ]
-
-[note Release of Visual Studio after 2015 will no longer be identified
-by Boost Predef as the marketing version number. Instead we use the
-compiler version number directly, i.e. the _MSC_VER number.]
  */
 
 #define BOOST_COMP_MSVC BOOST_VERSION_NUMBER_NOT_AVAILABLE
@@ -57,18 +53,8 @@ compiler version number directly, i.e. the _MSC_VER number.]
     means that the compiler and VS product versions are no longer
     in sync. Hence we need to use different formulas for
     mapping from MSC version to VS product version.
-
-    VS2017 is a total nightmare when it comes to version numbers.
-    Hence to avoid arguments relating to that both present and
-    future.. Any version after VS2015 will use solely the compiler
-    version, i.e. cl.exe, as the version number here.
     */
-#   if (_MSC_VER > 1900)
-#       define BOOST_COMP_MSVC_DETECTION BOOST_VERSION_NUMBER(\
-            _MSC_VER/100,\
-            _MSC_VER%100,\
-            BOOST_COMP_MSVC_BUILD)
-#   elif (_MSC_VER >= 1900)
+#   if (_MSC_VER >= 1900)
 #       define BOOST_COMP_MSVC_DETECTION BOOST_VERSION_NUMBER(\
             _MSC_VER/100-5,\
             _MSC_VER%100,\

include/boost/predef/hardware/simd/arm.h

@@ -24,7 +24,6 @@ http://www.boost.org/LICENSE_1_0.txt)
      [[`__ARM_NEON__`] [__predef_detection__]]
      [[`__aarch64__`] [__predef_detection__]]
      [[`_M_ARM`] [__predef_detection__]]
-     [[`_M_ARM64`] [__predef_detection__]]
      ]
 
  [table
@@ -33,7 +32,6 @@ http://www.boost.org/LICENSE_1_0.txt)
      [[`__ARM_NEON__`] [BOOST_HW_SIMD_ARM_NEON_VERSION]]
      [[`__aarch64__`] [BOOST_HW_SIMD_ARM_NEON_VERSION]]
      [[`_M_ARM`] [BOOST_HW_SIMD_ARM_NEON_VERSION]]
-     [[`_M_ARM64`] [BOOST_HW_SIMD_ARM_NEON_VERSION]]
      ]
 
  */
@@ -41,7 +39,7 @@ http://www.boost.org/LICENSE_1_0.txt)
 #define BOOST_HW_SIMD_ARM BOOST_VERSION_NUMBER_NOT_AVAILABLE
 
 #undef BOOST_HW_SIMD_ARM
-#if !defined(BOOST_HW_SIMD_ARM) && (defined(__ARM_NEON__) || defined(__aarch64__) || defined (_M_ARM) || defined (_M_ARM64))
+#if !defined(BOOST_HW_SIMD_ARM) && (defined(__ARM_NEON__) || defined(__aarch64__) || defined (_M_ARM))
 #   define BOOST_HW_SIMD_ARM BOOST_HW_SIMD_ARM_NEON_VERSION
 #endif
 

include/boost/predef/other/workaround.h

@@ -1,87 +0,0 @@
-/*
-Copyright Rene Rivera 2017
-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)
-*/
-
-#ifndef BOOST_PREDEF_WORKAROUND_H
-#define BOOST_PREDEF_WORKAROUND_H
-
-/*`
-[heading `BOOST_PREDEF_WORKAROUND`]
-
-``
-BOOST_PREDEF_WORKAROUND(symbol,comp,major,minor,patch)
-``
-
-Usage:
-
-``
-#if BOOST_PREDEF_WORKAROUND(BOOST_COMP_CLANG,<,3,0,0)
-    // Workaround for old clang compilers..
-#endif
-``
-
-Defines a comparison against two version numbers that depends on the definion
-of `BOOST_STRICT_CONFIG`. When `BOOST_STRICT_CONFIG` is defined this will expand
-to a value convertible to `false`. Which has the effect of disabling all code
-conditionally guarded by `BOOST_PREDEF_WORKAROUND`. When `BOOST_STRICT_CONFIG`
-is undefine this expand to test the given `symbol` version value with the
-`comp` comparison against `BOOST_VERSION_NUMBER(major,minor,patch)`.
-*/
-#ifdef BOOST_STRICT_CONFIG
-#   define BOOST_PREDEF_WORKAROUND(symbol, comp, major, minor, patch) (0)
-#else
-#   include <boost/predef/version_number.h>
-#   define BOOST_PREDEF_WORKAROUND(symbol, comp, major, minor, patch) \
-        ( (symbol) != (0) ) && \
-        ( (symbol) comp (BOOST_VERSION_NUMBER( (major) , (minor) , (patch) )) )
-#endif
-
-/*`
-[heading `BOOST_PREDEF_TESTED_AT`]
-
-``
-BOOST_PREDEF_TESTED_AT(symbol,major,minor,patch)
-``
-
-Usage:
-
-``
-#if BOOST_PREDEF_TESTED_AT(BOOST_COMP_CLANG,3,5,0)
-    // Needed for clang, and last checked for 3.5.0.
-#endif
-``
-
-Defines a comparison against two version numbers that depends on the definion
-of `BOOST_STRICT_CONFIG` and `BOOST_DETECT_OUTDATED_WORKAROUNDS`.
-When `BOOST_STRICT_CONFIG` is defined this will expand to a value convertible
-to `false`. Which has the effect of disabling all code
-conditionally guarded by `BOOST_PREDEF_TESTED_AT`. When `BOOST_STRICT_CONFIG`
-is undefined this expand to either:
-
-* A value convertible to `true` when `BOOST_DETECT_OUTDATED_WORKAROUNDS` is not
-  defined.
-* A value convertible `true` when the expansion of
-  `BOOST_PREDEF_WORKAROUND(symbol, <=, major, minor, patch)` is `true` and
-  `BOOST_DETECT_OUTDATED_WORKAROUNDS` is defined.
-* A compile error when the expansion of
-  `BOOST_PREDEF_WORKAROUND(symbol, >, major, minor, patch)` is true and
-  `BOOST_DETECT_OUTDATED_WORKAROUNDS` is defined.
-*/
-#ifdef BOOST_STRICT_CONFIG
-#   define BOOST_PREDEF_TESTED_AT(symbol, major, minor, patch) (0)
-#else
-#   ifdef BOOST_DETECT_OUTDATED_WORKAROUNDS
-#       define BOOST_PREDEF_TESTED_AT(symbol, major, minor, patch) ( \
-            BOOST_PREDEF_WORKAROUND(symbol, <=, major, minor, patch) \
-            ? 1 \
-            : (1%0) )
-#   else
-#       define BOOST_PREDEF_TESTED_AT(symbol, major, minor, patch) \
-            ( (symbol) >= BOOST_VERSION_NUMBER_AVAILABLE )
-#   endif
-#endif
-
-#endif

include/boost/predef/platform.h

@@ -16,7 +16,6 @@ http://www.boost.org/LICENSE_1_0.txt)
 #include <boost/predef/platform/windows_store.h>
 #include <boost/predef/platform/windows_phone.h>
 #include <boost/predef/platform/windows_runtime.h>
-#include <boost/predef/platform/ios.h>
 /*#include <boost/predef/platform/.h>*/
 
 #endif

include/boost/predef/platform/ios.h

@@ -1,58 +0,0 @@
-/*
-Copyright Ruslan Baratov 2017
-Copyright Rene Rivera 2017
-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)
-*/
-
-#ifndef BOOST_PREDEF_PLAT_IOS_H
-#define BOOST_PREDEF_PLAT_IOS_H
-
-#include <boost/predef/os/ios.h> // BOOST_OS_IOS
-#include <boost/predef/version_number.h> // BOOST_VERSION_NUMBER_NOT_AVAILABLE
-
-/*`
-[heading `BOOST_PLAT_IOS_DEVICE`]
-[heading `BOOST_PLAT_IOS_SIMULATOR`]
-
-[table
-    [[__predef_symbol__] [__predef_version__]]
-
-    [[`TARGET_IPHONE_SIMULATOR`] [__predef_detection__]]
-    ]
- */
-
-#define BOOST_PLAT_IOS_DEVICE BOOST_VERSION_NUMBER_NOT_AVAILABLE
-#define BOOST_PLAT_IOS_SIMULATOR BOOST_VERSION_NUMBER_NOT_AVAILABLE
-
-// https://opensource.apple.com/source/CarbonHeaders/CarbonHeaders-18.1/TargetConditionals.h
-#if BOOST_OS_IOS
-#    include <TargetConditionals.h>
-#    if TARGET_IPHONE_SIMULATOR == 1
-#        undef BOOST_PLAT_IOS_SIMULATOR
-#        define BOOST_PLAT_IOS_SIMULATOR BOOST_VERSION_NUMBER_AVAILABLE
-#    else
-#        undef BOOST_PLAT_IOS_DEVICE
-#        define BOOST_PLAT_IOS_DEVICE BOOST_VERSION_NUMBER_AVAILABLE
-#    endif
-#endif
-
-#if BOOST_PLAT_IOS_SIMULATOR
-#    define BOOST_PLAT_IOS_SIMULATOR_AVAILABLE
-#    include <boost/predef/detail/platform_detected.h>
-#endif
-
-#if BOOST_PLAT_IOS_DEVICE
-#    define BOOST_PLAT_IOS_DEVICE_AVAILABLE
-#    include <boost/predef/detail/platform_detected.h>
-#endif
-
-#define BOOST_PLAT_IOS_SIMULATOR_NAME "iOS Simulator"
-#define BOOST_PLAT_IOS_DEVICE_NAME "iOS Device"
-
-#endif // BOOST_PREDEF_PLAT_IOS_H
-
-#include <boost/predef/detail/test.h>
-BOOST_PREDEF_DECLARE_TEST(BOOST_PLAT_IOS_SIMULATOR,BOOST_PLAT_IOS_SIMULATOR_NAME)
-BOOST_PREDEF_DECLARE_TEST(BOOST_PLAT_IOS_DEVICE,BOOST_PLAT_IOS_DEVICE_NAME)

include/boost/predef/platform/mingw.h

@@ -5,8 +5,8 @@ Distributed under the Boost Software License, Version 1.0.
 http://www.boost.org/LICENSE_1_0.txt)
 */
 
-#ifndef BOOST_PREDEF_PLAT_MINGW_H
-#define BOOST_PREDEF_PLAT_MINGW_H
+#ifndef BOOST_PREDEF_COMPILER_MINGW_H
+#define BOOST_PREDEF_COMPILER_MINGW_H
 
 #include <boost/predef/version_number.h>
 #include <boost/predef/make.h>

include/boost/predef/version.h

@@ -10,6 +10,6 @@ http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/predef/version_number.h>
 
-#define BOOST_PREDEF_VERSION BOOST_VERSION_NUMBER(1,6,0)
+#define BOOST_PREDEF_VERSION BOOST_VERSION_NUMBER(1,4,1)
 
 #endif

include/boost/predef/version_number.h

@@ -1,5 +1,5 @@
 /*
-Copyright Rene Rivera 2005-2016
+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)
@@ -50,23 +50,4 @@ Defines standard version numbers, with these properties:
 #define BOOST_VERSION_NUMBER_NOT_AVAILABLE \
     BOOST_VERSION_NUMBER_ZERO
 
-/*`
-``
-BOOST_VERSION_NUMBER_MAJOR(N), BOOST_VERSION_NUMBER_MINOR(N), BOOST_VERSION_NUMBER_PATCH(N)
-``
-
-The macros extract the major, minor, and patch portion from a well formed
-version number resulting in a preprocessor expression in the range of
-\[0,99\] or \[0,99999\] for the major and minor, or patch numbers
-respectively.
-*/
-#define BOOST_VERSION_NUMBER_MAJOR(N) \
-    ( ((N)/10000000)%100 )
-
-#define BOOST_VERSION_NUMBER_MINOR(N) \
-    ( ((N)/100000)%100 )
-
-#define BOOST_VERSION_NUMBER_PATCH(N) \
-    ( (N)%100000 )
-
 #endif

test/build.jam

@@ -59,10 +59,6 @@ test-suite predef :
     [ compile macos_vs_bsd.c : [ predef-require "BOOST_OS_MACOS" : cpp ] ]
     [ run check_value.cpp : : : <test-info>always_show_run_output
         [ predef-check "BOOST_COMP_CLANG > 0.0.0" "BOOST_OS_LINUX == 0" : : <cxxflags>-DCHECK_VALUE=true ] ]
-    [ run workaround.cpp ]
-    [ compile workaround_strict_config.cpp ]
-    [ run tested_at.cpp ]
-    [ compile-fail tested_at_outdated.cpp : <test-info>always_show_run_output ]
     ;
 
 # Minimal testing done for predef for CI. Since

test/tested_at.cpp

@@ -1,62 +0,0 @@
-/*
-Copyright Rene Rivera 2011-2017
-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 <boost/predef/version_number.h>
-#include <boost/predef/other/workaround.h>
-#include <exception>
-#include <vector>
-#include <string>
-#include <iostream>
-
-namespace
-{
-    struct test_info
-    {
-        std::string value;
-        bool passed;
-
-        test_info(std::string const & v, bool p) : value(v), passed(p) {}
-        test_info(test_info const & o) : value(o.value), passed(o.passed) {}
-    };
-
-    std::vector<test_info> test_results;
-}
-
-#define PREDEF_CHECK(X) test_results.push_back(test_info(#X,(X)))
-
-void test_BOOST_PREDEF_TESTED_AT()
-{
-    PREDEF_CHECK(BOOST_PREDEF_TESTED_AT(BOOST_VERSION_NUMBER(15,15,15),0xF,0xF,0xF));
-    PREDEF_CHECK(BOOST_PREDEF_TESTED_AT(BOOST_VERSION_NUMBER(1,0,0),1,0,0));
-    PREDEF_CHECK(BOOST_PREDEF_TESTED_AT(BOOST_VERSION_NUMBER(0,9,0),1,0,0));
-    PREDEF_CHECK(BOOST_PREDEF_TESTED_AT(BOOST_VERSION_NUMBER(2,0,0),1,0,0));
-    PREDEF_CHECK(!BOOST_PREDEF_TESTED_AT(BOOST_VERSION_NUMBER_NOT_AVAILABLE,1,0,0));
-}
-
-int main()
-{
-    test_BOOST_PREDEF_TESTED_AT();
-
-    unsigned fail_count = 0;
-    std::vector<test_info>::iterator i = test_results.begin();
-    std::vector<test_info>::iterator e = test_results.end();
-    for (; i != e; ++i)
-    {
-        std::cout
-            << (i->passed ? "[passed]" : "[failed]")
-            << " " << i->value
-            << std::endl;
-        fail_count += i->passed ? 0 : 1;
-    }
-    std::cout
-        << std::endl
-        << "TOTAL: "
-        << "passed " << (test_results.size()-fail_count) << ", "
-        << "failed " << (fail_count) << ", "
-        << "of " << (test_results.size())
-        << std::endl;
-    return fail_count;
-}

test/tested_at_outdated.cpp

@@ -1,18 +0,0 @@
-/*
-Copyright Rene Rivera 2011-2017
-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 <boost/predef/version_number.h>
-#define BOOST_DETECT_OUTDATED_WORKAROUNDS
-#include <boost/predef/other/workaround.h>
-
-int main()
-{
-#if BOOST_PREDEF_TESTED_AT(BOOST_VERSION_NUMBER(2,0,0),1,0,0)
-    return 1;
-#else
-    return 0;
-#endif
-}

test/version.cpp

@@ -34,27 +34,6 @@ void test_BOOST_VERSION_NUMBER()
     PREDEF_CHECK(BOOST_VERSION_NUMBER(100,99,99999) != 1009999999L);
     PREDEF_CHECK(BOOST_VERSION_NUMBER(100,99,99999) == 9999999L);
     PREDEF_CHECK(BOOST_VERSION_NUMBER(100,100,100000) == 0L);
-
-    PREDEF_CHECK(
-        BOOST_VERSION_NUMBER_MAJOR(BOOST_VERSION_NUMBER(0,0,0)) == 0);
-    PREDEF_CHECK(
-        BOOST_VERSION_NUMBER_MAJOR(BOOST_VERSION_NUMBER(3,3,3)) == 3);
-    PREDEF_CHECK(
-        BOOST_VERSION_NUMBER_MAJOR(BOOST_VERSION_NUMBER(99,99,99999)) == 99);
-
-    PREDEF_CHECK(
-        BOOST_VERSION_NUMBER_MINOR(BOOST_VERSION_NUMBER(0,0,0)) == 0);
-    PREDEF_CHECK(
-        BOOST_VERSION_NUMBER_MINOR(BOOST_VERSION_NUMBER(3,3,3)) == 3);
-    PREDEF_CHECK(
-        BOOST_VERSION_NUMBER_MINOR(BOOST_VERSION_NUMBER(99,99,99999)) == 99);
-
-    PREDEF_CHECK(
-        BOOST_VERSION_NUMBER_PATCH(BOOST_VERSION_NUMBER(0,0,0)) == 0);
-    PREDEF_CHECK(
-        BOOST_VERSION_NUMBER_PATCH(BOOST_VERSION_NUMBER(3,3,3)) == 3);
-    PREDEF_CHECK(
-        BOOST_VERSION_NUMBER_PATCH(BOOST_VERSION_NUMBER(99,99,99999)) == 99999);
 }
 
 int main()

test/workaround.cpp

@@ -1,62 +0,0 @@
-/*
-Copyright Rene Rivera 2011-2017
-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 <boost/predef/version_number.h>
-#include <boost/predef/other/workaround.h>
-#include <exception>
-#include <vector>
-#include <string>
-#include <iostream>
-
-namespace
-{
-    struct test_info
-    {
-        std::string value;
-        bool passed;
-
-        test_info(std::string const & v, bool p) : value(v), passed(p) {}
-        test_info(test_info const & o) : value(o.value), passed(o.passed) {}
-    };
-
-    std::vector<test_info> test_results;
-}
-
-#define PREDEF_CHECK(X) test_results.push_back(test_info(#X,(X)))
-
-void test_BOOST_PREDEF_WORKAROUND()
-{
-    PREDEF_CHECK(BOOST_PREDEF_WORKAROUND(BOOST_VERSION_NUMBER(15,15,15),==,0xF,0xF,0xF));
-    PREDEF_CHECK(BOOST_PREDEF_WORKAROUND(BOOST_VERSION_NUMBER(0,9,0),<,1,0,0));
-    PREDEF_CHECK(BOOST_PREDEF_WORKAROUND(BOOST_VERSION_NUMBER(0,9,0),!=,1,0,0));
-    PREDEF_CHECK(BOOST_PREDEF_WORKAROUND(BOOST_VERSION_NUMBER_MIN,<,1,0,0));
-    PREDEF_CHECK(BOOST_PREDEF_WORKAROUND(BOOST_VERSION_NUMBER_MIN,>,0,0,0));
-}
-
-int main()
-{
-    test_BOOST_PREDEF_WORKAROUND();
-
-    unsigned fail_count = 0;
-    std::vector<test_info>::iterator i = test_results.begin();
-    std::vector<test_info>::iterator e = test_results.end();
-    for (; i != e; ++i)
-    {
-        std::cout
-            << (i->passed ? "[passed]" : "[failed]")
-            << " " << i->value
-            << std::endl;
-        fail_count += i->passed ? 0 : 1;
-    }
-    std::cout
-        << std::endl
-        << "TOTAL: "
-        << "passed " << (test_results.size()-fail_count) << ", "
-        << "failed " << (fail_count) << ", "
-        << "of " << (test_results.size())
-        << std::endl;
-    return fail_count;
-}

test/workaround_strict_config.cpp

@@ -1,17 +0,0 @@
-/*
-Copyright Rene Rivera 2011-2017
-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 <boost/predef/version_number.h>
-#define BOOST_STRICT_CONFIG
-#include <boost/predef/other/workaround.h>
-
-int main()
-{
-#if BOOST_PREDEF_WORKAROUND(BOOST_VERSION_NUMBER_AVAILABLE,==,0,0,1)
-    fail();
-#endif
-    return 0;
-}