Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r85544 - in trunk: boost/log/attributes boost/log/core boost/log/detail boost/log/sources boost/log/utility boost/log/utility/setup boost/log/utility/type_dispatch libs/log/doc libs/log/test/compile libs/log/test/compile_fail
From: andrey.semashev_at_[hidden]
Date: 2013-09-01 14:42:53


Author: andysem
Date: 2013-09-01 14:42:52 EDT (Sun, 01 Sep 2013)
New Revision: 85544
URL: http://svn.boost.org/trac/boost/changeset/85544

Log:
BOOST_EXPLICIT_OPERATOR_BOOL macro moved to Boost.Utility.

Deleted:
   trunk/libs/log/test/compile/util_explicit_operator_bool.cpp
   trunk/libs/log/test/compile_fail/util_explicit_operator_bool_conv_int.cpp
   trunk/libs/log/test/compile_fail/util_explicit_operator_bool_conv_pvoid.cpp
   trunk/libs/log/test/compile_fail/util_explicit_operator_bool_delete.cpp
   trunk/libs/log/test/compile_fail/util_explicit_operator_bool_shift.cpp
Text files modified:
   trunk/boost/log/attributes/attribute.hpp | 4 +-
   trunk/boost/log/attributes/attribute_name.hpp | 4 +-
   trunk/boost/log/attributes/attribute_value.hpp | 4 +-
   trunk/boost/log/attributes/value_visitation.hpp | 4 +-
   trunk/boost/log/core/record.hpp | 4 +-
   trunk/boost/log/core/record_view.hpp | 4 +-
   trunk/boost/log/detail/light_function.hpp | 6 +-
   trunk/boost/log/detail/light_function_pp.hpp | 4 +-
   trunk/boost/log/detail/locking_ptr.hpp | 4 +-
   trunk/boost/log/sources/record_ostream.hpp | 4 +-
   trunk/boost/log/utility/explicit_operator_bool.hpp | 80 ++++-----------------------------------
   trunk/boost/log/utility/formatting_ostream.hpp | 4 +-
   trunk/boost/log/utility/setup/settings.hpp | 6 +-
   trunk/boost/log/utility/type_dispatch/type_dispatcher.hpp | 6 +-
   trunk/boost/log/utility/type_info_wrapper.hpp | 4 +-
   trunk/boost/log/utility/value_ref.hpp | 4 +-
   trunk/libs/log/doc/changelog.qbk | 1
   trunk/libs/log/doc/log.qbk | 1
   /dev/null | 43 ---------------------
   /dev/null | 40 --------------------
   /dev/null | 40 --------------------
   /dev/null | 40 --------------------
   /dev/null | 40 --------------------
   23 files changed, 44 insertions(+), 307 deletions(-)

Modified: trunk/boost/log/attributes/attribute.hpp
==============================================================================
--- trunk/boost/log/attributes/attribute.hpp Sun Sep 1 12:31:16 2013 (r85543)
+++ trunk/boost/log/attributes/attribute.hpp 2013-09-01 14:42:52 EDT (Sun, 01 Sep 2013) (r85544)
@@ -20,7 +20,7 @@
 #include <boost/smart_ptr/intrusive_ptr.hpp>
 #include <boost/smart_ptr/intrusive_ref_counter.hpp>
 #include <boost/log/detail/config.hpp>
-#include <boost/log/utility/explicit_operator_bool.hpp>
+#include <boost/utility/explicit_operator_bool.hpp>
 #include <boost/log/detail/header.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
@@ -132,7 +132,7 @@
     /*!
      * Verifies that the factory is not in empty state
      */
- BOOST_LOG_EXPLICIT_OPERATOR_BOOL()
+ BOOST_EXPLICIT_OPERATOR_BOOL()
 
     /*!
      * Verifies that the factory is in empty state

Modified: trunk/boost/log/attributes/attribute_name.hpp
==============================================================================
--- trunk/boost/log/attributes/attribute_name.hpp Sun Sep 1 12:31:16 2013 (r85543)
+++ trunk/boost/log/attributes/attribute_name.hpp 2013-09-01 14:42:52 EDT (Sun, 01 Sep 2013) (r85544)
@@ -20,7 +20,7 @@
 #include <boost/assert.hpp>
 #include <boost/cstdint.hpp>
 #include <boost/log/detail/config.hpp>
-#include <boost/log/utility/explicit_operator_bool.hpp>
+#include <boost/utility/explicit_operator_bool.hpp>
 #include <boost/log/detail/header.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
@@ -140,7 +140,7 @@
      *
      * \return \c true if <tt>*this</tt> was constructed with an attribute name, \c false otherwise
      */
- BOOST_LOG_EXPLICIT_OPERATOR_BOOL()
+ BOOST_EXPLICIT_OPERATOR_BOOL()
     /*!
      * Checks if the object was default-constructed
      *

Modified: trunk/boost/log/attributes/attribute_value.hpp
==============================================================================
--- trunk/boost/log/attributes/attribute_value.hpp Sun Sep 1 12:31:16 2013 (r85543)
+++ trunk/boost/log/attributes/attribute_value.hpp 2013-09-01 14:42:52 EDT (Sun, 01 Sep 2013) (r85544)
@@ -18,7 +18,7 @@
 #include <boost/move/core.hpp>
 #include <boost/smart_ptr/intrusive_ptr.hpp>
 #include <boost/log/detail/config.hpp>
-#include <boost/log/utility/explicit_operator_bool.hpp>
+#include <boost/utility/explicit_operator_bool.hpp>
 #include <boost/log/utility/type_info_wrapper.hpp>
 #include <boost/log/utility/type_dispatch/type_dispatcher.hpp>
 #include <boost/log/attributes/attribute.hpp>
@@ -154,7 +154,7 @@
     /*!
      * The operator checks if the attribute value is empty
      */
- BOOST_LOG_EXPLICIT_OPERATOR_BOOL()
+ BOOST_EXPLICIT_OPERATOR_BOOL()
     /*!
      * The operator checks if the attribute value is empty
      */

Modified: trunk/boost/log/attributes/value_visitation.hpp
==============================================================================
--- trunk/boost/log/attributes/value_visitation.hpp Sun Sep 1 12:31:16 2013 (r85543)
+++ trunk/boost/log/attributes/value_visitation.hpp 2013-09-01 14:42:52 EDT (Sun, 01 Sep 2013) (r85544)
@@ -26,7 +26,7 @@
 #include <boost/log/attributes/value_visitation_fwd.hpp>
 #include <boost/log/attributes/fallback_policy.hpp>
 #include <boost/log/expressions/keyword_fwd.hpp>
-#include <boost/log/utility/explicit_operator_bool.hpp>
+#include <boost/utility/explicit_operator_bool.hpp>
 #include <boost/log/utility/type_dispatch/static_type_dispatcher.hpp>
 #include <boost/log/detail/header.hpp>
 
@@ -71,7 +71,7 @@
      *
      * \return \c true if the value was visited successfully, \c false otherwise.
      */
- BOOST_LOG_EXPLICIT_OPERATOR_BOOL()
+ BOOST_EXPLICIT_OPERATOR_BOOL()
     /*!
      * Checks if the visitation was unsuccessful.
      *

Modified: trunk/boost/log/core/record.hpp
==============================================================================
--- trunk/boost/log/core/record.hpp Sun Sep 1 12:31:16 2013 (r85543)
+++ trunk/boost/log/core/record.hpp 2013-09-01 14:42:52 EDT (Sun, 01 Sep 2013) (r85544)
@@ -17,7 +17,7 @@
 
 #include <boost/move/core.hpp>
 #include <boost/log/detail/config.hpp>
-#include <boost/log/utility/explicit_operator_bool.hpp>
+#include <boost/utility/explicit_operator_bool.hpp>
 #include <boost/log/attributes/attribute_value_set.hpp>
 #include <boost/log/expressions/keyword_fwd.hpp>
 #include <boost/log/core/record_view.hpp>
@@ -115,7 +115,7 @@
      *
      * \return \c true, if the <tt>*this</tt> identifies a log record, \c false, if the <tt>*this</tt> is not valid
      */
- BOOST_LOG_EXPLICIT_OPERATOR_BOOL()
+ BOOST_EXPLICIT_OPERATOR_BOOL()
 
     /*!
      * Inverted conversion to an unspecified boolean type

Modified: trunk/boost/log/core/record_view.hpp
==============================================================================
--- trunk/boost/log/core/record_view.hpp Sun Sep 1 12:31:16 2013 (r85543)
+++ trunk/boost/log/core/record_view.hpp 2013-09-01 14:42:52 EDT (Sun, 01 Sep 2013) (r85544)
@@ -18,7 +18,7 @@
 #include <boost/smart_ptr/intrusive_ptr.hpp>
 #include <boost/move/core.hpp>
 #include <boost/log/detail/config.hpp>
-#include <boost/log/utility/explicit_operator_bool.hpp>
+#include <boost/utility/explicit_operator_bool.hpp>
 #include <boost/log/attributes/attribute_value_set.hpp>
 #include <boost/log/expressions/keyword_fwd.hpp>
 #ifndef BOOST_LOG_NO_THREADS
@@ -184,7 +184,7 @@
      *
      * \return \c true, if the <tt>*this</tt> identifies a log record, \c false, if the <tt>*this</tt> is not valid
      */
- BOOST_LOG_EXPLICIT_OPERATOR_BOOL()
+ BOOST_EXPLICIT_OPERATOR_BOOL()
 
     /*!
      * Inverted conversion to an unspecified boolean type

Modified: trunk/boost/log/detail/light_function.hpp
==============================================================================
--- trunk/boost/log/detail/light_function.hpp Sun Sep 1 12:31:16 2013 (r85543)
+++ trunk/boost/log/detail/light_function.hpp 2013-09-01 14:42:52 EDT (Sun, 01 Sep 2013) (r85544)
@@ -23,7 +23,7 @@
 #include <boost/move/core.hpp>
 #include <boost/move/utility.hpp>
 #include <boost/log/detail/config.hpp>
-#include <boost/log/utility/explicit_operator_bool.hpp>
+#include <boost/utility/explicit_operator_bool.hpp>
 #include <boost/type_traits/remove_cv.hpp>
 #if defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
 #include <boost/preprocessor/iteration/iterate.hpp>
@@ -244,7 +244,7 @@
         return m_pImpl->invoke(m_pImpl, args...);
     }
 
- BOOST_LOG_EXPLICIT_OPERATOR_BOOL()
+ BOOST_EXPLICIT_OPERATOR_BOOL()
     bool operator! () const BOOST_NOEXCEPT { return (m_pImpl == NULL); }
     bool empty() const BOOST_NOEXCEPT { return (m_pImpl == NULL); }
     void clear() BOOST_NOEXCEPT
@@ -444,7 +444,7 @@
         m_pImpl->invoke(m_pImpl, args...);
     }
 
- BOOST_LOG_EXPLICIT_OPERATOR_BOOL()
+ BOOST_EXPLICIT_OPERATOR_BOOL()
     bool operator! () const BOOST_NOEXCEPT { return (m_pImpl == NULL); }
     bool empty() const BOOST_NOEXCEPT { return (m_pImpl == NULL); }
     void clear() BOOST_NOEXCEPT

Modified: trunk/boost/log/detail/light_function_pp.hpp
==============================================================================
--- trunk/boost/log/detail/light_function_pp.hpp Sun Sep 1 12:31:16 2013 (r85543)
+++ trunk/boost/log/detail/light_function_pp.hpp 2013-09-01 14:42:52 EDT (Sun, 01 Sep 2013) (r85544)
@@ -189,7 +189,7 @@
         return m_pImpl->invoke(m_pImpl BOOST_PP_ENUM_TRAILING_PARAMS(BOOST_PP_ITERATION(), arg));
     }
 
- BOOST_LOG_EXPLICIT_OPERATOR_BOOL()
+ BOOST_EXPLICIT_OPERATOR_BOOL()
     bool operator! () const BOOST_NOEXCEPT { return (m_pImpl == NULL); }
     bool empty() const BOOST_NOEXCEPT { return (m_pImpl == NULL); }
     void clear() BOOST_NOEXCEPT
@@ -391,7 +391,7 @@
         m_pImpl->invoke(m_pImpl BOOST_PP_ENUM_TRAILING_PARAMS(BOOST_PP_ITERATION(), arg));
     }
 
- BOOST_LOG_EXPLICIT_OPERATOR_BOOL()
+ BOOST_EXPLICIT_OPERATOR_BOOL()
     bool operator! () const BOOST_NOEXCEPT { return (m_pImpl == NULL); }
     bool empty() const BOOST_NOEXCEPT { return (m_pImpl == NULL); }
     void clear() BOOST_NOEXCEPT

Modified: trunk/boost/log/detail/locking_ptr.hpp
==============================================================================
--- trunk/boost/log/detail/locking_ptr.hpp Sun Sep 1 12:31:16 2013 (r85543)
+++ trunk/boost/log/detail/locking_ptr.hpp 2013-09-01 14:42:52 EDT (Sun, 01 Sep 2013) (r85544)
@@ -18,7 +18,7 @@
 
 #include <boost/smart_ptr/shared_ptr.hpp>
 #include <boost/log/detail/config.hpp>
-#include <boost/log/utility/explicit_operator_bool.hpp>
+#include <boost/utility/explicit_operator_bool.hpp>
 #include <boost/log/detail/header.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
@@ -119,7 +119,7 @@
     element_type* get() const { return m_pElement.get(); }
 
     //! Checks for null pointer
- BOOST_LOG_EXPLICIT_OPERATOR_BOOL()
+ BOOST_EXPLICIT_OPERATOR_BOOL()
     //! Checks for null pointer
     bool operator! () const { return !m_pElement; }
 

Modified: trunk/boost/log/sources/record_ostream.hpp
==============================================================================
--- trunk/boost/log/sources/record_ostream.hpp Sun Sep 1 12:31:16 2013 (r85543)
+++ trunk/boost/log/sources/record_ostream.hpp 2013-09-01 14:42:52 EDT (Sun, 01 Sep 2013) (r85544)
@@ -27,7 +27,7 @@
 #include <boost/log/detail/unhandled_exception_count.hpp>
 #include <boost/log/core/record.hpp>
 #include <boost/log/utility/unique_identifier_name.hpp>
-#include <boost/log/utility/explicit_operator_bool.hpp>
+#include <boost/utility/explicit_operator_bool.hpp>
 #include <boost/log/utility/formatting_ostream.hpp>
 #include <boost/log/detail/header.hpp>
 
@@ -103,7 +103,7 @@
      * \return \c true, if stream is valid and ready for formatting, \c false, if the stream is not valid. The latter also applies to
      * the case when the stream is not attached to a log record.
      */
- BOOST_LOG_EXPLICIT_OPERATOR_BOOL()
+ BOOST_EXPLICIT_OPERATOR_BOOL()
 
     /*!
      * Inverted conversion to an unspecified boolean type

Modified: trunk/boost/log/utility/explicit_operator_bool.hpp
==============================================================================
--- trunk/boost/log/utility/explicit_operator_bool.hpp Sun Sep 1 12:31:16 2013 (r85543)
+++ trunk/boost/log/utility/explicit_operator_bool.hpp 2013-09-01 14:42:52 EDT (Sun, 01 Sep 2013) (r85544)
@@ -9,22 +9,25 @@
  * \author Andrey Semashev
  * \date 08.03.2009
  *
- * This header defines a compatibility macro that implements an unspecified
- * \c bool operator idiom, which is superseded with explicit conversion operators in
- * C++0x.
+ * This header is deprecated, use boost/utility/explicit_operator_bool.hpp instead. The header is left for
+ * backward compatibility and will be removed in future versions.
  */
 
 #ifndef BOOST_LOG_UTILITY_EXPLICIT_OPERATOR_BOOL_HPP_INCLUDED_
 #define BOOST_LOG_UTILITY_EXPLICIT_OPERATOR_BOOL_HPP_INCLUDED_
 
+#include <boost/utility/explicit_operator_bool.hpp>
 #include <boost/log/detail/config.hpp>
-#include <boost/log/detail/header.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
 #pragma once
 #endif
 
-#if defined(BOOST_LOG_DOXYGEN_PASS) || !defined(BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS)
+#if defined(__GNUC__)
+#pragma message "Boost.Log: This header is deprecated, use boost/utility/explicit_operator_bool.hpp instead."
+#elif defined(_MSC_VER)
+#pragma message("Boost.Log: This header is deprecated, use boost/utility/explicit_operator_bool.hpp instead.")
+#endif
 
 /*!
  * \brief The macro defines an explicit operator of conversion to \c bool
@@ -34,71 +37,6 @@
  * in terms of which the conversion operator will be implemented.
  */
 #define BOOST_LOG_EXPLICIT_OPERATOR_BOOL()\
- BOOST_FORCEINLINE explicit operator bool () const\
- {\
- return !this->operator! ();\
- }
-
-#elif !defined(BOOST_LOG_NO_UNSPECIFIED_BOOL)
-
-namespace boost {
-
-BOOST_LOG_OPEN_NAMESPACE
-
-namespace aux {
-
-#if !defined(_MSC_VER)
-
- struct unspecified_bool
- {
- // NOTE TO THE USER: If you see this in error messages then you tried
- // to apply an unsupported operator on the object that supports
- // explicit conversion to bool.
- struct OPERATORS_NOT_ALLOWED;
- static void true_value(OPERATORS_NOT_ALLOWED*) {}
- };
- typedef void (*unspecified_bool_type)(unspecified_bool::OPERATORS_NOT_ALLOWED*);
-
-#else
-
- // MSVC is too eager to convert pointer to function to void* even though it shouldn't
- struct unspecified_bool
- {
- // NOTE TO THE USER: If you see this in error messages then you tried
- // to apply an unsupported operator on the object that supports
- // explicit conversion to bool.
- struct OPERATORS_NOT_ALLOWED;
- void true_value(OPERATORS_NOT_ALLOWED*) {}
- };
- typedef void (unspecified_bool::*unspecified_bool_type)(unspecified_bool::OPERATORS_NOT_ALLOWED*);
-
-#endif
-
-} // namespace aux
-
-BOOST_LOG_CLOSE_NAMESPACE // namespace log
-
-} // namespace boost
-
-#define BOOST_LOG_EXPLICIT_OPERATOR_BOOL()\
- BOOST_FORCEINLINE operator boost::log::aux::unspecified_bool_type () const\
- {\
- if (!this->operator!())\
- return &boost::log::aux::unspecified_bool::true_value;\
- else\
- return 0;\
- }
-
-#else
-
-#define BOOST_LOG_EXPLICIT_OPERATOR_BOOL()\
- BOOST_FORCEINLINE operator bool () const\
- {\
- return !this->operator! ();\
- }
-
-#endif
-
-#include <boost/log/detail/footer.hpp>
+ BOOST_EXPLICIT_OPERATOR_BOOL()
 
 #endif // BOOST_LOG_UTILITY_EXPLICIT_OPERATOR_BOOL_HPP_INCLUDED_

Modified: trunk/boost/log/utility/formatting_ostream.hpp
==============================================================================
--- trunk/boost/log/utility/formatting_ostream.hpp Sun Sep 1 12:31:16 2013 (r85543)
+++ trunk/boost/log/utility/formatting_ostream.hpp 2013-09-01 14:42:52 EDT (Sun, 01 Sep 2013) (r85544)
@@ -26,7 +26,7 @@
 #include <boost/log/detail/code_conversion.hpp>
 #include <boost/log/utility/string_literal_fwd.hpp>
 #include <boost/log/utility/formatting_ostream_fwd.hpp>
-#include <boost/log/utility/explicit_operator_bool.hpp>
+#include <boost/utility/explicit_operator_bool.hpp>
 #include <boost/log/detail/header.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
@@ -276,7 +276,7 @@
     static bool sync_with_stdio(bool sync = true) { return ostream_type::sync_with_stdio(sync); }
 
     // std::basic_ios method forwarders
- BOOST_LOG_EXPLICIT_OPERATOR_BOOL()
+ BOOST_EXPLICIT_OPERATOR_BOOL()
     bool operator! () const { return !m_stream; }
 
     iostate rdstate() const { return m_stream.rdstate(); }

Modified: trunk/boost/log/utility/setup/settings.hpp
==============================================================================
--- trunk/boost/log/utility/setup/settings.hpp Sun Sep 1 12:31:16 2013 (r85543)
+++ trunk/boost/log/utility/setup/settings.hpp 2013-09-01 14:42:52 EDT (Sun, 01 Sep 2013) (r85544)
@@ -26,7 +26,7 @@
 #include <boost/property_tree/ptree.hpp>
 #include <boost/log/detail/setup_config.hpp>
 #include <boost/log/detail/native_typeof.hpp>
-#include <boost/log/utility/explicit_operator_bool.hpp>
+#include <boost/utility/explicit_operator_bool.hpp>
 #if !defined(BOOST_LOG_TYPEOF)
 #include <boost/utility/enable_if.hpp>
 #endif
@@ -175,7 +175,7 @@
             return *this;
         }
 
- BOOST_LOG_EXPLICIT_OPERATOR_BOOL()
+ BOOST_EXPLICIT_OPERATOR_BOOL()
 
         bool operator! () const
         {
@@ -368,7 +368,7 @@
     /*!
      * Checks if the section refers to the container.
      */
- BOOST_LOG_EXPLICIT_OPERATOR_BOOL()
+ BOOST_EXPLICIT_OPERATOR_BOOL()
 
     /*!
      * Checks if the section refers to the container.

Modified: trunk/boost/log/utility/type_dispatch/type_dispatcher.hpp
==============================================================================
--- trunk/boost/log/utility/type_dispatch/type_dispatcher.hpp Sun Sep 1 12:31:16 2013 (r85543)
+++ trunk/boost/log/utility/type_dispatch/type_dispatcher.hpp 2013-09-01 14:42:52 EDT (Sun, 01 Sep 2013) (r85544)
@@ -19,7 +19,7 @@
 #include <boost/static_assert.hpp>
 #include <boost/log/detail/config.hpp>
 #include <boost/log/detail/visible_type.hpp>
-#include <boost/log/utility/explicit_operator_bool.hpp>
+#include <boost/utility/explicit_operator_bool.hpp>
 #include <boost/log/detail/header.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
@@ -112,7 +112,7 @@
             (caster.as_trampoline)(this->m_pVisitor, value);
         }
 
- BOOST_LOG_EXPLICIT_OPERATOR_BOOL()
+ BOOST_EXPLICIT_OPERATOR_BOOL()
 
         bool operator! () const { return (this->m_pVisitor == 0); }
     };
@@ -136,7 +136,7 @@
         /*!
          * The operator checks if the visitor is attached to a receiver
          */
- BOOST_LOG_EXPLICIT_OPERATOR_BOOL()
+ BOOST_EXPLICIT_OPERATOR_BOOL()
 
         /*!
          * The operator checks if the visitor is not attached to a receiver

Modified: trunk/boost/log/utility/type_info_wrapper.hpp
==============================================================================
--- trunk/boost/log/utility/type_info_wrapper.hpp Sun Sep 1 12:31:16 2013 (r85543)
+++ trunk/boost/log/utility/type_info_wrapper.hpp 2013-09-01 14:42:52 EDT (Sun, 01 Sep 2013) (r85544)
@@ -18,7 +18,7 @@
 #include <typeinfo>
 #include <string>
 #include <boost/log/detail/config.hpp>
-#include <boost/log/utility/explicit_operator_bool.hpp>
+#include <boost/utility/explicit_operator_bool.hpp>
 
 #ifdef BOOST_LOG_HAS_CXXABI_H
 #include <cxxabi.h>
@@ -93,7 +93,7 @@
      * \return \c true if the type info wrapper was initialized with a particular type,
      * \c false if the wrapper was default-constructed and not yet initialized
      */
- BOOST_LOG_EXPLICIT_OPERATOR_BOOL()
+ BOOST_EXPLICIT_OPERATOR_BOOL()
 
     /*!
      * Stored type info getter

Modified: trunk/boost/log/utility/value_ref.hpp
==============================================================================
--- trunk/boost/log/utility/value_ref.hpp Sun Sep 1 12:31:16 2013 (r85543)
+++ trunk/boost/log/utility/value_ref.hpp 2013-09-01 14:42:52 EDT (Sun, 01 Sep 2013) (r85544)
@@ -37,7 +37,7 @@
 #include <boost/log/detail/config.hpp>
 #include <boost/log/detail/parameter_tools.hpp>
 #include <boost/log/detail/value_ref_visitation.hpp>
-#include <boost/log/utility/explicit_operator_bool.hpp>
+#include <boost/utility/explicit_operator_bool.hpp>
 #include <boost/log/utility/formatting_ostream_fwd.hpp>
 #include <boost/log/utility/functional/logical.hpp>
 #include <boost/log/utility/functional/bind.hpp>
@@ -447,7 +447,7 @@
     /*!
      * The operator verifies if the wrapper refers to a value.
      */
- BOOST_LOG_EXPLICIT_OPERATOR_BOOL()
+ BOOST_EXPLICIT_OPERATOR_BOOL()
 
     /*!
      * The operator verifies if the wrapper does not refer to a value.

Modified: trunk/libs/log/doc/changelog.qbk
==============================================================================
--- trunk/libs/log/doc/changelog.qbk Sun Sep 1 12:31:16 2013 (r85543)
+++ trunk/libs/log/doc/changelog.qbk 2013-09-01 14:42:52 EDT (Sun, 01 Sep 2013) (r85544)
@@ -16,6 +16,7 @@
 * Added a new configuration macro `BOOST_LOG_WITHOUT_DEFAULT_FACTORIES`. By defining this macro the user can disable compilation of the default filter and formatter factories used by settings parsers. This can substantially reduce binary sizes while still retaining support for settings parsers. Note that when this macro is defined the user will have to register _all_ attributes in the library.
 * Rewritten some of the parsers to reduce the compiled binary size. The rewritten parsers are more robust in detecting ambiguous and incorrect input.
 * The header `boost/log/utility/intrusive_ref_counter.hpp` is deprecated and will be removed in future releases. Its contents have been moved to __boost_smart_ptr__, as `boost/smart_ptr/intrusive_ref_counter.hpp`.
+* The header `boost/log/utility/explicit_operator_bool.hpp` is deprecated and will be removed in future releases. Its contents have been moved to __boost_utility__, as `boost/utility/explicit_operator_bool.hpp`.
 
 [*Bug fixes:]
 

Modified: trunk/libs/log/doc/log.qbk
==============================================================================
--- trunk/libs/log/doc/log.qbk Sun Sep 1 12:31:16 2013 (r85543)
+++ trunk/libs/log/doc/log.qbk 2013-09-01 14:42:52 EDT (Sun, 01 Sep 2013) (r85544)
@@ -46,6 +46,7 @@
 [def __boost_asio__ [@http://www.boost.org/doc/libs/release/doc/html/boost_asio.html Boost.ASIO]]
 [def __boost_move__ [@http://www.boost.org/doc/libs/release/doc/html/move.html Boost.Move]]
 [def __boost_locale__ [@http://www.boost.org/doc/libs/release/libs/locale/doc/html/index.html Boost.Locale]]
+[def __boost_utility__ [@http://www.boost.org/doc/libs/release/libs/utility/utility.htm Boost.Utility]]
 [def __boost_quickbook__ [@http://www.boost.org/doc/libs/release/doc/html/quickbook.html Boost.Quickbook]]
 
 [template ticket[key] '''<ulink url="https://svn.boost.org/trac/boost/ticket/'''[key]'''">#'''[key]'''</ulink>''']

Deleted: trunk/libs/log/test/compile/util_explicit_operator_bool.cpp
==============================================================================
--- trunk/libs/log/test/compile/util_explicit_operator_bool.cpp 2013-09-01 14:42:52 EDT (Sun, 01 Sep 2013) (r85543)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,43 +0,0 @@
-/*
- * Copyright Andrey Semashev 2007 - 2013.
- * 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)
- */
-/*!
- * \file util_explicit_operator_bool.cpp
- * \author Andrey Semashev
- * \date 17.07.2010
- *
- * \brief This test checks that explicit operator bool can be used in
- * the valid contexts.
- */
-
-#define BOOST_TEST_MODULE util_explicit_operator_bool
-
-#include <boost/log/utility/explicit_operator_bool.hpp>
-
-namespace {
-
- // A test object that has the operator of explicit conversion to bool
- struct checkable
- {
- BOOST_LOG_EXPLICIT_OPERATOR_BOOL()
- bool operator! () const
- {
- return false;
- }
- };
-
-} // namespace
-
-int main(int, char*[])
-{
- checkable val;
- if (val)
- {
- return 1;
- }
-
- return 0;
-}

Deleted: trunk/libs/log/test/compile_fail/util_explicit_operator_bool_conv_int.cpp
==============================================================================
--- trunk/libs/log/test/compile_fail/util_explicit_operator_bool_conv_int.cpp 2013-09-01 14:42:52 EDT (Sun, 01 Sep 2013) (r85543)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,40 +0,0 @@
-/*
- * Copyright Andrey Semashev 2007 - 2013.
- * 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)
- */
-/*!
- * \file util_explicit_operator_bool_conv_int.cpp
- * \author Andrey Semashev
- * \date 17.07.2010
- *
- * \brief This test checks that explicit operator bool cannot be used in
- * an unintended context.
- */
-
-#define BOOST_TEST_MODULE util_explicit_operator_bool_conv_int
-
-#include <boost/log/utility/explicit_operator_bool.hpp>
-
-namespace {
-
- // A test object that has the operator of explicit conversion to bool
- struct checkable
- {
- BOOST_LOG_EXPLICIT_OPERATOR_BOOL()
- bool operator! () const
- {
- return false;
- }
- };
-
-} // namespace
-
-int main(int, char*[])
-{
- checkable val;
- int n = val;
-
- return 0;
-}

Deleted: trunk/libs/log/test/compile_fail/util_explicit_operator_bool_conv_pvoid.cpp
==============================================================================
--- trunk/libs/log/test/compile_fail/util_explicit_operator_bool_conv_pvoid.cpp 2013-09-01 14:42:52 EDT (Sun, 01 Sep 2013) (r85543)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,40 +0,0 @@
-/*
- * Copyright Andrey Semashev 2007 - 2013.
- * 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)
- */
-/*!
- * \file util_explicit_operator_bool_conv_pvoid.cpp
- * \author Andrey Semashev
- * \date 17.07.2010
- *
- * \brief This test checks that explicit operator bool cannot be used in
- * an unintended context.
- */
-
-#define BOOST_TEST_MODULE util_explicit_operator_bool_conv_pvoid
-
-#include <boost/log/utility/explicit_operator_bool.hpp>
-
-namespace {
-
- // A test object that has the operator of explicit conversion to bool
- struct checkable
- {
- BOOST_LOG_EXPLICIT_OPERATOR_BOOL()
- bool operator! () const
- {
- return false;
- }
- };
-
-} // namespace
-
-int main(int, char*[])
-{
- checkable val;
- void* p = val;
-
- return 0;
-}

Deleted: trunk/libs/log/test/compile_fail/util_explicit_operator_bool_delete.cpp
==============================================================================
--- trunk/libs/log/test/compile_fail/util_explicit_operator_bool_delete.cpp 2013-09-01 14:42:52 EDT (Sun, 01 Sep 2013) (r85543)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,40 +0,0 @@
-/*
- * Copyright Andrey Semashev 2007 - 2013.
- * 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)
- */
-/*!
- * \file util_explicit_operator_bool_delete.cpp
- * \author Andrey Semashev
- * \date 17.07.2010
- *
- * \brief This test checks that explicit operator bool cannot be used in
- * an unintended context.
- */
-
-#define BOOST_TEST_MODULE util_explicit_operator_bool_delete
-
-#include <boost/log/utility/explicit_operator_bool.hpp>
-
-namespace {
-
- // A test object that has the operator of explicit conversion to bool
- struct checkable
- {
- BOOST_LOG_EXPLICIT_OPERATOR_BOOL()
- bool operator! () const
- {
- return false;
- }
- };
-
-} // namespace
-
-int main(int, char*[])
-{
- checkable val;
- delete val;
-
- return 0;
-}

Deleted: trunk/libs/log/test/compile_fail/util_explicit_operator_bool_shift.cpp
==============================================================================
--- trunk/libs/log/test/compile_fail/util_explicit_operator_bool_shift.cpp 2013-09-01 14:42:52 EDT (Sun, 01 Sep 2013) (r85543)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,40 +0,0 @@
-/*
- * Copyright Andrey Semashev 2007 - 2013.
- * 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)
- */
-/*!
- * \file util_explicit_operator_bool_shift.cpp
- * \author Andrey Semashev
- * \date 17.07.2010
- *
- * \brief This test checks that explicit operator bool cannot be used in
- * an unintended context.
- */
-
-#define BOOST_TEST_MODULE util_explicit_operator_bool_shift
-
-#include <boost/log/utility/explicit_operator_bool.hpp>
-
-namespace {
-
- // A test object that has the operator of explicit conversion to bool
- struct checkable
- {
- BOOST_LOG_EXPLICIT_OPERATOR_BOOL()
- bool operator! () const
- {
- return false;
- }
- };
-
-} // namespace
-
-int main(int, char*[])
-{
- checkable val;
- val << 2;
-
- return 0;
-}


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk