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

Subject: [Boost-commit] svn:boost r78679 - in branches/release: boost/property_tree boost/property_tree/detail libs/property_tree libs/property_tree/test
From: sebastian.redl_at_[hidden]
Date: 2012-05-27 09:16:21

Author: cornedbee
Date: 2012-05-27 09:16:21 EDT (Sun, 27 May 2012)
New Revision: 78679
URL: http://svn.boost.org/trac/boost/changeset/78679

Log:
Merge r78550 to release. Fixes an outdated test to work again. Fixes bug #6785. Fixes bug #6808.
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 ++-                                     
   branches/release/boost/property_tree/detail/ptree_implementation.hpp  |     2 +-                                      
   branches/release/libs/property_tree/test/test_xml_parser_rapidxml.cpp |     2 +-                                      
   3 files changed, 4 insertions(+), 3 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	2012-05-27 09:16:21 EDT (Sun, 27 May 2012)
@@ -102,7 +102,8 @@
             void operator()(It b, It e) const
             {
                 BOOST_ASSERT(c.stack.size() >= 1);
-                c.stack.back()->push_back(std::make_pair(c.name, Str(b, e)));
+                c.stack.back()->push_back(std::make_pair(c.name,
+                    Ptree(Str(b, e))));
                 c.name.clear();
                 c.string.clear();
             }

Modified: branches/release/boost/property_tree/detail/ptree_implementation.hpp
==============================================================================
--- branches/release/boost/property_tree/detail/ptree_implementation.hpp	(original)
+++ branches/release/boost/property_tree/detail/ptree_implementation.hpp	2012-05-27 09:16:21 EDT (Sun, 27 May 2012)
@@ -389,7 +389,7 @@
             template <typename P>
             bool operator ()(const P& lhs, const P& rhs) const {
               return lhs.first < rhs.first;
-            };
+            }
         };
     }
 

Modified: branches/release/libs/property_tree/test/test_xml_parser_rapidxml.cpp
==============================================================================
--- branches/release/libs/property_tree/test/test_xml_parser_rapidxml.cpp	(original)
+++ branches/release/libs/property_tree/test/test_xml_parser_rapidxml.cpp	2012-05-27 09:16:21 EDT (Sun, 27 May 2012)
@@ -15,7 +15,7 @@
 #define BOOST_UTF8_END_NAMESPACE }}
 #define BOOST_UTF8_DECL
 #include <boost/detail/utf8_codecvt_facet.hpp>
-#include "../../detail/utf8_codecvt_facet.cpp"
+#include <boost/detail/utf8_codecvt_facet.ipp>
 
 int test_main(int argc, char *argv[])
 {