[Boost-commit] svn:boost r69684 - in branches/release: boost/property_tree boost/property_tree/detail libs/property_tree

Subject: [Boost-commit] svn:boost r69684 - in branches/release: boost/property_tree boost/property_tree/detail libs/property_tree
From: sebastian.redl_at_[hidden]
Date: 2011-03-08 09:58:55

Author: cornedbee
Date: 2011-03-08 09:58:52 EST (Tue, 08 Mar 2011)
New Revision: 69684
URL: http://svn.boost.org/trac/boost/changeset/69684

Log:
Merge r68990 to release just before 2.46.1, because it's a critical and low-risk fix. Sorry about not waiting for permission, but I won't have access to this computer again until after the release. So if this merge is a problem, just revert it.
Properties modified: 
   branches/release/boost/property_tree/   (props changed)
   branches/release/libs/property_tree/   (props changed)
Text files modified: 
   branches/release/boost/property_tree/detail/json_parser_read.hpp |     3 +++                                     
   1 files changed, 3 insertions(+), 0 deletions(-)

Modified: branches/release/boost/property_tree/detail/json_parser_read.hpp
==============================================================================
--- branches/release/boost/property_tree/detail/json_parser_read.hpp	(original)
+++ branches/release/boost/property_tree/detail/json_parser_read.hpp	2011-03-08 09:58:52 EST (Tue, 08 Mar 2011)
@@ -179,6 +179,9 @@
             {
 
                 using namespace boost::spirit::classic;
+                // There's a boost::assertion too, so another explicit using
+                // here:
+                using boost::spirit::classic::assertion;
 
                 // Assertions
                 assertion<std::string> expect_object("expected object");