passenger 6.0.15 → 6.0.17

data/src/cxx_supportlib/vendor-modified/boost/container/node_allocator.hpp

@@ -317,7 +317,7 @@ class node_allocator
    {
       std::size_t const preferred_size = prefer_in_recvd_out_size;
       dlmalloc_command_ret_t ret = {0 , 0};
-      if((limit_size > this->max_size()) | (preferred_size > this->max_size())){
+      if((limit_size > this->max_size()) || (preferred_size > this->max_size())){
          return pointer();
       }
       std::size_t l_size = limit_size*sizeof(T);

data/src/cxx_supportlib/vendor-modified/boost/container/options.hpp

@@ -200,6 +200,20 @@ struct default_if_void<void, Default>
    typedef Default type;
 };
 
+template<std::size_t N, std::size_t DefaultN>
+struct default_if_zero
+{
+   static const std::size_t value = N;
+};
+
+template<std::size_t DefaultN>
+struct default_if_zero<0u, DefaultN>
+{
+   static const std::size_t value = DefaultN;
+};
+
+
+
 #endif
 
 #if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
@@ -232,24 +246,17 @@ class default_next_capacity;
 
 typedef vector_opt<void, void> vector_null_opt;
 
-template<class GrowthType, class StoredSizeType>
-struct devector_opt
-   : vector_opt<GrowthType, StoredSizeType>
-{};
-
-typedef devector_opt<void, void> devector_null_opt;
-
 #else    //!defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
 
-//!This growth factor argument specifies that the container should increase it's
+//!This growth factor argument specifies that the container should increase its
 //!capacity a 50% when existing capacity is exhausted.
 struct growth_factor_50{};
 
-//!This growth factor argument specifies that the container should increase it's
+//!This growth factor argument specifies that the container should increase its
 //!capacity a 60% when existing capacity is exhausted.
 struct growth_factor_60{};
 
-//!This growth factor argument specifies that the container should increase it's
+//!This growth factor argument specifies that the container should increase its
 //!capacity a 100% (doubling its capacity) when existing capacity is exhausted.
 struct growth_factor_100{};
 
@@ -466,9 +473,92 @@ using static_vector_options_t = typename boost::container::static_vector_options
 
 #endif
 
+
+////////////////////////////////////////////////////////////////
+//
+//
+//          OPTIONS FOR DEVECTOR CONTAINER
+//
+//
+////////////////////////////////////////////////////////////////
+
+//!Thse options specify the relocation strategy of devector.
+//!
+//!Predefined relocation limits that can be passed as arguments to this option are:
+//!\c boost::container::relocate_on_66
+//!\c boost::container::relocate_on_75
+//!\c boost::container::relocate_on_80
+//!\c boost::container::relocate_on_85
+//!\c boost::container::relocate_on_90
+//!
+//!If this option is not specified, a default will be used by the container.
+//!
+//!Note: Repeated insertions at only one end (only back insertions or only front insertions) usually will
+//!lead to a single relocation when `relocate_on_66` is used and two relocations when `relocate_on_90`
+//!is used.
+
+#if !defined(BOOST_CONTAINER_DOXYGEN_INVOKED)
+
+BOOST_INTRUSIVE_OPTION_CONSTANT(relocate_on, std::size_t, Fraction, free_fraction)
+
+struct relocate_on_66 : public relocate_on<3U>{};
+
+struct relocate_on_75 : public relocate_on<4U> {};
+
+struct relocate_on_80 : public relocate_on<5U> {};
+
+struct relocate_on_85 : public relocate_on<7U> {};
+
+struct relocate_on_90 : public relocate_on<10U> {};
+
+template<class GrowthType, class StoredSizeType, std::size_t FreeFraction>
+struct devector_opt
+   : vector_opt<GrowthType, StoredSizeType>
+{
+   static const std::size_t free_fraction = FreeFraction;
+};
+
+typedef devector_opt<void, void, 0u> devector_null_opt;
+
+#else
+
+//!This relocation condition option specifies that the container will never relocate
+//!elements when there is no space at the side the insertion should
+//!take place
+struct relocate_never;
+
+//!This relocation condition option specifies that the container will relocate
+//!all elements when there is no space at the side the insertion should
+//!take place and memory usage is below 66% (2/3)
+struct relocate_on_66;
+
+//!This relocation condition option specifies that the container will relocate
+//!all elements when there is no space at the side the insertion should
+//!take place and memory usage is below 75% (3/4)
+struct relocate_on_75;
+
+//!This relocation condition option specifies that the container will relocate
+//!all elements when there is no space at the side the insertion should
+//!take place and memory usage is below 80% (4/5)
+struct relocate_on_80;
+
+//!This relocation condition option specifies that the container will relocate
+//!all elements when there is no space at the side the insertion should
+//!take place and memory usage is below 85% (6/7)
+struct relocate_on_85;
+
+//!This relocation condition option specifies that the container will relocate
+//!all elements when there is no space at the side the insertion should
+//!take place and memory usage is below 90% (9/10)
+struct relocate_on_90;
+
+#endif
+
+
 //! Helper metafunction to combine options into a single type to be used
 //! by \c boost::container::devector.
-//! Supported options are: \c boost::container::growth_factor and \c boost::container::stored_size
+//! Supported options are: \c boost::container::growth_factor, \c boost::container::stored_size
+//! and \c boost::container::relocate_on
 #if defined(BOOST_CONTAINER_DOXYGEN_INVOKED) || defined(BOOST_CONTAINER_VARIADIC_TEMPLATES)
 template<class ...Options>
 #else
@@ -486,7 +576,9 @@ struct devector_options
       #endif
       >::type packed_options;
    typedef devector_opt< typename packed_options::growth_factor_type
-                       , typename packed_options::stored_size_type> implementation_defined;
+                       , typename packed_options::stored_size_type
+                       , packed_options::free_fraction
+                       > implementation_defined;
    /// @endcond
    typedef implementation_defined type;
 };

data/src/cxx_supportlib/vendor-modified/boost/container/stable_vector.hpp

@@ -57,6 +57,7 @@
 #include <boost/move/detail/force_ptr.hpp>
 // move/detail
 #include <boost/move/detail/move_helpers.hpp>
+#include <boost/move/detail/iterator_to_raw_pointer.hpp>
 // other
 #include <boost/assert.hpp>
 #include <boost/core/no_exceptions_support.hpp>

data/src/cxx_supportlib/vendor-modified/boost/container/string.hpp

@@ -65,7 +65,6 @@
 #include <initializer_list>   //for std::initializer_list
 #endif
 
-
 namespace boost {
 namespace container {
 
@@ -131,6 +130,11 @@ class basic_string_base
 
    private:
 
+   #if defined(BOOST_GCC) && (BOOST_GCC >= 40600)
+   #pragma GCC diagnostic push
+   #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+   #endif
+
    //This is the structure controlling a long string
    struct long_t
    {
@@ -164,6 +168,11 @@ class basic_string_base
       }
    };
 
+   #if defined(BOOST_GCC) && (BOOST_GCC >= 40600)
+   #pragma GCC diagnostic pop
+   #endif
+
+
    //This type is the first part of the structure controlling a short string
    //The "data" member stores
    struct short_header
@@ -3580,6 +3589,7 @@ inline std::size_t hash_value(basic_string<Ch, std::char_traits<Ch>, Allocator>
 
 }}
 
+
 #ifndef BOOST_CONTAINER_DOXYGEN_INVOKED
 
 namespace boost {