From 7448023a15c121da2e5b9486cdd6717fe22f4d43 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Mon, 18 Aug 2014 15:09:00 +0100 Subject: [PATCH 1/3] Add metadata file. --- meta/libraries.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 meta/libraries.json diff --git a/meta/libraries.json b/meta/libraries.json new file mode 100644 index 0000000..d7e326c --- /dev/null +++ b/meta/libraries.json @@ -0,0 +1,14 @@ +{ + "key": "predef", + "name": "Predef", + "authors": [ + "Rene Rivera" + ], + "description": "This library defines a set of compiler, architecture, operating system, library, and other version numbers from the information it can gather of C, C++, Objective C, and Objective C++ predefined macros or those defined in generally available headers.", + "category": [ + "Miscellaneous" + ], + "maintainers": [ + "Rene Rivera " + ] +} From 75365a884eb03c3e42467e65e7e934d167166a48 Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Tue, 18 Nov 2014 12:44:39 -0600 Subject: [PATCH 2/3] Account for skip in Visual Studio product version vs. compiler version to map compiler version to product version. --- include/boost/predef/compiler/visualc.h | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/include/boost/predef/compiler/visualc.h b/include/boost/predef/compiler/visualc.h index 66d0601..7232ba9 100644 --- a/include/boost/predef/compiler/visualc.h +++ b/include/boost/predef/compiler/visualc.h @@ -48,10 +48,23 @@ Version number available as major, minor, and patch. # error "Cannot determine build number from _MSC_FULL_VER" # endif # endif -# define BOOST_COMP_MSVC_DETECTION BOOST_VERSION_NUMBER(\ - _MSC_VER/100-6,\ - _MSC_VER%100,\ - BOOST_COMP_MSVC_BUILD) + /* + VS2014 was skipped in the release sequence for MS. Which + 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. + */ +# if (_MSC_VER >= 19) +# define BOOST_COMP_MSVC_DETECTION BOOST_VERSION_NUMBER(\ + _MSC_VER/100-5,\ + _MSC_VER%100,\ + BOOST_COMP_MSVC_BUILD) +# else +# define BOOST_COMP_MSVC_DETECTION BOOST_VERSION_NUMBER(\ + _MSC_VER/100-6,\ + _MSC_VER%100,\ + BOOST_COMP_MSVC_BUILD) +# endif #endif #ifdef BOOST_COMP_MSVC_DETECTION From ee021f808ad5b8c70bba5fbf7c3179dc73054c9f Mon Sep 17 00:00:00 2001 From: Rene Rivera Date: Wed, 19 Nov 2014 08:18:17 -0600 Subject: [PATCH 3/3] Fix bad MSC version number. --- include/boost/predef/compiler/visualc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/boost/predef/compiler/visualc.h b/include/boost/predef/compiler/visualc.h index 7232ba9..959d38f 100644 --- a/include/boost/predef/compiler/visualc.h +++ b/include/boost/predef/compiler/visualc.h @@ -54,7 +54,7 @@ Version number available as major, minor, and patch. in sync. Hence we need to use different formulas for mapping from MSC version to VS product version. */ -# if (_MSC_VER >= 19) +# if (_MSC_VER >= 1900) # define BOOST_COMP_MSVC_DETECTION BOOST_VERSION_NUMBER(\ _MSC_VER/100-5,\ _MSC_VER%100,\