import quincy beta 17.1.0

[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 fff80a1d4ac4f3174573c79c8fc12da771888933..8121cbfa7c465436492a69e06785b83304738bae 100644 (file)
--- a/ceph/src/boost/libs/log/src/named_scope.cpp
+++ b/ceph/src/boost/libs/log/src/named_scope.cpp
@@ -57,7 +57,6 @@ BOOST_LOG_ANONYMOUS_NAMESPACE {
             entry._m_pPrev = top;
             entry._m_pNext = &this->m_RootNode;
 
-            BOOST_LOG_ASSUME(&entry != 0);
             this->m_RootNode._m_pPrev = top->_m_pNext =
                 const_cast< aux::named_scope_list_node* >(
                     static_cast< const aux::named_scope_list_node* >(&entry));
@@ -92,7 +91,7 @@ BOOST_LOG_ANONYMOUS_NAMESPACE {
 
         //! The method dispatches the value to the given object. It returns true if the
         //! object was capable to consume the real attribute value type and false otherwise.
-        bool dispatch(type_dispatcher& dispatcher)
+        bool dispatch(type_dispatcher& dispatcher) BOOST_OVERRIDE
         {
             type_dispatcher::callback< scope_stack > callback =
                 dispatcher.get_callback< scope_stack >();
@@ -108,11 +107,11 @@ BOOST_LOG_ANONYMOUS_NAMESPACE {
         /*!
          * \return The attribute value type
          */
-        typeindex::type_index get_type() const { return typeindex::type_id< scope_stack >(); }
+        typeindex::type_index get_type() const BOOST_OVERRIDE { return typeindex::type_id< scope_stack >(); }
 
         //! The method is called when the attribute value is passed to another thread (e.g.
         //! in case of asynchronous logging). The value should ensure it properly owns all thread-specific data.
-        intrusive_ptr< attribute_value::impl > detach_from_thread()
+        intrusive_ptr< attribute_value::impl > detach_from_thread() BOOST_OVERRIDE
         {
             if (!m_DetachedValue)
             {
@@ -186,7 +185,7 @@ struct BOOST_SYMBOL_VISIBLE named_scope::impl :
     }
 
     //! The method returns the actual attribute value. It must not return NULL.
-    attribute_value get_value()
+    attribute_value get_value() BOOST_OVERRIDE
     {
         return attribute_value(new named_scope_value(&get_scope_list()));
     }