[Boost-commit] svn:boost r61606 - trunk/boost/property_tree/detail

Subject: [Boost-commit] svn:boost r61606 - trunk/boost/property_tree/detail
From: sebastian.redl_at_[hidden]
Date: 2010-04-27 05:04:42

Author: cornedbee
Date: 2010-04-27 05:04:42 EDT (Tue, 27 Apr 2010)
New Revision: 61606
URL: http://svn.boost.org/trac/boost/changeset/61606

Log:
MSVC 10 final did not fix the std::pair bug as I had hoped, so update the workaround.

Fixes bug 4092
Text files modified: 
   trunk/boost/property_tree/detail/ptree_implementation.hpp |     6 ++----                                  
   1 files changed, 2 insertions(+), 4 deletions(-)

Modified: trunk/boost/property_tree/detail/ptree_implementation.hpp
==============================================================================
--- trunk/boost/property_tree/detail/ptree_implementation.hpp	(original)
+++ trunk/boost/property_tree/detail/ptree_implementation.hpp	2010-04-27 05:04:42 EDT (Tue, 27 Apr 2010)
@@ -16,9 +16,7 @@
 #include <memory>
 
 #if defined(BOOST_MSVC) && \
-    (_MSC_FULL_VER == 160020506 || \
-     _MSC_FULL_VER == 160021003 || \
-     _MSC_FULL_VER == 160030128)
+    (_MSC_FULL_VER >= 160000000 && _MSC_FULL_VER < 170000000)
 #define BOOST_PROPERTY_TREE_PAIR_BUG
 #endif
 
@@ -30,7 +28,7 @@
         struct by_name {};
         // The actual child container.
 #if defined(BOOST_PROPERTY_TREE_PAIR_BUG)
-        // MSVC 10 pre-release versions have moved std::pair's members to a base
+        // MSVC 10 has moved std::pair's members to a base
         // class. Unfortunately this does break the interface.
         BOOST_STATIC_CONSTANT(unsigned,
             first_offset = offsetof(value_type, first));