|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r49488 - in trunk/boost/config: . compiler
From: john_at_[hidden]
Date: 2008-10-29 13:11:51
Author: johnmaddock
Date: 2008-10-29 13:11:50 EDT (Wed, 29 Oct 2008)
New Revision: 49488
URL: http://svn.boost.org/trac/boost/changeset/49488
Log:
Fixes #2445.
Update to recognise VC10.
Text files modified:
trunk/boost/config/auto_link.hpp | 7 ++++++-
trunk/boost/config/compiler/visualc.hpp | 6 ++++--
2 files changed, 10 insertions(+), 3 deletions(-)
Modified: trunk/boost/config/auto_link.hpp
==============================================================================
--- trunk/boost/config/auto_link.hpp (original)
+++ trunk/boost/config/auto_link.hpp 2008-10-29 13:11:50 EDT (Wed, 29 Oct 2008)
@@ -135,11 +135,16 @@
// vc80:
# define BOOST_LIB_TOOLSET "vc80"
-#elif defined(BOOST_MSVC) && (BOOST_MSVC >= 1500)
+#elif defined(BOOST_MSVC) && (BOOST_MSVC == 1500)
// vc90:
# define BOOST_LIB_TOOLSET "vc90"
+#elif defined(BOOST_MSVC) && (BOOST_MSVC >= 1600)
+
+ // vc10:
+# define BOOST_LIB_TOOLSET "vc100"
+
#elif defined(__BORLANDC__)
// CBuilder 6:
Modified: trunk/boost/config/compiler/visualc.hpp
==============================================================================
--- trunk/boost/config/compiler/visualc.hpp (original)
+++ trunk/boost/config/compiler/visualc.hpp 2008-10-29 13:11:50 EDT (Wed, 29 Oct 2008)
@@ -79,7 +79,7 @@
# define BOOST_NO_MEMBER_TEMPLATE_FRIENDS
#endif
-#if _MSC_VER <= 1500 // 1500 == VC++ 9.0
+#if _MSC_VER <= 1600 // 1600 == VC++ 10.0
# define BOOST_NO_TWO_PHASE_NAME_LOOKUP
#endif
@@ -175,6 +175,8 @@
# define BOOST_COMPILER_VERSION 8.0
# elif _MSC_VER == 1500
# define BOOST_COMPILER_VERSION 9.0
+# elif _MSC_VER == 1600
+# define BOOST_COMPILER_VERSION 10.0
# else
# define BOOST_COMPILER_VERSION _MSC_VER
# endif
@@ -190,7 +192,7 @@
#endif
//
// last known and checked version is 1500 (VC9):
-#if (_MSC_VER > 1500)
+#if (_MSC_VER > 1600)
# if defined(BOOST_ASSERT_CONFIG)
# error "Unknown compiler version - please run the configure tests and report the results"
# else
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk