From 8c8869eb6c218e82083ac463b943ca5c834e5f60 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 13 Feb 2013 19:53:19 +0000 Subject: compilation fix git-svn-id: http://svn.miranda-ng.org/main/trunk@3592 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Twitter/src/tinyjson.hpp | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/protocols/Twitter/src/tinyjson.hpp b/protocols/Twitter/src/tinyjson.hpp index d87ca8420e..173b6b149c 100644 --- a/protocols/Twitter/src/tinyjson.hpp +++ b/protocols/Twitter/src/tinyjson.hpp @@ -28,8 +28,8 @@ #include #include -#include -#include +#include +#include #include #include @@ -41,8 +41,8 @@ namespace json { - boost::spirit::int_parser const - longlong_p = boost::spirit::int_parser(); + boost::spirit::classic::int_parser const + longlong_p = boost::spirit::classic::int_parser(); // ========================================================================================================== // === U N I C O D E _ C O N V E R T === @@ -99,7 +99,7 @@ namespace json // ========================================================================================================== template< typename Char > - class grammar : public boost::spirit::grammar< grammar< Char > > + class grammar : public boost::spirit::classic::grammar< grammar< Char > > { public: @@ -439,25 +439,25 @@ namespace json template class definition { - boost::spirit::rule< SCANNER > m_start; - boost::spirit::rule< SCANNER > m_object; - boost::spirit::rule< SCANNER > m_array; - boost::spirit::rule< SCANNER > m_pair; - boost::spirit::rule< SCANNER > m_value; - boost::spirit::rule< SCANNER > m_string; - boost::spirit::rule< SCANNER > m_number; - boost::spirit::rule< SCANNER > m_boolean; - boost::spirit::rule< SCANNER > m_null; + boost::spirit::classic::rule< SCANNER > m_start; + boost::spirit::classic::rule< SCANNER > m_object; + boost::spirit::classic::rule< SCANNER > m_array; + boost::spirit::classic::rule< SCANNER > m_pair; + boost::spirit::classic::rule< SCANNER > m_value; + boost::spirit::classic::rule< SCANNER > m_string; + boost::spirit::classic::rule< SCANNER > m_number; + boost::spirit::classic::rule< SCANNER > m_boolean; + boost::spirit::classic::rule< SCANNER > m_null; public: - boost::spirit::rule< SCANNER > const & start() const { return m_start; } + boost::spirit::classic::rule< SCANNER > const & start() const { return m_start; } // - -[ create the definition ] - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - definition(grammar const & self) { - using namespace boost::spirit; + using namespace boost::spirit::classic; // 0: JSON can either be an object or an array @@ -560,7 +560,7 @@ namespace json json::grammar< typename Iterator::value_type >::stack st; json::grammar< typename Iterator::value_type > gr(st); - boost::spirit::parse_info pi = boost::spirit::parse(szFirst, szEnd, gr, boost::spirit::space_p); + boost::spirit::classic::parse_info pi = boost::spirit::classic::parse(szFirst, szEnd, gr, boost::spirit::classic::space_p); // 2: skip any spaces at the end of the parsed section... -- cgit v1.2.3