updated boost on windows
This commit is contained in:
@@ -35,7 +35,7 @@ namespace boost { namespace spirit { namespace x3
|
||||
, typename RContext, typename Attribute>
|
||||
bool parse(
|
||||
Iterator& first, Iterator const& last
|
||||
, Context& context, RContext& rcontext, Attribute& attr) const
|
||||
, Context const& context, RContext& rcontext, Attribute& attr) const
|
||||
{
|
||||
Iterator save = first;
|
||||
|
||||
|
||||
@@ -4,20 +4,21 @@
|
||||
Distributed under the Boost Software License, Version 1.0. (See accompanying
|
||||
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
||||
=============================================================================*/
|
||||
#if !defined(SPIRIT_EXPECT_MARCH_16_2012_1024PM)
|
||||
#define SPIRIT_EXPECT_MARCH_16_2012_1024PM
|
||||
#if !defined(BOOST_SPIRIT_X3_EXPECT_MARCH_16_2012_1024PM)
|
||||
#define BOOST_SPIRIT_X3_EXPECT_MARCH_16_2012_1024PM
|
||||
|
||||
#include <boost/spirit/home/x3/support/context.hpp>
|
||||
#include <boost/spirit/home/x3/core/parser.hpp>
|
||||
#include <boost/spirit/home/x3/core/detail/parse_into_container.hpp>
|
||||
|
||||
#include <boost/config.hpp> // for BOOST_SYMBOL_VISIBLE
|
||||
#include <boost/throw_exception.hpp>
|
||||
#include <stdexcept>
|
||||
|
||||
namespace boost { namespace spirit { namespace x3
|
||||
{
|
||||
template <typename Iterator>
|
||||
struct expectation_failure : std::runtime_error
|
||||
struct BOOST_SYMBOL_VISIBLE expectation_failure : std::runtime_error
|
||||
{
|
||||
public:
|
||||
|
||||
@@ -25,7 +26,7 @@ namespace boost { namespace spirit { namespace x3
|
||||
: std::runtime_error("boost::spirit::x3::expectation_failure")
|
||||
, where_(where), which_(which)
|
||||
{}
|
||||
~expectation_failure() throw() {}
|
||||
~expectation_failure() {}
|
||||
|
||||
std::string which() const { return which_; }
|
||||
Iterator const& where() const { return where_; }
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
Distributed under the Boost Software License, Version 1.0. (See accompanying
|
||||
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
||||
=============================================================================*/
|
||||
#if !defined(SPIRIT_LEXEME_MARCH_24_2007_0802AM)
|
||||
#define SPIRIT_LEXEME_MARCH_24_2007_0802AM
|
||||
#if !defined(BOOST_SPIRIT_X3_LEXEME_MARCH_24_2007_0802AM)
|
||||
#define BOOST_SPIRIT_X3_LEXEME_MARCH_24_2007_0802AM
|
||||
|
||||
#include <boost/spirit/home/x3/support/context.hpp>
|
||||
#include <boost/spirit/home/x3/support/unused.hpp>
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
Distributed under the Boost Software License, Version 1.0. (See accompanying
|
||||
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
||||
=============================================================================*/
|
||||
#if !defined(SPIRIT_NO_CASE_SEPT_16_2014_0912PM)
|
||||
#define SPIRIT_NO_CASE_SEPT_16_2014_0912PM
|
||||
#if !defined(BOOST_SPIRIT_X3_NO_CASE_SEPT_16_2014_0912PM)
|
||||
#define BOOST_SPIRIT_X3_NO_CASE_SEPT_16_2014_0912PM
|
||||
|
||||
#include <boost/spirit/home/x3/support/context.hpp>
|
||||
#include <boost/spirit/home/x3/support/unused.hpp>
|
||||
|
||||
@@ -6,8 +6,8 @@
|
||||
Distributed under the Boost Software License, Version 1.0. (See accompanying
|
||||
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
||||
=============================================================================*/
|
||||
#if !defined(SPIRIT_NO_SKIP_JAN_16_2010_0802PM)
|
||||
#define SPIRIT_NO_SKIP_JAN_16_2010_0802PM
|
||||
#if !defined(BOOST_SPIRIT_X3_NO_SKIP_JAN_16_2010_0802PM)
|
||||
#define BOOST_SPIRIT_X3_NO_SKIP_JAN_16_2010_0802PM
|
||||
|
||||
#include <boost/spirit/home/x3/support/context.hpp>
|
||||
#include <boost/spirit/home/x3/support/unused.hpp>
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
Distributed under the Boost Software License, Version 1.0. (See accompanying
|
||||
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
||||
=============================================================================*/
|
||||
#if !defined(SPIRIT_OMIT_MARCH_24_2007_0802AM)
|
||||
#define SPIRIT_OMIT_MARCH_24_2007_0802AM
|
||||
#if !defined(BOOST_SPIRIT_X3_OMIT_MARCH_24_2007_0802AM)
|
||||
#define BOOST_SPIRIT_X3_OMIT_MARCH_24_2007_0802AM
|
||||
|
||||
#include <boost/spirit/home/x3/support/unused.hpp>
|
||||
#include <boost/spirit/home/x3/core/parser.hpp>
|
||||
|
||||
@@ -9,8 +9,6 @@
|
||||
#if !defined(SPIRIT_X3_REPEAT_APRIL_16_2014_0848AM)
|
||||
#define SPIRIT_X3_REPEAT_APRIL_16_2014_0848AM
|
||||
|
||||
#include <boost/function_types/function_type.hpp>
|
||||
#include <boost/function_types/parameter_types.hpp>
|
||||
#include <boost/spirit/home/x3/core/parser.hpp>
|
||||
#include <boost/spirit/home/x3/operator/kleene.hpp>
|
||||
|
||||
@@ -98,10 +96,9 @@ namespace boost { namespace spirit { namespace x3
|
||||
struct repeat_gen
|
||||
{
|
||||
template<typename Subject>
|
||||
kleene<typename extension::as_parser<Subject>::value_type>
|
||||
operator[](Subject const& subject) const
|
||||
auto operator[](Subject const& subject) const
|
||||
{
|
||||
return { as_parser(subject) };
|
||||
return *as_parser(subject);
|
||||
}
|
||||
|
||||
template <typename T>
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
Distributed under the Boost Software License, Version 1.0. (See accompanying
|
||||
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
||||
=============================================================================*/
|
||||
#if !defined(SPIRIT_SKIP_JANUARY_26_2008_0422PM)
|
||||
#define SPIRIT_SKIP_JANUARY_26_2008_0422PM
|
||||
#if !defined(BOOST_SPIRIT_X3_SKIP_JANUARY_26_2008_0422PM)
|
||||
#define BOOST_SPIRIT_X3_SKIP_JANUARY_26_2008_0422PM
|
||||
|
||||
#include <boost/spirit/home/x3/support/context.hpp>
|
||||
#include <boost/spirit/home/x3/support/unused.hpp>
|
||||
|
||||
@@ -21,18 +21,18 @@ namespace boost { namespace spirit { namespace x3
|
||||
{
|
||||
typedef unary_parser<Subject, Derived> base_type;
|
||||
mutable T val;
|
||||
with_value_holder(Subject const& subject, T const& val)
|
||||
with_value_holder(Subject const& subject, T&& val)
|
||||
: base_type(subject)
|
||||
, val(val) {}
|
||||
, val(std::forward<T>(val)) {}
|
||||
};
|
||||
|
||||
template <typename Subject, typename Derived, typename T>
|
||||
struct with_value_holder<Subject, Derived, T const>
|
||||
struct with_value_holder<Subject, Derived, T&>
|
||||
: unary_parser<Subject, Derived>
|
||||
{
|
||||
typedef unary_parser<Subject, Derived> base_type;
|
||||
T val;
|
||||
with_value_holder(Subject const& subject, T const& val)
|
||||
T& val;
|
||||
with_value_holder(Subject const& subject, T& val)
|
||||
: base_type(subject)
|
||||
, val(val) {}
|
||||
};
|
||||
@@ -47,8 +47,8 @@ namespace boost { namespace spirit { namespace x3
|
||||
|
||||
typedef Subject subject_type;
|
||||
|
||||
with_directive(Subject const& subject, T const& val)
|
||||
: base_type(subject, val) {}
|
||||
with_directive(Subject const& subject, T&& val)
|
||||
: base_type(subject, std::forward<T>(val)) {}
|
||||
|
||||
template <typename Iterator, typename Context
|
||||
, typename RContext, typename Attribute>
|
||||
@@ -63,44 +63,23 @@ namespace boost { namespace spirit { namespace x3
|
||||
}
|
||||
};
|
||||
|
||||
template <typename ID, typename T, typename NextContext = unused_type>
|
||||
struct with_context
|
||||
{
|
||||
typedef context<ID, T, NextContext> type;
|
||||
};
|
||||
|
||||
template <typename ID, typename T>
|
||||
struct with_context<ID, T, unused_type>
|
||||
{
|
||||
typedef context<ID, T> type;
|
||||
};
|
||||
|
||||
template <typename ID, typename T>
|
||||
struct with_gen
|
||||
{
|
||||
T& val;
|
||||
|
||||
with_gen(T& val)
|
||||
: val(val) {}
|
||||
T&& val;
|
||||
|
||||
template <typename Subject>
|
||||
with_directive<typename extension::as_parser<Subject>::value_type, ID, T>
|
||||
operator[](Subject const& subject) const
|
||||
{
|
||||
return { as_parser(subject), val };
|
||||
return { as_parser(subject), std::forward<T>(val) };
|
||||
}
|
||||
};
|
||||
|
||||
template <typename ID, typename T>
|
||||
inline with_gen<ID, T> with(T& val)
|
||||
inline with_gen<ID, T> with(T&& val)
|
||||
{
|
||||
return { val };
|
||||
}
|
||||
|
||||
template <typename ID, typename T>
|
||||
inline with_gen<ID, T const> with(T const& val)
|
||||
{
|
||||
return { val };
|
||||
return { std::forward<T>(val) };
|
||||
}
|
||||
}}}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user