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

Fixes #2445.

Browse Source 
Update to recognise VC10.

[SVN r49488]
This commit is contained in:
John Maddock
2008-10-29 17:11:50 +00:00
parent ac26a726e7
commit 0f0eef5efa
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

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

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

@@ -79,7 +79,7 @@
# define BOOST_NO_MEMBER_TEMPLATE_FRIENDS # define BOOST_NO_MEMBER_TEMPLATE_FRIENDS
#endif #endif
#if _MSC_VER <= 1500 // 1500 == VC++ 9.0 #if _MSC_VER <= 1600 // 1600 == VC++ 10.0
# define BOOST_NO_TWO_PHASE_NAME_LOOKUP # define BOOST_NO_TWO_PHASE_NAME_LOOKUP
#endif #endif
@@ -175,6 +175,8 @@
# define BOOST_COMPILER_VERSION 8.0 # define BOOST_COMPILER_VERSION 8.0
# elif _MSC_VER == 1500 # elif _MSC_VER == 1500
# define BOOST_COMPILER_VERSION 9.0 # define BOOST_COMPILER_VERSION 9.0
# elif _MSC_VER == 1600
# define BOOST_COMPILER_VERSION 10.0
# else # else
# define BOOST_COMPILER_VERSION _MSC_VER # define BOOST_COMPILER_VERSION _MSC_VER
# endif # endif
@@ -190,7 +192,7 @@
#endif #endif
// //
// last known and checked version is 1500 (VC9): // last known and checked version is 1500 (VC9):
#if (_MSC_VER > 1500) #if (_MSC_VER > 1600)
# 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