Update contrib/restricted/boost/xpressive to 1.80.0

4 files changed, 24 insertions, 15 deletions

diff --git a/contrib/restricted/boost/xpressive/include/boost/xpressive/detail/utility/sequence_stack.hpp b/contrib/restricted/boost/xpressive/include/boost/xpressive/detail/utility/sequence_stack.hpp
index baef2f209a..dbc8327287 100644
--- a/contrib/restricted/boost/xpressive/include/boost/xpressive/detail/utility/sequence_stack.hpp
+++ b/contrib/restricted/boost/xpressive/include/boost/xpressive/detail/utility/sequence_stack.hpp
@@ -15,6 +15,7 @@
 # pragma warning(disable : 4127) // conditional expression constant
 #endif
 
+#include <cstddef>
 #include <algorithm>
 #include <functional>
 
@@ -210,22 +211,20 @@ public:
 
     T *push_sequence(std::size_t count, T const &t)
     {
-        // This is the ptr to return
-        T *ptr = this->curr_;
-
-        // Advance the high-water mark
-        this->curr_ += count;
-
         // Check to see if we have overflowed this buffer
-        if(std::less<void*>()(this->end_, this->curr_))
+        std::size_t size_left = static_cast< std::size_t >(this->end_ - this->curr_);
+        if (size_left < count)
         {
-            // oops, back this out.
-            this->curr_ = ptr;
-
             // allocate a new block and return a ptr to the new memory
             return this->grow_(count, t);
         }
 
+        // This is the ptr to return
+        T *ptr = this->curr_;
+
+        // Advance the high-water mark
+        this->curr_ += count;
+
         return ptr;
     }
 
diff --git a/contrib/restricted/boost/xpressive/include/boost/xpressive/match_results.hpp b/contrib/restricted/boost/xpressive/include/boost/xpressive/match_results.hpp
index 2eb5c4b232..b06399669c 100644
--- a/contrib/restricted/boost/xpressive/include/boost/xpressive/match_results.hpp
+++ b/contrib/restricted/boost/xpressive/include/boost/xpressive/match_results.hpp
@@ -127,8 +127,13 @@ enum transform_scope { scope_next = 0, scope_rest = 1 };
 //
 template<typename OutputIterator, typename Char>
 struct case_converting_iterator
-  : std::iterator<std::output_iterator_tag, Char, void, void, case_converting_iterator<OutputIterator, Char> >
 {
+    typedef std::output_iterator_tag iterator_category;
+    typedef Char value_type;
+    typedef void difference_type;
+    typedef void pointer;
+    typedef case_converting_iterator<OutputIterator, Char> reference;
+
     case_converting_iterator(OutputIterator const &out, traits<Char> const *tr)
       : out_(out)
       , traits_(tr)
@@ -206,8 +211,13 @@ inline bool set_transform(Iterator &, transform_op, transform_scope)
 //
 template<typename Char>
 struct noop_output_iterator
-  : std::iterator<std::output_iterator_tag, Char, void, void, noop_output_iterator<Char> >
 {
+    typedef std::output_iterator_tag iterator_category;
+    typedef Char value_type;
+    typedef void difference_type;
+    typedef void pointer;
+    typedef noop_output_iterator<Char> reference;
+
     noop_output_iterator &operator ++()
     {
         return *this;
diff --git a/contrib/restricted/boost/xpressive/include/boost/xpressive/traits/detail/c_ctype.hpp b/contrib/restricted/boost/xpressive/include/boost/xpressive/traits/detail/c_ctype.hpp
index e56a506c2c..823c1f2ad6 100644
--- a/contrib/restricted/boost/xpressive/include/boost/xpressive/traits/detail/c_ctype.hpp
+++ b/contrib/restricted/boost/xpressive/include/boost/xpressive/traits/detail/c_ctype.hpp
@@ -95,7 +95,7 @@ template<typename Char>
 struct char_class_impl;
 
 
-#if defined(__QNXNTO__)
+#if defined(__QNXNTO__) || defined(__VXWORKS__)
 
 ///////////////////////////////////////////////////////////////////////////////
 //
diff --git a/contrib/restricted/boost/xpressive/include/boost/xpressive/xpressive_fwd.hpp b/contrib/restricted/boost/xpressive/include/boost/xpressive/xpressive_fwd.hpp
index 5babacfe49..f7281e20ac 100644
--- a/contrib/restricted/boost/xpressive/include/boost/xpressive/xpressive_fwd.hpp
+++ b/contrib/restricted/boost/xpressive/include/boost/xpressive/xpressive_fwd.hpp
@@ -38,8 +38,8 @@
 // Config logic taken from boost/regex/config.hpp
 #ifndef BOOST_XPRESSIVE_HAS_MS_STACK_GUARD
 # if (defined(_WIN32) || defined(_WIN64) || defined(_WINCE))                    \
-     && !defined(__GNUC__)                                                      \
-     && !(defined(__BORLANDC__) && (__BORLANDC__ >= 0x600))                     \
+     && !(defined(__GNUC__) || defined(__BORLANDC__) && defined(__clang__))     \
+     && !(defined(BOOST_BORLANDC) && (BOOST_BORLANDC >= 0x600))                 \
      && !(defined(__MWERKS__) && (__MWERKS__ <= 0x3003))
 #  define BOOST_XPRESSIVE_HAS_MS_STACK_GUARD 1
 # else