import new upstream nautilus stable release 14.2.8

[ceph.git] / ceph / src / boost / boost / poly_collection / detail / split_segment.hpp

diff --git a/ceph/src/boost/boost/poly_collection/detail/split_segment.hpp b/ceph/src/boost/boost/poly_collection/detail/split_segment.hpp
index feccf44e3076c353dc9a5b5d5daf14b2e7e2565f..cd585c1fa9582bf5879f1a7fa85e29f0fa5da827 100644 (file)
--- a/ceph/src/boost/boost/poly_collection/detail/split_segment.hpp
+++ b/ceph/src/boost/boost/poly_collection/detail/split_segment.hpp
@@ -1,4 +1,4 @@
-/* Copyright 2016-2017 Joaquin M Lopez Munoz.
+/* Copyright 2016-2018 Joaquin M Lopez Munoz.
  * 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)
@@ -13,7 +13,6 @@
 #pragma once
 #endif
 
-#include <boost/poly_collection/detail/newdelete_allocator.hpp>
 #include <boost/poly_collection/detail/segment_backend.hpp>
 #include <boost/poly_collection/detail/value_holder.hpp>
 #include <iterator>
@@ -45,28 +44,24 @@ namespace detail{
  */
 
 template<typename Model,typename Concrete,typename Allocator>
-class split_segment:public segment_backend<Model>
+class split_segment:public segment_backend<Model,Allocator>
 {
   using value_type=typename Model::value_type;
   using store_value_type=value_holder<Concrete>;
   using store=std::vector<
     store_value_type,
-    value_holder_allocator_adaptor<
-      typename std::allocator_traits<Allocator>::
-        template rebind_alloc<store_value_type>
-    >
+    typename std::allocator_traits<Allocator>::
+      template rebind_alloc<store_value_type>
   >;
   using store_iterator=typename store::iterator;
   using const_store_iterator=typename store::const_iterator;
   using index=std::vector<
     value_type,
-    newdelete_allocator_adaptor<
-      typename std::allocator_traits<Allocator>::
-        template rebind_alloc<value_type>
-    >
+    typename std::allocator_traits<Allocator>::
+      template rebind_alloc<value_type>
   >;
   using const_index_iterator=typename index::const_iterator;
-  using segment_backend=detail::segment_backend<Model>;
+  using segment_backend=detail::segment_backend<Model,Allocator>;
   using typename segment_backend::segment_backend_unique_ptr;
   using typename segment_backend::value_pointer;
   using typename segment_backend::const_value_pointer;
@@ -76,22 +71,35 @@ class split_segment:public segment_backend<Model>
     typename segment_backend::template const_iterator<Concrete>;
   using typename segment_backend::base_sentinel;
   using typename segment_backend::range;
-  using segment_allocator_type=newdelete_allocator_adaptor<
-    typename std::allocator_traits<Allocator>::
-      template rebind_alloc<split_segment>
-  >;
+  using segment_allocator_type=typename std::allocator_traits<Allocator>::
+    template rebind_alloc<split_segment>;
 
 public:
   virtual ~split_segment()=default;
 
+  static segment_backend_unique_ptr make(const segment_allocator_type& al)
+  {
+    return new_(al,al);
+  }
+
   virtual segment_backend_unique_ptr copy()const
   {
     return new_(s.get_allocator(),store{s});
   }
 
-  virtual segment_backend_unique_ptr empty_copy()const
+  virtual segment_backend_unique_ptr copy(const Allocator& al)const
   {
-    return new_(s.get_allocator(),s.get_allocator());
+    return new_(al,store{s,al});
+  }
+
+  virtual segment_backend_unique_ptr empty_copy(const Allocator& al)const
+  {
+    return new_(al,al);
+  }
+
+  virtual segment_backend_unique_ptr move(const Allocator& al)const
+  {
+    return new_(al,store{std::move(s),al});
   }
 
   virtual bool equal(const segment_backend& x)const
@@ -99,6 +107,8 @@ public:
     return s==static_cast<const split_segment&>(x).s;
   }
 
+  virtual Allocator     get_allocator()const noexcept
+                         {return s.get_allocator();}
   virtual base_iterator begin()const noexcept{return nv_begin();}
   base_iterator         nv_begin()const noexcept
                          {return base_iterator{value_ptr(i.data())};}
@@ -276,8 +286,6 @@ public:
   }
 
 private:
-  friend Model;
-
   template<typename... Args>
   static segment_backend_unique_ptr new_(
     segment_allocator_type al,Args&&... args)