[Boost-commit] svn:boost r62115 - trunk/boost/tr1/detail

Subject: [Boost-commit] svn:boost r62115 - trunk/boost/tr1/detail
From: john_at_[hidden]
Date: 2010-05-20 12:17:06

Author: johnmaddock
Date: 2010-05-20 12:17:05 EDT (Thu, 20 May 2010)
New Revision: 62115
URL: http://svn.boost.org/trac/boost/changeset/62115

Log:
Fix VC++ 10 include problems.
Fixes #3070.
Text files modified: 
   trunk/boost/tr1/detail/config.hpp     |    41 +++++++++++++++++++++------------------ 
   trunk/boost/tr1/detail/config_all.hpp |     4 ++                                      
   2 files changed, 25 insertions(+), 20 deletions(-)

Modified: trunk/boost/tr1/detail/config.hpp
==============================================================================
--- trunk/boost/tr1/detail/config.hpp	(original)
+++ trunk/boost/tr1/detail/config.hpp	2010-05-20 12:17:05 EDT (Thu, 20 May 2010)
@@ -137,25 +137,28 @@
 // this here, in addition the feature pack for VC9
 // provides a more or less full TR1 implementation:
 //
-#if defined(_HAS_TR1) && (_HAS_TR1 + 0)
-#  define BOOST_HAS_TR1_ARRAY
-#  define BOOST_HAS_TR1_REFERENCE_WRAPPER
-#  define BOOST_HAS_TR1_RESULT_OF
-#  define BOOST_HAS_TR1_MEM_FN
-#  define BOOST_HAS_TR1_BIND
-#  define BOOST_HAS_TR1_FUNCTION
-#  define BOOST_HAS_TR1_HASH
-#  define BOOST_HAS_TR1_SHARED_PTR
-#  define BOOST_HAS_TR1_RANDOM
-#  define BOOST_HAS_TR1_REGEX
-#  define BOOST_HAS_TR1_TUPLE
-#  define BOOST_HAS_TR1_TYPE_TRAITS
-#  define BOOST_HAS_TR1_UTILITY
-#  define BOOST_HAS_TR1_UNORDERED_MAP
-#  define BOOST_HAS_TR1_UNORDERED_SET
-#else
-#  define BOOST_HAS_TR1_HASH
-#endif
+#  if defined(_HAS_TR1) && (_HAS_TR1 + 0)
+#    define BOOST_HAS_TR1_ARRAY
+#    define BOOST_HAS_TR1_REFERENCE_WRAPPER
+#    define BOOST_HAS_TR1_RESULT_OF
+#    define BOOST_HAS_TR1_MEM_FN
+#    define BOOST_HAS_TR1_BIND
+#    define BOOST_HAS_TR1_FUNCTION
+#    define BOOST_HAS_TR1_HASH
+#    define BOOST_HAS_TR1_SHARED_PTR
+#    define BOOST_HAS_TR1_RANDOM
+#    define BOOST_HAS_TR1_REGEX
+#    define BOOST_HAS_TR1_TUPLE
+#    define BOOST_HAS_TR1_TYPE_TRAITS
+#    define BOOST_HAS_TR1_UTILITY
+#    define BOOST_HAS_TR1_UNORDERED_MAP
+#    define BOOST_HAS_TR1_UNORDERED_SET
+#  else
+#    define BOOST_HAS_TR1_HASH
+#  endif
+#  if _MSC_VER >= 1600
+#     define BOOST_HAS_CPP_0X
+#  endif
 #endif
 
 #include <boost/config.hpp>

Modified: trunk/boost/tr1/detail/config_all.hpp
==============================================================================
--- trunk/boost/tr1/detail/config_all.hpp	(original)
+++ trunk/boost/tr1/detail/config_all.hpp	2010-05-20 12:17:05 EDT (Thu, 20 May 2010)
@@ -119,7 +119,9 @@
 #ifdef __GXX_EXPERIMENTAL_CXX0X__
 #  define BOOST_HAS_CPP_0X
 #endif
-
+#if defined(_MSC_VER) && (_MSC_VER >= 1600) && !defined(BOOST_HAS_CPP_0X)
+#   define BOOST_HAS_CPP_0X
+#endif
 //
 // We may be in the middle of parsing boost/config.hpp
 // when this header is included, so don't rely on config