boostorg/config
1
0
Fork 1
mirror of https://github.com/boostorg/config.git synced 2025-07-31 21:04:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Apply patches from #8753.

Browse Source 
Fixes #8753.

[SVN r85137]
This commit is contained in:
John Maddock
2013-07-23 17:32:10 +00:00
parent c42fbefc03
commit 5d792c13e7
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -151,11 +151,16 @@ BOOST_LIB_VERSION: The Boost version, in the form x_y, for Boost version x.y.
// vc10: // vc10:
# define BOOST_LIB_TOOLSET "vc100" # define BOOST_LIB_TOOLSET "vc100"
# elif defined(BOOST_MSVC) # elif defined(BOOST_MSVC) && (BOOST_MSVC < 1800)
// vc11: // vc11:
# define BOOST_LIB_TOOLSET "vc110" # define BOOST_LIB_TOOLSET "vc110"
# elif defined(BOOST_MSVC)
// vc12:
# define BOOST_LIB_TOOLSET "vc120"
# elif defined(__BORLANDC__) # elif defined(__BORLANDC__)
// CBuilder 6: // CBuilder 6:
@@ -421,3 +426,4 @@ BOOST_LIB_VERSION: The Boost version, in the form x_y, for Boost version x.y.
# undef BOOST_DYN_LINK # undef BOOST_DYN_LINK
#endif #endif

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

@@ -312,6 +312,8 @@
# define BOOST_COMPILER_VERSION 10.0 # define BOOST_COMPILER_VERSION 10.0
# elif _MSC_VER < 1800 # elif _MSC_VER < 1800
# define BOOST_COMPILER_VERSION 11.0 # define BOOST_COMPILER_VERSION 11.0
# elif _MSC_VER < 1900
# define BOOST_COMPILER_VERSION 12.0
# else # else
# define BOOST_COMPILER_VERSION _MSC_VER # define BOOST_COMPILER_VERSION _MSC_VER
# endif # endif
@@ -321,8 +323,8 @@
#endif #endif
// //
// last known and checked version is 1700 (VC11, aka 2011): // last known and checked version is 1800.20617 (VC12 Preview, aka 2013 Preview):
#if (_MSC_VER > 1700) #if (_MSC_VER > 1800 && _MSC_FULL_VER > 180020617)
# 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