|
From: Marcin K. <ka...@us...> - 2007-02-18 18:34:29
|
Update of /cvsroot/boost-sandbox/boost-sandbox/boost/property_tree/detail In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv1675 Modified Files: xml_parser_read_spirit.hpp Log Message: Compatibility fix with spirit Index: xml_parser_read_spirit.hpp =================================================================== RCS file: /cvsroot/boost-sandbox/boost-sandbox/boost/property_tree/detail/xml_parser_read_spirit.hpp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- xml_parser_read_spirit.hpp 18 Dec 2006 23:54:13 -0000 1.9 +++ xml_parser_read_spirit.hpp 18 Feb 2007 17:48:15 -0000 1.10 @@ -53,7 +53,7 @@ { if (c.stack.empty()) BOOST_PROPERTY_TREE_THROW(xml_parser_error("xml parse error", - b.get_position().file, + detail::narrow(b.get_position().file.c_str()), b.get_position().line)); Str name(b, e); Ptree *child = &c.stack.back()->push_back(std::make_pair(name, Ptree()))->second; @@ -69,7 +69,7 @@ { if (c.stack.size() <= 1) BOOST_PROPERTY_TREE_THROW(xml_parser_error("xml parse error", - b.get_position().file, + detail::narrow(b.get_position().file.c_str()), b.get_position().line)); c.stack.pop_back(); } @@ -708,7 +708,8 @@ // Initialize iterators It begin(v.begin(), v.end()); It end; - begin.set_position(filename); + + begin.set_position(detail::widen<Ch>(filename.c_str())); // Prepare grammar Ptree local; @@ -720,7 +721,7 @@ boost::spirit::parse_info<It> result = boost::spirit::parse(begin, end, g); if (!result.full || g.c.stack.size() != 1) BOOST_PROPERTY_TREE_THROW(xml_parser_error("xml parse error", - result.stop.get_position().file, + detail::narrow(result.stop.get_position().file.c_str()), result.stop.get_position().line)); // Swap local and pt |