passenger 6.1.0 → 6.1.1

data/src/cxx_supportlib/vendor-modified/boost/iterator/iterator_traits.hpp

@@ -3,49 +3,56 @@
 // accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 #ifndef ITERATOR_TRAITS_DWA200347_HPP
-# define ITERATOR_TRAITS_DWA200347_HPP
-
-# include <boost/detail/workaround.hpp>
+#define ITERATOR_TRAITS_DWA200347_HPP
 
 #include <iterator>
 
 namespace boost {
 namespace iterators {
 
-// Macro for supporting old compilers, no longer needed but kept
-// for backwards compatibility (it was documented).
-#define BOOST_ITERATOR_CATEGORY iterator_category
-
+template< typename Iterator >
+using iterator_value_t = typename std::iterator_traits< Iterator >::value_type;
 
-template <class Iterator>
+template< typename Iterator >
 struct iterator_value
 {
-    typedef typename std::iterator_traits<Iterator>::value_type type;
+    using type = iterator_value_t< Iterator >;
 };
 
-template <class Iterator>
+template< typename Iterator >
+using iterator_reference_t = typename std::iterator_traits< Iterator >::reference;
+
+template< typename Iterator >
 struct iterator_reference
 {
-    typedef typename std::iterator_traits<Iterator>::reference type;
+    using type = iterator_reference_t< Iterator >;
 };
 
+template< typename Iterator >
+using iterator_pointer_t = typename std::iterator_traits< Iterator >::pointer;
 
-template <class Iterator>
+template< typename Iterator >
 struct iterator_pointer
 {
-    typedef typename std::iterator_traits<Iterator>::pointer type;
+    using type = iterator_pointer_t< Iterator >;
 };
 
-template <class Iterator>
+template< typename Iterator >
+using iterator_difference_t = typename std::iterator_traits< Iterator >::difference_type;
+
+template< typename Iterator >
 struct iterator_difference
 {
-    typedef typename std::iterator_traits<Iterator>::difference_type type;
+    using type = iterator_difference_t< Iterator >;
 };
 
-template <class Iterator>
+template< typename Iterator >
+using iterator_category_t = typename std::iterator_traits< Iterator >::iterator_category;
+
+template< typename Iterator >
 struct iterator_category
 {
-    typedef typename std::iterator_traits<Iterator>::iterator_category type;
+    using type = iterator_category_t< Iterator >;
 };
 
 } // namespace iterators

data/src/cxx_supportlib/vendor-modified/boost/iterator/min_category.hpp

@@ -0,0 +1,83 @@
+// Copyright Andrey Semashev 2025.
+//
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE_1_0.txt or copy at
+// https://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef BOOST_ITERATOR_MIN_CATEGORY_HPP_INCLUDED_
+#define BOOST_ITERATOR_MIN_CATEGORY_HPP_INCLUDED_
+
+#include <type_traits>
+
+namespace boost {
+namespace iterators {
+namespace detail {
+
+template<
+    typename T1,
+    typename T2,
+    bool GreaterEqual = std::is_convertible< T1, T2 >::value,
+    bool LessEqual = std::is_convertible< T2, T1 >::value
+>
+struct min_category_impl
+{
+    static_assert(GreaterEqual || LessEqual, "Iterator category types must be related through convertibility.");
+};
+
+template< typename T1, typename T2 >
+struct min_category_impl< T1, T2, true, false >
+{
+    using type = T2;
+};
+
+template< typename T1, typename T2 >
+struct min_category_impl< T1, T2, false, true >
+{
+    using type = T1;
+};
+
+template< typename T1, typename T2 >
+struct min_category_impl< T1, T2, true, true >
+{
+    static_assert(std::is_same< T1, T2 >::value, "Iterator category types must be the same when they are equivalent.");
+    using type = T1;
+};
+
+} // namespace detail
+
+//
+// Returns the minimum iterator category type in the list
+// or fails to compile if any of the categories are unrelated.
+//
+template< typename... Categories >
+struct min_category;
+
+template< typename T >
+struct min_category< T >
+{
+    using type = T;
+};
+
+template< typename T1, typename T2, typename... Tail >
+struct min_category< T1, T2, Tail... >
+{
+    using type = typename min_category<
+        typename iterators::detail::min_category_impl< T1, T2 >::type,
+        Tail...
+    >::type;
+};
+
+// Shortcut to slightly optimize compilation speed
+template< typename T1, typename T2 >
+struct min_category< T1, T2 >
+{
+    using type = typename iterators::detail::min_category_impl< T1, T2 >::type;
+};
+
+template< typename... Categories >
+using min_category_t = typename min_category< Categories... >::type;
+
+} // namespace iterators
+} // namespace boost
+
+#endif // BOOST_ITERATOR_MIN_CATEGORY_HPP_INCLUDED_

data/src/cxx_supportlib/vendor-modified/boost/iterator/minimum_category.hpp

@@ -2,94 +2,32 @@
 // subject to the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 #ifndef BOOST_ITERATOR_MINIMUM_CATEGORY_HPP_INCLUDED_
-# define BOOST_ITERATOR_MINIMUM_CATEGORY_HPP_INCLUDED_
+#define BOOST_ITERATOR_MINIMUM_CATEGORY_HPP_INCLUDED_
 
-# include <boost/static_assert.hpp>
-# include <boost/type_traits/is_convertible.hpp>
-# include <boost/type_traits/is_same.hpp>
-
-# include <boost/mpl/placeholders.hpp>
-# include <boost/mpl/aux_/lambda_support.hpp>
+#include <boost/mpl/arg_fwd.hpp>
+#include <boost/iterator/min_category.hpp>
 
 namespace boost {
 namespace iterators {
-namespace detail {
-
-template <bool GreaterEqual, bool LessEqual>
-struct minimum_category_impl;
-
-template <class T1, class T2>
-struct error_not_related_by_convertibility;
-
-template <>
-struct minimum_category_impl<true,false>
-{
-    template <class T1, class T2> struct apply
-    {
-        typedef T2 type;
-    };
-};
-
-template <>
-struct minimum_category_impl<false,true>
-{
-    template <class T1, class T2> struct apply
-    {
-        typedef T1 type;
-    };
-};
-
-template <>
-struct minimum_category_impl<true,true>
-{
-    template <class T1, class T2> struct apply
-    {
-        BOOST_STATIC_ASSERT((is_same<T1,T2>::value));
-        typedef T1 type;
-    };
-};
-
-template <>
-struct minimum_category_impl<false,false>
-{
-    template <class T1, class T2> struct apply
-      : error_not_related_by_convertibility<T1,T2>
-    {
-    };
-};
-
-} // namespace detail
 
-//
-// Returns the minimum category type or fails to compile
-// if T1 and T2 are unrelated.
-//
-template <class T1 = mpl::_1, class T2 = mpl::_2>
-struct minimum_category
+// Deprecated metafunction for selecting minimum iterator category,
+// use min_category instead.
+template< class T1 = mpl::arg<1>, class T2 = mpl::arg<2> >
+struct minimum_category :
+    public min_category<T1, T2>
 {
-    typedef boost::iterators::detail::minimum_category_impl<
-        ::boost::is_convertible<T1,T2>::value
-      , ::boost::is_convertible<T2,T1>::value
-    > outer;
-
-    typedef typename outer::template apply<T1,T2> inner;
-    typedef typename inner::type type;
-
-    BOOST_MPL_AUX_LAMBDA_SUPPORT(2,minimum_category,(T1,T2))
 };
 
 template <>
-struct minimum_category<mpl::_1,mpl::_2>
+struct minimum_category< mpl::arg<1>, mpl::arg<2> >
 {
     template <class T1, class T2>
-    struct apply : minimum_category<T1,T2>
+    struct apply :
+        public min_category<T1, T2>
     {};
-
-    BOOST_MPL_AUX_LAMBDA_SUPPORT_SPEC(2,minimum_category,(mpl::_1,mpl::_2))
 };
 
 } // namespace iterators
-
 } // namespace boost
 
 #endif // BOOST_ITERATOR_MINIMUM_CATEGORY_HPP_INCLUDED_

data/src/cxx_supportlib/vendor-modified/boost/iterator/reverse_iterator.hpp

@@ -4,68 +4,67 @@
 // Distributed under the Boost Software License, Version 1.0. (See
 // accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
-#ifndef BOOST_REVERSE_ITERATOR_23022003THW_HPP
-#define BOOST_REVERSE_ITERATOR_23022003THW_HPP
+#ifndef BOOST_ITERATOR_REVERSE_ITERATOR_23022003THW_HPP
+#define BOOST_ITERATOR_REVERSE_ITERATOR_23022003THW_HPP
 
 #include <boost/iterator/iterator_adaptor.hpp>
+#include <boost/iterator/enable_if_convertible.hpp>
 
 namespace boost {
 namespace iterators {
 
-  //
-  //
-  //
-  template <class Iterator>
-  class reverse_iterator
-      : public iterator_adaptor< reverse_iterator<Iterator>, Iterator >
-  {
-      typedef iterator_adaptor< reverse_iterator<Iterator>, Iterator > super_t;
-
-      friend class iterator_core_access;
-
-   public:
-      reverse_iterator() {}
-
-      explicit reverse_iterator(Iterator x)
-          : super_t(x) {}
-
-      template<class OtherIterator>
-      reverse_iterator(
-          reverse_iterator<OtherIterator> const& r
-          , typename enable_if_convertible<OtherIterator, Iterator>::type* = 0
-          )
-          : super_t(r.base())
-      {}
-
-   private:
-      typename super_t::reference dereference() const
-      {
-          Iterator it = this->base_reference();
-          --it;
-          return *it;
-      }
-
-      void increment() { --this->base_reference(); }
-      void decrement() { ++this->base_reference(); }
-
-      void advance(typename super_t::difference_type n)
-      {
-          this->base_reference() -= n;
-      }
-
-      template <class OtherIterator>
-      typename super_t::difference_type
-      distance_to(reverse_iterator<OtherIterator> const& y) const
-      {
-          return this->base_reference() - y.base();
-      }
-  };
-
-  template <class BidirectionalIterator>
-  inline reverse_iterator<BidirectionalIterator> make_reverse_iterator(BidirectionalIterator x)
-  {
-      return reverse_iterator<BidirectionalIterator>(x);
-  }
+template< typename Iterator >
+class reverse_iterator :
+    public iterator_adaptor< reverse_iterator< Iterator >, Iterator >
+{
+    friend class iterator_core_access;
+
+private:
+    using super_t = iterator_adaptor< reverse_iterator< Iterator >, Iterator >;
+
+public:
+    reverse_iterator() = default;
+
+    explicit reverse_iterator(Iterator x) :
+        super_t(x)
+    {}
+
+    template<
+        typename OtherIterator,
+        typename = enable_if_convertible_t< OtherIterator, Iterator >
+    >
+    reverse_iterator(reverse_iterator< OtherIterator > const& r) :
+        super_t(r.base())
+    {}
+
+private:
+    typename super_t::reference dereference() const
+    {
+        Iterator it = this->base_reference();
+        --it;
+        return *it;
+    }
+
+    void increment() { --this->base_reference(); }
+    void decrement() { ++this->base_reference(); }
+
+    void advance(typename super_t::difference_type n)
+    {
+        this->base_reference() -= n;
+    }
+
+    template< typename OtherIterator >
+    typename super_t::difference_type distance_to(reverse_iterator< OtherIterator > const& y) const
+    {
+        return this->base_reference() - y.base();
+    }
+};
+
+template< typename Iterator >
+inline reverse_iterator< Iterator > make_reverse_iterator(Iterator x)
+{
+    return reverse_iterator< Iterator >(x);
+}
 
 } // namespace iterators
 
@@ -74,4 +73,4 @@ using iterators::make_reverse_iterator;
 
 } // namespace boost
 
-#endif // BOOST_REVERSE_ITERATOR_23022003THW_HPP
+#endif // BOOST_ITERATOR_REVERSE_ITERATOR_23022003THW_HPP