[Boost-commit] svn:boost r57397 - in branches/release/boost/wave: . util

Subject: [Boost-commit] svn:boost r57397 - in branches/release/boost/wave: . util
From: hartmut.kaiser_at_[hidden]
Date: 2009-11-04 20:38:12

Author: hkaiser
Date: 2009-11-04 20:38:11 EST (Wed, 04 Nov 2009)
New Revision: 57397
URL: http://svn.boost.org/trac/boost/changeset/57397

Log:
Wave: fixing compilation for VC2010 beta2
Properties modified: 
   branches/release/boost/wave/   (props changed)
Text files modified: 
   branches/release/boost/wave/util/cpp_include_paths.hpp |     9 ++++++---                               
   1 files changed, 6 insertions(+), 3 deletions(-)

Modified: branches/release/boost/wave/util/cpp_include_paths.hpp
==============================================================================
--- branches/release/boost/wave/util/cpp_include_paths.hpp	(original)
+++ branches/release/boost/wave/util/cpp_include_paths.hpp	2009-11-04 20:38:11 EST (Wed, 04 Nov 2009)
@@ -57,10 +57,13 @@
 {
     typedef std::pair<FromType, ToType> value_type;
 
-// _MSC_FULL_VER == 160020506 detects the VC10 Beta 1 compiler
+// _MSC_FULL_VER == 160020506 || 160021003 detects the VC10 Beta 1 and 2 
+// compilers
 #if defined(BOOST_NO_POINTER_TO_MEMBER_TEMPLATE_PARAMETERS) || \
-    defined(BOOST_MSVC) && ((BOOST_MSVC < 1300) || (_MSC_FULL_VER == 160020506)) || \
-    defined(BOOST_INTEL_CXX_VERSION) && defined(_MSC_VER) && (BOOST_INTEL_CXX_VERSION <= 700) 
+    (defined(BOOST_MSVC) && ((BOOST_MSVC < 1300) || \
+        (_MSC_FULL_VER == 160020506 || _MSC_FULL_VER == 160021003))) || \
+    (defined(BOOST_INTEL_CXX_VERSION) && \
+        (defined(_MSC_VER) && (BOOST_INTEL_CXX_VERSION <= 700))) 
 
     BOOST_STATIC_CONSTANT(unsigned, from_offset = offsetof(value_type, first));
     BOOST_STATIC_CONSTANT(unsigned, to_offset   = offsetof(value_type, second));