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

Apply preliminary VC11 support.

Browse Source 
Fixes #5923.

[SVN r74888]
This commit is contained in:
John Maddock
2011-10-10 11:28:36 +00:00
parent 306a33a922
commit 17dcf6492b
2 changed files with 12 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

@@ -145,11 +145,16 @@ BOOST_LIB_VERSION: The Boost version, in the form x_y, for Boost version x.y.
// vc90: // vc90:
# define BOOST_LIB_TOOLSET "vc90" # define BOOST_LIB_TOOLSET "vc90"
#elif defined(BOOST_MSVC) && (BOOST_MSVC >= 1600) #elif defined(BOOST_MSVC) && (BOOST_MSVC == 1600)
// vc10: // vc10:
# define BOOST_LIB_TOOLSET "vc100" # define BOOST_LIB_TOOLSET "vc100"
#elif defined(BOOST_MSVC) && (BOOST_MSVC >= 1700)
// vc11:
# define BOOST_LIB_TOOLSET "vc110"
#elif defined(__BORLANDC__) #elif defined(__BORLANDC__)
// CBuilder 6: // CBuilder 6:

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

@@ -236,6 +236,8 @@
# define BOOST_COMPILER_VERSION evc9 # define BOOST_COMPILER_VERSION evc9
# elif _MSC_VER == 1600 # elif _MSC_VER == 1600
# define BOOST_COMPILER_VERSION evc10 # define BOOST_COMPILER_VERSION evc10
# elif _MSC_VER == 1700
# define BOOST_COMPILER_VERSION evc11
# 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"
@@ -259,6 +261,8 @@
# define BOOST_COMPILER_VERSION 9.0 # define BOOST_COMPILER_VERSION 9.0
# elif _MSC_VER == 1600 # elif _MSC_VER == 1600
# define BOOST_COMPILER_VERSION 10.0 # define BOOST_COMPILER_VERSION 10.0
# elif _MSC_VER == 1700
# define BOOST_COMPILER_VERSION 11.0
# else # else
# define BOOST_COMPILER_VERSION _MSC_VER # define BOOST_COMPILER_VERSION _MSC_VER
# endif # endif
@@ -273,8 +277,8 @@
#error "Compiler not supported or configured - please reconfigure" #error "Compiler not supported or configured - please reconfigure"
#endif #endif
// //
// last known and checked version is 1600 (VC10, aka 2010): // last known and checked version is 1700 (VC11, aka 2011):
#if (_MSC_VER > 1600) #if (_MSC_VER > 1700)
# 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