update boost on linux
This commit is contained in:
@@ -10,7 +10,6 @@
|
||||
#include "consts.hpp"
|
||||
#include "internals.hpp"
|
||||
#include <iostream>
|
||||
#include <boost/detail/iterator.hpp>
|
||||
#include "runtime_error.hpp"
|
||||
#include "size_t.hpp"
|
||||
#include "state_machine.hpp"
|
||||
|
||||
@@ -16,6 +16,7 @@
|
||||
#include "parser/tree/node.hpp"
|
||||
#include "parser/parser.hpp"
|
||||
#include "containers/ptr_list.hpp"
|
||||
#include <boost/move/unique_ptr.hpp>
|
||||
#include "rules.hpp"
|
||||
#include "state_machine.hpp"
|
||||
|
||||
@@ -116,10 +117,10 @@ public:
|
||||
protected:
|
||||
typedef detail::basic_charset<CharT> charset;
|
||||
typedef detail::ptr_list<charset> charset_list;
|
||||
typedef std::auto_ptr<charset> charset_ptr;
|
||||
typedef boost::movelib::unique_ptr<charset> charset_ptr;
|
||||
typedef detail::equivset equivset;
|
||||
typedef detail::ptr_list<equivset> equivset_list;
|
||||
typedef std::auto_ptr<equivset> equivset_ptr;
|
||||
typedef boost::movelib::unique_ptr<equivset> equivset_ptr;
|
||||
typedef typename charset::index_set index_set;
|
||||
typedef std::vector<index_set> index_set_vector;
|
||||
typedef detail::basic_parser<CharT> parser;
|
||||
@@ -377,8 +378,8 @@ protected:
|
||||
if (followpos_->empty ()) return npos;
|
||||
|
||||
std::size_t index_ = 0;
|
||||
std::auto_ptr<node_set> set_ptr_ (new node_set);
|
||||
std::auto_ptr<node_vector> vector_ptr_ (new node_vector);
|
||||
boost::movelib::unique_ptr<node_set> set_ptr_ (new node_set);
|
||||
boost::movelib::unique_ptr<node_vector> vector_ptr_ (new node_vector);
|
||||
|
||||
for (typename detail::node::node_vector::const_iterator iter_ =
|
||||
followpos_->begin (), end_ = followpos_->end ();
|
||||
@@ -494,21 +495,13 @@ protected:
|
||||
delete *l_iter_;
|
||||
*l_iter_ = overlap_.release ();
|
||||
|
||||
// VC++ 6 Hack:
|
||||
charset_ptr temp_overlap_ (new charset);
|
||||
|
||||
overlap_ = temp_overlap_;
|
||||
overlap_.reset (new charset);
|
||||
++iter_;
|
||||
}
|
||||
else if (r_->empty ())
|
||||
{
|
||||
delete r_.release ();
|
||||
r_ = overlap_;
|
||||
|
||||
// VC++ 6 Hack:
|
||||
charset_ptr temp_overlap_ (new charset);
|
||||
|
||||
overlap_ = temp_overlap_;
|
||||
overlap_.swap (r_);
|
||||
overlap_.reset (new charset);
|
||||
break;
|
||||
}
|
||||
else
|
||||
@@ -517,10 +510,7 @@ protected:
|
||||
static_cast<charset *>(0));
|
||||
*iter_ = overlap_.release ();
|
||||
|
||||
// VC++ 6 Hack:
|
||||
charset_ptr temp_overlap_ (new charset);
|
||||
|
||||
overlap_ = temp_overlap_;
|
||||
overlap_.reset(new charset);
|
||||
++iter_;
|
||||
end_ = lhs_->end ();
|
||||
}
|
||||
@@ -642,21 +632,13 @@ protected:
|
||||
delete *l_iter_;
|
||||
*l_iter_ = overlap_.release ();
|
||||
|
||||
// VC++ 6 Hack:
|
||||
equivset_ptr temp_overlap_ (new equivset);
|
||||
|
||||
overlap_ = temp_overlap_;
|
||||
overlap_.reset (new equivset);
|
||||
++iter_;
|
||||
}
|
||||
else if (r_->empty ())
|
||||
{
|
||||
delete r_.release ();
|
||||
r_ = overlap_;
|
||||
|
||||
// VC++ 6 Hack:
|
||||
equivset_ptr temp_overlap_ (new equivset);
|
||||
|
||||
overlap_ = temp_overlap_;
|
||||
overlap_.swap (r_);
|
||||
overlap_.reset (new equivset);
|
||||
break;
|
||||
}
|
||||
else
|
||||
@@ -665,10 +647,7 @@ protected:
|
||||
static_cast<equivset *>(0));
|
||||
*iter_ = overlap_.release ();
|
||||
|
||||
// VC++ 6 Hack:
|
||||
equivset_ptr temp_overlap_ (new equivset);
|
||||
|
||||
overlap_ = temp_overlap_;
|
||||
overlap_.reset (new equivset);
|
||||
++iter_;
|
||||
end_ = lhs_->end ();
|
||||
}
|
||||
|
||||
@@ -7,16 +7,16 @@
|
||||
#define BOOST_LEXER_INPUT
|
||||
|
||||
#include "char_traits.hpp"
|
||||
#include <boost/detail/iterator.hpp>
|
||||
#include "size_t.hpp"
|
||||
#include "state_machine.hpp"
|
||||
#include <iterator> // for std::iterator_traits
|
||||
|
||||
namespace boost
|
||||
{
|
||||
namespace lexer
|
||||
{
|
||||
template<typename FwdIter, typename Traits =
|
||||
char_traits<typename boost::detail::iterator_traits<FwdIter>::value_type> >
|
||||
char_traits<typename std::iterator_traits<FwdIter>::value_type> >
|
||||
class basic_input
|
||||
{
|
||||
public:
|
||||
|
||||
@@ -6,13 +6,14 @@
|
||||
#ifndef BOOST_LEXER_RUNTIME_ERROR_HPP
|
||||
#define BOOST_LEXER_RUNTIME_ERROR_HPP
|
||||
|
||||
#include <boost/config.hpp> // for BOOST_SYMBOL_VISIBLE
|
||||
#include <stdexcept>
|
||||
|
||||
namespace boost
|
||||
{
|
||||
namespace lexer
|
||||
{
|
||||
class runtime_error : public std::runtime_error
|
||||
class BOOST_SYMBOL_VISIBLE runtime_error : public std::runtime_error
|
||||
{
|
||||
public:
|
||||
runtime_error (const std::string &what_arg_) :
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
// examples/serialise.hpp
|
||||
// Copyright (c) 2007-2009 Ben Hanson (http://www.benhanson.net/)
|
||||
//
|
||||
// Distributed under the Boost Software License, Version 1.0. (See accompanying
|
||||
// file licence_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
|
||||
#ifndef BOOST_LEXER_SERIALISE_HPP
|
||||
#define BOOST_LEXER_SERIALISE_HPP
|
||||
|
||||
#include "internals.hpp"
|
||||
#include "state_machine.hpp"
|
||||
#include <boost/serialization/vector.hpp>
|
||||
|
||||
namespace boost
|
||||
{
|
||||
namespace lexer
|
||||
{
|
||||
// IMPORTANT! This won't work if you don't enable RTTI!
|
||||
template<typename CharT, class Archive>
|
||||
void serialise (basic_state_machine<CharT> &sm_, Archive &ar_,
|
||||
unsigned int version_ = 1)
|
||||
{
|
||||
detail::internals &internals_ = const_cast<detail::internals &>
|
||||
(sm_.data ());
|
||||
|
||||
ar_ & version_;
|
||||
ar_ & *internals_._lookup;
|
||||
ar_ & internals_._dfa_alphabet;
|
||||
ar_ & *internals_._dfa;
|
||||
ar_ & internals_._seen_BOL_assertion;
|
||||
ar_ & internals_._seen_EOL_assertion;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user