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

Subject: [Boost-commit] svn:boost r85137 - in trunk/boost/config: . compiler
From: john_at_[hidden]
Date: 2013-07-23 13:32:10

Author: johnmaddock
Date: 2013-07-23 13:32:10 EDT (Tue, 23 Jul 2013)
New Revision: 85137
URL: http://svn.boost.org/trac/boost/changeset/85137

Log:
Apply patches from #8753.
Fixes #8753.

Text files modified: 
   trunk/boost/config/auto_link.hpp        |     8 +++++++-                                
   trunk/boost/config/compiler/visualc.hpp |     8 +++++---                                
   2 files changed, 12 insertions(+), 4 deletions(-)

Modified: trunk/boost/config/auto_link.hpp
==============================================================================
--- trunk/boost/config/auto_link.hpp	Tue Jul 23 13:26:41 2013	(r85136)
+++ trunk/boost/config/auto_link.hpp	2013-07-23 13:32:10 EDT (Tue, 23 Jul 2013)	(r85137)
@@ -151,11 +151,16 @@
      // vc10:
 #    define BOOST_LIB_TOOLSET "vc100"
 
-#  elif defined(BOOST_MSVC)
+#  elif defined(BOOST_MSVC) && (BOOST_MSVC < 1800)
 
      // vc11:
 #    define BOOST_LIB_TOOLSET "vc110"
 
+#  elif defined(BOOST_MSVC)
+
+     // vc12:
+#    define BOOST_LIB_TOOLSET "vc120"
+
 #  elif defined(__BORLANDC__)
 
      // CBuilder 6:
@@ -421,3 +426,4 @@
 #  undef BOOST_DYN_LINK
 #endif
 
+

Modified: trunk/boost/config/compiler/visualc.hpp
==============================================================================
--- trunk/boost/config/compiler/visualc.hpp	Tue Jul 23 13:26:41 2013	(r85136)
+++ trunk/boost/config/compiler/visualc.hpp	2013-07-23 13:32:10 EDT (Tue, 23 Jul 2013)	(r85137)
@@ -310,8 +310,10 @@
 #     define BOOST_COMPILER_VERSION 9.0
 #   elif _MSC_VER < 1700
 #     define BOOST_COMPILER_VERSION 10.0
-#   elif _MSC_VER < 1800
+#   elif _MSC_VER < 1800 
 #     define BOOST_COMPILER_VERSION 11.0
+#   elif _MSC_VER < 1900
+#     define BOOST_COMPILER_VERSION 12.0
 #   else
 #     define BOOST_COMPILER_VERSION _MSC_VER
 #   endif
@@ -321,8 +323,8 @@
 #endif
 
 //
-// last known and checked version is 1700 (VC11, aka 2011):
-#if (_MSC_VER > 1700)
+// last known and checked version is 1800.20617 (VC12 Preview, aka 2013 Preview):
+#if (_MSC_VER > 1800 && _MSC_FULL_VER > 180020617)
 #  if defined(BOOST_ASSERT_CONFIG)
 #     error "Unknown compiler version - please run the configure tests and report the results"
 #  else