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

diff --git a/boost/boost/detail/algorithm.hpp b/boost/boost/detail/algorithm.hpp
index 30667d6ad56fb568f2cb36e4cccac237ea75b7fc..376baeddac9e7ecc943a499847921aa0265dbf4b 100644 (file)
--- a/boost/boost/detail/algorithm.hpp
+++ b/boost/boost/detail/algorithm.hpp
@@ -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)
   {

diff --git a/boost/boost/iostreams/filter/symmetric.hpp b/boost/boost/iostreams/filter/symmetric.hpp
index 1154c9a5d9e0084c7116f6fe199e5b490d4ffbc0..8aa987c0ea92708715a56cd3f6f8399cad4396ca 100644 (file)
--- a/boost/boost/iostreams/filter/symmetric.hpp
+++ b/boost/boost/iostreams/filter/symmetric.hpp
@@ -231,7 +231,7 @@ private:
 
     void close();
 
-    enum {
+    enum flag_type {
         f_read   = 1,
         f_write  = f_read << 1,
         f_eof    = f_write << 1,

diff --git a/boost/boost/regex/v4/basic_regex_parser.hpp b/boost/boost/regex/v4/basic_regex_parser.hpp
index ad77d0545a3a454de7a59013a9ba95b308f216af..08e705ad00d384efc4f59cf5ccef04c1ae6d4ac5 100644 (file)
--- a/boost/boost/regex/v4/basic_regex_parser.hpp
+++ b/boost/boost/regex/v4/basic_regex_parser.hpp
@@ -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

diff --git a/boost/boost/signals/detail/named_slot_map.hpp b/boost/boost/signals/detail/named_slot_map.hpp
index 3592f4c1d672fb298b96cf4601a5b8f0aa74e504..c13bf0b6878318bdff19b827d1ddb6c71e4fa226 100644 (file)
--- a/boost/boost/signals/detail/named_slot_map.hpp
+++ b/boost/boost/signals/detail/named_slot_map.hpp
@@ -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)