update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / boost / boost / beast / http / impl / fields.hpp

diff --git a/ceph/src/boost/boost/beast/http/impl/fields.hpp b/ceph/src/boost/boost/beast/http/impl/fields.hpp
index 2711df38b42dafa0f87c46f54cf35fd913cf40f4..dde92b929987bc738244fdd5426ddabcd3046807 100644 (file)
--- a/ceph/src/boost/boost/beast/http/impl/fields.hpp
+++ b/ceph/src/boost/boost/beast/http/impl/fields.hpp
@@ -382,7 +382,6 @@ basic_fields(basic_fields&& other, Allocator const& alloc)
     if(this->get() != other.get())
     {
         copy_all(other);
-        other.clear_all();
     }
     else
     {
@@ -617,7 +616,7 @@ erase(const_iterator pos) ->
 {
     auto next = pos;
     auto& e = *next++;
-    set_.erase(e);
+    set_.erase(set_.iterator_to(e));
     list_.erase(pos);
     delete_element(const_cast<element&>(e));
     return next;
@@ -1139,7 +1138,6 @@ move_assign(basic_fields& other, std::false_type)
     if(this->get() != other.get())
     {
         copy_all(other);
-        other.clear_all();
     }
     else
     {