boostorg/predef
1
0
Fork 1
mirror of https://github.com/boostorg/predef.git synced 2025-07-29 11:37:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop'

Browse Source
This commit is contained in:
Rene Rivera
2017-03-17 20:44:25 -05:00
parent b6910fb493 0d56819d68
commit b0ca8915b5
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/history.qbk
View File

@ -13,6 +13,8 @@ http://www.boost.org/LICENSE_1_0.txt)
* Add `BOOST_VERSION_NUMBER_MAJOR`, `BOOST_VERSION_NUMBER_MINOR`, * Add `BOOST_VERSION_NUMBER_MAJOR`, `BOOST_VERSION_NUMBER_MINOR`,
`BOOST_VERSION_NUMBER_PATCH` macros to extract components from valid version `BOOST_VERSION_NUMBER_PATCH` macros to extract components from valid version
numbers. numbers.
* Change VS version numbering. Version after VS2015 will use the compiler
version instead of the varied product versions.
[heading 1.4.1] [heading 1.4.1]

16
include/boost/predef/compiler/visualc.h
View File

@ -29,6 +29,10 @@ Version number available as major, minor, and patch.
[[`_MSC_FULL_VER`] [V.R.P]] [[`_MSC_FULL_VER`] [V.R.P]]
[[`_MSC_VER`] [V.R.0]] [[`_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 #define BOOST_COMP_MSVC BOOST_VERSION_NUMBER_NOT_AVAILABLE
@ -53,8 +57,18 @@ Version number available as major, minor, and patch.
means that the compiler and VS product versions are no longer means that the compiler and VS product versions are no longer
in sync. Hence we need to use different formulas for in sync. Hence we need to use different formulas for
mapping from MSC version to VS product version. 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) # 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)
# define BOOST_COMP_MSVC_DETECTION BOOST_VERSION_NUMBER(\ # define BOOST_COMP_MSVC_DETECTION BOOST_VERSION_NUMBER(\
_MSC_VER/100-5,\ _MSC_VER/100-5,\
_MSC_VER%100,\ _MSC_VER%100,\