update boost on linux
This commit is contained in:
@@ -301,15 +301,15 @@ ast_parse(
|
||||
SkipT const& skip_,
|
||||
AstFactoryT const & /*dummy_*/ = AstFactoryT())
|
||||
{
|
||||
typedef skip_parser_iteration_policy<SkipT> iter_policy_t;
|
||||
typedef skip_parser_iteration_policy<SkipT> it_policy_t;
|
||||
typedef ast_match_policy<IteratorT, AstFactoryT> ast_match_policy_t;
|
||||
typedef
|
||||
scanner_policies<iter_policy_t, ast_match_policy_t>
|
||||
scanner_policies_t;
|
||||
typedef scanner<IteratorT, scanner_policies_t> scanner_t;
|
||||
scanner_policies<it_policy_t, ast_match_policy_t>
|
||||
scan_policies_t;
|
||||
typedef scanner<IteratorT, scan_policies_t> scanner_t;
|
||||
|
||||
iter_policy_t iter_policy(skip_);
|
||||
scanner_policies_t policies(iter_policy);
|
||||
it_policy_t iter_policy(skip_);
|
||||
scan_policies_t policies(iter_policy);
|
||||
IteratorT first = first_;
|
||||
scanner_t scan(first, last_, policies);
|
||||
tree_match<IteratorT, AstFactoryT> hit = parser.derived().parse(scan);
|
||||
|
||||
@@ -26,7 +26,6 @@
|
||||
#include <boost/call_traits.hpp>
|
||||
#include <boost/spirit/home/classic/namespace.hpp>
|
||||
#include <boost/spirit/home/classic/core.hpp>
|
||||
#include <boost/detail/iterator.hpp> // for boost::detail::iterator_traits
|
||||
#include <boost/assert.hpp>
|
||||
|
||||
#if defined(BOOST_SPIRIT_DEBUG) && \
|
||||
@@ -37,6 +36,8 @@
|
||||
|
||||
#include <boost/spirit/home/classic/tree/common_fwd.hpp>
|
||||
|
||||
#include <iterator> // for std::iterator_traits, std::distance
|
||||
|
||||
namespace boost { namespace spirit {
|
||||
|
||||
BOOST_SPIRIT_CLASSIC_NAMESPACE_BEGIN
|
||||
@@ -242,7 +243,7 @@ template <typename IteratorT = char const*, typename ValueT = nil_t>
|
||||
struct node_val_data
|
||||
{
|
||||
typedef
|
||||
typename boost::detail::iterator_traits<IteratorT>::value_type
|
||||
typename std::iterator_traits<IteratorT>::value_type
|
||||
value_type;
|
||||
|
||||
#if !defined(BOOST_SPIRIT_USE_BOOST_ALLOCATOR_FOR_TREES)
|
||||
|
||||
@@ -210,15 +210,15 @@ pt_parse(
|
||||
SkipT const& skip,
|
||||
NodeFactoryT const& /*dummy_*/ = NodeFactoryT())
|
||||
{
|
||||
typedef skip_parser_iteration_policy<SkipT> iter_policy_t;
|
||||
typedef skip_parser_iteration_policy<SkipT> it_policy_t;
|
||||
typedef pt_match_policy<IteratorT, NodeFactoryT> pt_match_policy_t;
|
||||
typedef
|
||||
scanner_policies<iter_policy_t, pt_match_policy_t>
|
||||
scanner_policies_t;
|
||||
typedef scanner<IteratorT, scanner_policies_t> scanner_t;
|
||||
scanner_policies<it_policy_t, pt_match_policy_t>
|
||||
scan_policies_t;
|
||||
typedef scanner<IteratorT, scan_policies_t> scanner_t;
|
||||
|
||||
iter_policy_t iter_policy(skip);
|
||||
scanner_policies_t policies(iter_policy);
|
||||
it_policy_t iter_policy(skip);
|
||||
scan_policies_t policies(iter_policy);
|
||||
IteratorT first = first_;
|
||||
scanner_t scan(first, last, policies);
|
||||
tree_match<IteratorT, NodeFactoryT> hit = p.derived().parse(scan);
|
||||
|
||||
Reference in New Issue
Block a user