[Boost-commit] svn:boost r74888 - in trunk/boost/config: . compiler

Subject: [Boost-commit] svn:boost r74888 - in trunk/boost/config: . compiler
From: john_at_[hidden]
Date: 2011-10-10 07:28:37

Author: johnmaddock
Date: 2011-10-10 07:28:36 EDT (Mon, 10 Oct 2011)
New Revision: 74888
URL: http://svn.boost.org/trac/boost/changeset/74888

Log:
Apply preliminary VC11 support.
Fixes #5923.
Text files modified: 
   trunk/boost/config/auto_link.hpp        |     7 ++++++-                                 
   trunk/boost/config/compiler/visualc.hpp |     8 ++++++--                                
   2 files changed, 12 insertions(+), 3 deletions(-)

Modified: trunk/boost/config/auto_link.hpp
==============================================================================
--- trunk/boost/config/auto_link.hpp	(original)
+++ trunk/boost/config/auto_link.hpp	2011-10-10 07:28:36 EDT (Mon, 10 Oct 2011)
@@ -145,11 +145,16 @@
    // vc90:
 #  define BOOST_LIB_TOOLSET "vc90"
 
-#elif defined(BOOST_MSVC) && (BOOST_MSVC >= 1600)
+#elif defined(BOOST_MSVC) && (BOOST_MSVC == 1600)
 
    // vc10:
 #  define BOOST_LIB_TOOLSET "vc100"
 
+#elif defined(BOOST_MSVC) && (BOOST_MSVC >= 1700)
+
+   // vc11:
+#  define BOOST_LIB_TOOLSET "vc110"
+
 #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	2011-10-10 07:28:36 EDT (Mon, 10 Oct 2011)
@@ -236,6 +236,8 @@
 #     define BOOST_COMPILER_VERSION evc9
 #   elif _MSC_VER == 1600
 #     define BOOST_COMPILER_VERSION evc10
+#   elif _MSC_VER == 1700 
+#     define BOOST_COMPILER_VERSION evc11 
 #   else
 #      if defined(BOOST_ASSERT_CONFIG)
 #         error "Unknown EVC++ compiler version - please run the configure tests and report the results"
@@ -259,6 +261,8 @@
 #     define BOOST_COMPILER_VERSION 9.0
 #   elif _MSC_VER == 1600
 #     define BOOST_COMPILER_VERSION 10.0
+#   elif _MSC_VER == 1700 
+#     define BOOST_COMPILER_VERSION 11.0 
 #   else
 #     define BOOST_COMPILER_VERSION _MSC_VER
 #   endif
@@ -273,8 +277,8 @@
 #error "Compiler not supported or configured - please reconfigure"
 #endif
 //
-// last known and checked version is 1600 (VC10, aka 2010):
-#if (_MSC_VER > 1600)
+// last known and checked version is 1700 (VC11, aka 2011):
+#if (_MSC_VER > 1700)
 #  if defined(BOOST_ASSERT_CONFIG)
 #     error "Unknown compiler version - please run the configure tests and report the results"
 #  else