Ticket #1914: boost_ptree_spirit_ns.patch

/opt/boost-svn/include/boost-1_35/boost/property_tree/detail/json_parser_read.hpp

@@ -15 +15 @@
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/detail/ptree_utils.hpp>
 #include <boost/property_tree/detail/json_parser_error.hpp>
-#include <boost/spirit.hpp>
+#include <boost/spirit/include/classic.hpp>
 #include <string>
 #include <locale>
 #include <istream>
@@ -24 +24 @@
 
 namespace boost { namespace property_tree { namespace json_parser
 {
+    using namespace BOOST_SPIRIT_CLASSIC_NS;
 
     ///////////////////////////////////////////////////////////////////////
     // Json parser context
@@ -155 +156 @@
     // Json grammar
         
     template<class Ptree>
-    struct json_grammar: public boost::spirit::grammar<json_grammar<Ptree> >
+    struct json_grammar: public grammar<json_grammar<Ptree> >
     {
         
         typedef context<Ptree> Context;
@@ -167 +168 @@
         struct definition
         {
             
-            boost::spirit::rule<Scanner> root, object, member, array, item, value, string, number;
-            boost::spirit::rule<typename boost::spirit::lexeme_scanner<Scanner>::type> character, escape;
+            rule<Scanner> root, object, member, array, item, value, string, number;
+            rule<typename lexeme_scanner<Scanner>::type> character, escape;
 
             definition(const json_grammar &self)
             {
-                
-                using namespace boost::spirit;
-
                 // Assertions
                 assertion<std::string> expect_object("expected object");
                 assertion<std::string> expect_eoi("expected end of input");
@@ -259 +257 @@
 
             }
 
-            const boost::spirit::rule<Scanner> &start() const
+            const rule<Scanner> &start() const
             {
                 return root;
             }
@@ -279 +277 @@
                             Ptree &pt,
                             const std::string &filename)
     {
-
-        using namespace boost::spirit;
         typedef typename Ptree::key_type::value_type Ch;
         typedef typename std::vector<Ch>::iterator It;