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:
Lars Gullik Bjønnes 2007-01-15 00:47:01 +00:00
parent 0bfff71348
commit 8fbaeb17df
4 changed files with 13 additions and 14 deletions

View File

@ -176,17 +176,6 @@ namespace boost {
return all(begin(c), end(c), p); 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> template <typename Container, typename T>
std::size_t count(const Container& c, const T& value) std::size_t count(const Container& c, const T& value)
{ {

View File

@ -231,7 +231,7 @@ private:
void close(); void close();
enum { enum flag_type {
f_read = 1, f_read = 1,
f_write = f_read << 1, f_write = f_read << 1,
f_eof = f_write << 1, f_eof = f_write << 1,

View File

@ -222,6 +222,11 @@ bool basic_regex_parser<charT, traits>::parse_basic()
} }
case regex_constants::syntax_open_set: case regex_constants::syntax_open_set:
return parse_set(); return parse_set();
case regex_constants::syntax_newline:
if(this->flags() & regbase::newline_alt)
return parse_alt();
else
return parse_literal();
default: default:
return parse_literal(); return parse_literal();
} }
@ -286,6 +291,11 @@ bool basic_regex_parser<charT, traits>::parse_extended()
return parse_alt(); return parse_alt();
case regex_constants::syntax_open_set: case regex_constants::syntax_open_set:
return parse_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: case regex_constants::syntax_hash:
// //
// If we have a mod_x flag set, then skip until // If we have a mod_x flag set, then skip until

View File

@ -123,8 +123,8 @@ public:
} }
bool equal(const named_slot_map_iterator& other) const { bool equal(const named_slot_map_iterator& other) const {
return (group == other.group return (group == other.group
&& (group == last_group && (group == last_group
|| slot_ == other.slot_)); || slot_ == other.slot_));
} }
#if BOOST_WORKAROUND(_MSC_VER, <= 1400) #if BOOST_WORKAROUND(_MSC_VER, <= 1400)