update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / boost / libs / log / src / named_scope.cpp

diff --git a/ceph/src/boost/libs/log/src/named_scope.cpp b/ceph/src/boost/libs/log/src/named_scope.cpp
index 5fa634a38028c5e1cdd1e8fcb2ba9b811bd4362f..fff80a1d4ac4f3174573c79c8fc12da771888933 100644 (file)
--- a/ceph/src/boost/libs/log/src/named_scope.cpp
+++ b/ceph/src/boost/libs/log/src/named_scope.cpp
@@ -22,6 +22,7 @@
 #include <boost/log/attributes/attribute_value.hpp>
 #include <boost/log/attributes/named_scope.hpp>
 #include <boost/log/utility/type_dispatch/type_dispatcher.hpp>
+#include <boost/log/detail/allocator_traits.hpp>
 #include <boost/log/detail/singleton.hpp>
 #if !defined(BOOST_LOG_NO_THREADS)
 #include <boost/thread/tss.hpp>
@@ -210,11 +211,11 @@ BOOST_LOG_API named_scope_list::named_scope_list(named_scope_list const& that) :
     if (m_Size > 0)
     {
         // Copy the container contents
-        pointer p = allocator_type::allocate(that.size());
+        pointer p = log::aux::allocator_traits< allocator_type >::allocate(*static_cast< allocator_type* >(this), that.size());
         aux::named_scope_list_node* prev = &m_RootNode;
         for (const_iterator src = that.begin(), end = that.end(); src != end; ++src, ++p)
         {
-            allocator_type::construct(p, *src); // won't throw
+            log::aux::allocator_traits< allocator_type >::construct(*static_cast< allocator_type* >(this), p, *src); // won't throw
             p->_m_pPrev = prev;
             prev->_m_pNext = p;
             prev = p;
@@ -232,8 +233,8 @@ BOOST_LOG_API named_scope_list::~named_scope_list()
         iterator it(m_RootNode._m_pNext);
         iterator end(&m_RootNode);
         while (it != end)
-            allocator_type::destroy(&*(it++));
-        allocator_type::deallocate(static_cast< pointer >(m_RootNode._m_pNext), m_Size);
+            log::aux::allocator_traits< allocator_type >::destroy(*static_cast< allocator_type* >(this), &*(it++));
+        log::aux::allocator_traits< allocator_type >::deallocate(*static_cast< allocator_type* >(this), static_cast< pointer >(m_RootNode._m_pNext), m_Size);
     }
 }