mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
Update to latest from boost 1.34.x branch
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16692 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
0bfff71348
commit
8fbaeb17df
@ -176,17 +176,6 @@ namespace boost {
|
||||
return all(begin(c), end(c), p);
|
||||
}
|
||||
|
||||
template <typename InputIterator, typename Predicate>
|
||||
bool none(InputIterator first, InputIterator last, Predicate p)
|
||||
{
|
||||
return std::find_if(first, last, p) == last;
|
||||
}
|
||||
template <typename Container, typename Predicate>
|
||||
bool none(const Container& c, Predicate p)
|
||||
{
|
||||
return none(begin(c), end(c), p);
|
||||
}
|
||||
|
||||
template <typename Container, typename T>
|
||||
std::size_t count(const Container& c, const T& value)
|
||||
{
|
||||
|
@ -231,7 +231,7 @@ private:
|
||||
|
||||
void close();
|
||||
|
||||
enum {
|
||||
enum flag_type {
|
||||
f_read = 1,
|
||||
f_write = f_read << 1,
|
||||
f_eof = f_write << 1,
|
||||
|
@ -222,6 +222,11 @@ bool basic_regex_parser<charT, traits>::parse_basic()
|
||||
}
|
||||
case regex_constants::syntax_open_set:
|
||||
return parse_set();
|
||||
case regex_constants::syntax_newline:
|
||||
if(this->flags() & regbase::newline_alt)
|
||||
return parse_alt();
|
||||
else
|
||||
return parse_literal();
|
||||
default:
|
||||
return parse_literal();
|
||||
}
|
||||
@ -286,6 +291,11 @@ bool basic_regex_parser<charT, traits>::parse_extended()
|
||||
return parse_alt();
|
||||
case regex_constants::syntax_open_set:
|
||||
return parse_set();
|
||||
case regex_constants::syntax_newline:
|
||||
if(this->flags() & regbase::newline_alt)
|
||||
return parse_alt();
|
||||
else
|
||||
return parse_literal();
|
||||
case regex_constants::syntax_hash:
|
||||
//
|
||||
// If we have a mod_x flag set, then skip until
|
||||
|
@ -123,8 +123,8 @@ public:
|
||||
}
|
||||
bool equal(const named_slot_map_iterator& other) const {
|
||||
return (group == other.group
|
||||
&& (group == last_group
|
||||
|| slot_ == other.slot_));
|
||||
&& (group == last_group
|
||||
|| slot_ == other.slot_));
|
||||
}
|
||||
|
||||
#if BOOST_WORKAROUND(_MSC_VER, <= 1400)
|
||||
|
Loading…
Reference in New Issue
Block a user