feedc0de/boost_config
1
0
Fork 0
forked from boostorg/config
Code Pull Requests Activity

Update existing VC14 support with patches from https://svn.boost.org/trac/boost/ticket/10489

Browse Source
This commit is contained in:
jzmaddock
2014-10-02 17:46:49 +01:00
parent 16a4fc7f6a
commit 04acb85f7a
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/boost/config/auto_link.hpp
View File

@ -156,11 +156,16 @@ BOOST_LIB_VERSION: The Boost version, in the form x_y, for Boost version x.y.
// vc11: // vc11:
# define BOOST_LIB_TOOLSET "vc110" # define BOOST_LIB_TOOLSET "vc110"
# elif defined(BOOST_MSVC) # elif defined(BOOST_MSVC) && (BOOST_MSVC < 1900)
// vc12: // vc12:
# define BOOST_LIB_TOOLSET "vc120" # define BOOST_LIB_TOOLSET "vc120"
# elif defined(BOOST_MSVC)
// vc14:
# define BOOST_LIB_TOOLSET "vc140"
# elif defined(__BORLANDC__) # elif defined(__BORLANDC__)
// CBuilder 6: // CBuilder 6:

6
include/boost/config/compiler/visualc.hpp
View File

@ -227,6 +227,8 @@
# define BOOST_COMPILER_VERSION evc11 # define BOOST_COMPILER_VERSION evc11
# elif _MSC_VER < 1900 # elif _MSC_VER < 1900
# define BOOST_COMPILER_VERSION evc12 # define BOOST_COMPILER_VERSION evc12
# elif _MSC_VER < 2000
# define BOOST_COMPILER_VERSION evc14
# else # else
# if defined(BOOST_ASSERT_CONFIG) # if defined(BOOST_ASSERT_CONFIG)
# error "Unknown EVC++ compiler version - please run the configure tests and report the results" # error "Unknown EVC++ compiler version - please run the configure tests and report the results"
@ -265,8 +267,8 @@
#endif #endif
// //
// last known and checked version is 19.00.21901.1 (VC14 CTP2): // last known and checked version is 19.00.21901.1 (VC14 CTP3):
#if (_MSC_VER > 1800 && _MSC_FULL_VER > 190021901) #if (_MSC_VER > 1800 && _MSC_FULL_VER > 190022013)
# if defined(BOOST_ASSERT_CONFIG) # if defined(BOOST_ASSERT_CONFIG)
# error "Unknown compiler version - please run the configure tests and report the results" # error "Unknown compiler version - please run the configure tests and report the results"
# else # else