[Boost-commit] svn:boost r85657 - in branches/release: boost/log boost/log/attributes boost/log/core boost/log/detail boost/log/sinks boost/log/sources boost/log/utility boost/log/utility/functional boost/log/utility/setup boost/log/utility/type_dispatch libs/log libs/log/doc libs/log/example/advanced_usage libs/log/example/async_log libs/log/example/basic_usage libs/log/example/bounded_async_log libs/log/example/doc libs/log/example/event_log libs/log/example/keywords libs/log/example/multiple_files libs/log/example/multiple_threads libs/log/example/native_syslog libs/log/example/rotating_file libs/log/example/settings_file libs/log/example/settings_file_formatter_factory libs/log/example/syslog libs/log/example/trivial libs/log/example/wide_char libs/log/src libs/log/test libs/log/test/compile libs/log/test/compile_fail libs/log/test/performance libs/log/test/run

Subject: [Boost-commit] svn:boost r85657 - in branches/release: boost/log boost/log/attributes boost/log/core boost/log/detail boost/log/sinks boost/log/sources boost/log/utility boost/log/utility/functional boost/log/utility/setup boost/log/utility/type_dispatch libs/log libs/log/doc libs/log/example/advanced_usage libs/log/example/async_log libs/log/example/basic_usage libs/log/example/bounded_async_log libs/log/example/doc libs/log/example/event_log libs/log/example/keywords libs/log/example/multiple_files libs/log/example/multiple_threads libs/log/example/native_syslog libs/log/example/rotating_file libs/log/example/settings_file libs/log/example/settings_file_formatter_factory libs/log/example/syslog libs/log/example/trivial libs/log/example/wide_char libs/log/src libs/log/test libs/log/test/compile libs/log/test/compile_fail libs/log/test/performance libs/log/test/run
From: andrey.semashev_at_[hidden]
Date: 2013-09-12 13:17:07

Author: andysem
Date: 2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)
New Revision: 85657
URL: http://svn.boost.org/trac/boost/changeset/85657

Log:
Merged recent changes from trunk.

Deleted:
   branches/release/libs/log/test/compile/util_explicit_operator_bool.cpp
   branches/release/libs/log/test/compile_fail/util_explicit_operator_bool_conv_int.cpp
   branches/release/libs/log/test/compile_fail/util_explicit_operator_bool_conv_pvoid.cpp
   branches/release/libs/log/test/compile_fail/util_explicit_operator_bool_delete.cpp
   branches/release/libs/log/test/compile_fail/util_explicit_operator_bool_shift.cpp
Properties modified: 
   branches/release/boost/log/   (props changed)
   branches/release/libs/log/   (props changed)
Text files modified: 
   branches/release/boost/log/attributes/attribute.hpp                           |    15 +                                       
   branches/release/boost/log/attributes/attribute_name.hpp                      |     4                                         
   branches/release/boost/log/attributes/attribute_value.hpp                     |     7                                         
   branches/release/boost/log/attributes/current_thread_id.hpp                   |     2                                         
   branches/release/boost/log/attributes/mutable_constant.hpp                    |     3                                         
   branches/release/boost/log/attributes/value_visitation.hpp                    |     4                                         
   branches/release/boost/log/core/core.hpp                                      |     2                                         
   branches/release/boost/log/core/record.hpp                                    |     4                                         
   branches/release/boost/log/core/record_view.hpp                               |     6                                         
   branches/release/boost/log/detail/light_function.hpp                          |     6                                         
   branches/release/boost/log/detail/light_function_pp.hpp                       |     4                                         
   branches/release/boost/log/detail/locking_ptr.hpp                             |   208 ++++++++++++++++++++--------------------
   branches/release/boost/log/sinks/async_frontend.hpp                           |     6                                         
   branches/release/boost/log/sinks/sync_frontend.hpp                            |     4                                         
   branches/release/boost/log/sinks/syslog_backend.hpp                           |     1                                         
   branches/release/boost/log/sinks/text_file_backend.hpp                        |     2                                         
   branches/release/boost/log/sinks/text_ostream_backend.hpp                     |     2                                         
   branches/release/boost/log/sinks/unlocked_frontend.hpp                        |     4                                         
   branches/release/boost/log/sources/basic_logger.hpp                           |     1                                         
   branches/release/boost/log/sources/global_logger_storage.hpp                  |     4                                         
   branches/release/boost/log/sources/record_ostream.hpp                         |     4                                         
   branches/release/boost/log/sources/severity_feature.hpp                       |     2                                         
   branches/release/boost/log/utility/empty_deleter.hpp                          |    25 +--                                     
   branches/release/boost/log/utility/explicit_operator_bool.hpp                 |    80 +-------------                          
   branches/release/boost/log/utility/formatting_ostream.hpp                     |    86 ++++++++++++---                         
   branches/release/boost/log/utility/functional/nop.hpp                         |    10                                         
   branches/release/boost/log/utility/intrusive_ref_counter.hpp                  |    99 +++---------------                      
   branches/release/boost/log/utility/setup/console.hpp                          |     8                                         
   branches/release/boost/log/utility/setup/file.hpp                             |     4                                         
   branches/release/boost/log/utility/setup/filter_parser.hpp                    |     4                                         
   branches/release/boost/log/utility/setup/formatter_parser.hpp                 |     4                                         
   branches/release/boost/log/utility/setup/from_settings.hpp                    |     2                                         
   branches/release/boost/log/utility/setup/settings.hpp                         |     6                                         
   branches/release/boost/log/utility/string_literal.hpp                         |   116 +++++++++++++++------                   
   branches/release/boost/log/utility/type_dispatch/dynamic_type_dispatcher.hpp  |     4                                         
   branches/release/boost/log/utility/type_dispatch/type_dispatcher.hpp          |     6                                         
   branches/release/boost/log/utility/type_info_wrapper.hpp                      |     4                                         
   branches/release/boost/log/utility/value_ref.hpp                              |     4                                         
   branches/release/libs/log/doc/Jamfile.v2                                      |     1                                         
   branches/release/libs/log/doc/changelog.qbk                                   |     5                                         
   branches/release/libs/log/doc/log.qbk                                         |     1                                         
   branches/release/libs/log/example/advanced_usage/Jamfile.v2                   |     5                                         
   branches/release/libs/log/example/advanced_usage/main.cpp                     |     6                                         
   branches/release/libs/log/example/async_log/Jamfile.v2                        |     5                                         
   branches/release/libs/log/example/async_log/main.cpp                          |     3                                         
   branches/release/libs/log/example/basic_usage/Jamfile.v2                      |     5                                         
   branches/release/libs/log/example/bounded_async_log/Jamfile.v2                |     5                                         
   branches/release/libs/log/example/bounded_async_log/main.cpp                  |     3                                         
   branches/release/libs/log/example/doc/Jamfile.v2                              |     5                                         
   branches/release/libs/log/example/doc/core_core_manual.cpp                    |     2                                         
   branches/release/libs/log/example/doc/exception_handling.cpp                  |     4                                         
   branches/release/libs/log/example/doc/expressions_has_attr_stat_accum.cpp     |     4                                         
   branches/release/libs/log/example/doc/extension_app_launcher.cpp              |     2                                         
   branches/release/libs/log/example/doc/extension_filter_parser.cpp             |     4                                         
   branches/release/libs/log/example/doc/extension_filter_parser_custom_rel.cpp  |     4                                         
   branches/release/libs/log/example/doc/extension_formatter_parser.cpp          |     4                                         
   branches/release/libs/log/example/doc/extension_record_tagger.cpp             |     4                                         
   branches/release/libs/log/example/doc/extension_stat_collector.cpp            |     2                                         
   branches/release/libs/log/example/doc/extension_stat_collector_settings.cpp   |     4                                         
   branches/release/libs/log/example/doc/extension_system_uptime_attr.cpp        |     6                                         
   branches/release/libs/log/example/doc/sinks_async.cpp                         |     6                                         
   branches/release/libs/log/example/doc/sinks_async_bounded.cpp                 |     6                                         
   branches/release/libs/log/example/doc/sinks_async_ordering.cpp                |     6                                         
   branches/release/libs/log/example/doc/sinks_debugger.cpp                      |     2                                         
   branches/release/libs/log/example/doc/sinks_file.cpp                          |     3                                         
   branches/release/libs/log/example/doc/sinks_multifile.cpp                     |     4                                         
   branches/release/libs/log/example/doc/sinks_ostream.cpp                       |     6                                         
   branches/release/libs/log/example/doc/sinks_simple_event_log.cpp              |     2                                         
   branches/release/libs/log/example/doc/sinks_sync.cpp                          |     6                                         
   branches/release/libs/log/example/doc/sinks_syslog.cpp                        |     4                                         
   branches/release/libs/log/example/doc/sinks_unlocked.cpp                      |     2                                         
   branches/release/libs/log/example/doc/sinks_xml_file.cpp                      |     2                                         
   branches/release/libs/log/example/doc/sources_net_connection.cpp              |     4                                         
   branches/release/libs/log/example/doc/sources_net_connection_chan.cpp         |     4                                         
   branches/release/libs/log/example/doc/sources_net_connection_dynamic_chan.cpp |     4                                         
   branches/release/libs/log/example/doc/sources_severity.cpp                    |     4                                         
   branches/release/libs/log/example/doc/sources_severity_channel.cpp            |     4                                         
   branches/release/libs/log/example/doc/tutorial_attributes.cpp                 |     4                                         
   branches/release/libs/log/example/doc/tutorial_file_manual.cpp                |     4                                         
   branches/release/libs/log/example/doc/tutorial_filtering.cpp                  |     4                                         
   branches/release/libs/log/example/doc/tutorial_fmt_custom.cpp                 |     4                                         
   branches/release/libs/log/example/doc/tutorial_fmt_format.cpp                 |     4                                         
   branches/release/libs/log/example/doc/tutorial_fmt_stream_manual.cpp          |     4                                         
   branches/release/libs/log/example/event_log/Jamfile.v2                        |     5                                         
   branches/release/libs/log/example/event_log/main.cpp                          |     2                                         
   branches/release/libs/log/example/keywords/Jamfile.v2                         |     5                                         
   branches/release/libs/log/example/multiple_files/Jamfile.v2                   |     5                                         
   branches/release/libs/log/example/multiple_files/main.cpp                     |     2                                         
   branches/release/libs/log/example/multiple_threads/Jamfile.v2                 |     5                                         
   branches/release/libs/log/example/multiple_threads/main.cpp                   |     3                                         
   branches/release/libs/log/example/native_syslog/Jamfile.v2                    |     5                                         
   branches/release/libs/log/example/native_syslog/main.cpp                      |     2                                         
   branches/release/libs/log/example/rotating_file/Jamfile.v2                    |     5                                         
   branches/release/libs/log/example/rotating_file/main.cpp                      |     2                                         
   branches/release/libs/log/example/settings_file/Jamfile.v2                    |     5                                         
   branches/release/libs/log/example/settings_file_formatter_factory/Jamfile.v2  |     5                                         
   branches/release/libs/log/example/settings_file_formatter_factory/main.cpp    |     2                                         
   branches/release/libs/log/example/syslog/Jamfile.v2                           |     5                                         
   branches/release/libs/log/example/syslog/main.cpp                             |     2                                         
   branches/release/libs/log/example/trivial/Jamfile.v2                          |     5                                         
   branches/release/libs/log/example/wide_char/Jamfile.v2                        |     5                                         
   branches/release/libs/log/src/attribute_name.cpp                              |     4                                         
   branches/release/libs/log/src/core.cpp                                        |     6                                         
   branches/release/libs/log/src/default_attribute_names.cpp                     |     2                                         
   branches/release/libs/log/src/init_from_settings.cpp                          |     8                                         
   branches/release/libs/log/src/named_scope.cpp                                 |     5                                         
   branches/release/libs/log/src/syslog_backend.cpp                              |     6                                         
   branches/release/libs/log/src/text_file_backend.cpp                           |     2                                         
   branches/release/libs/log/src/unhandled_exception_count.cpp                   |     4                                         
   branches/release/libs/log/test/Jamfile.v2                                     |     4                                         
   /dev/null                                                                     |    43 --------                                
   /dev/null                                                                     |    40 -------                                 
   /dev/null                                                                     |    40 -------                                 
   /dev/null                                                                     |    40 -------                                 
   /dev/null                                                                     |    40 -------                                 
   branches/release/libs/log/test/performance/record_emission.cpp                |     4                                         
   branches/release/libs/log/test/run/core.cpp                                   |     2                                         
   branches/release/libs/log/test/run/util_stp_filter_parser.cpp                 |     2                                         
   branches/release/libs/log/test/run/util_stp_formatter_parser.cpp              |     2                                         
   119 files changed, 531 insertions(+), 727 deletions(-)

Modified: branches/release/boost/log/attributes/attribute.hpp
==============================================================================
--- branches/release/boost/log/attributes/attribute.hpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/boost/log/attributes/attribute.hpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -16,11 +16,11 @@
 #define BOOST_LOG_ATTRIBUTES_ATTRIBUTE_HPP_INCLUDED_
 
 #include <new>
-#include <boost/intrusive_ptr.hpp>
 #include <boost/move/core.hpp>
+#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/intrusive_ref_counter.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
@@ -67,9 +67,14 @@
      * All attributes must derive their implementation from this class.
      */
     struct BOOST_LOG_NO_VTABLE BOOST_SYMBOL_VISIBLE impl :
-        public intrusive_ref_counter
+        public boost::intrusive_ref_counter< impl >
     {
         /*!
+         * \brief Virtual destructor
+         */
+        virtual ~impl() {}
+
+        /*!
          * \return The actual attribute value. It shall not return empty values (exceptions
          *         shall be used to indicate errors).
          */
@@ -132,7 +137,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: branches/release/boost/log/attributes/attribute_name.hpp
==============================================================================
--- branches/release/boost/log/attributes/attribute_name.hpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/boost/log/attributes/attribute_name.hpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -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: branches/release/boost/log/attributes/attribute_value.hpp
==============================================================================
--- branches/release/boost/log/attributes/attribute_value.hpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/boost/log/attributes/attribute_value.hpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -15,11 +15,10 @@
 #ifndef BOOST_LOG_ATTRIBUTE_VALUE_HPP_INCLUDED_
 #define BOOST_LOG_ATTRIBUTE_VALUE_HPP_INCLUDED_
 
-#include <boost/intrusive_ptr.hpp>
 #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/log/utility/intrusive_ref_counter.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>
@@ -155,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: branches/release/boost/log/attributes/current_thread_id.hpp
==============================================================================
--- branches/release/boost/log/attributes/current_thread_id.hpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/boost/log/attributes/current_thread_id.hpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -25,7 +25,7 @@
 #error Boost.Log: The current_thread_id attribute is only available in multithreaded builds
 #endif
 
-#include <boost/intrusive_ptr.hpp>
+#include <boost/smart_ptr/intrusive_ptr.hpp>
 #include <boost/log/detail/thread_id.hpp>
 #include <boost/log/attributes/attribute.hpp>
 #include <boost/log/attributes/attribute_cast.hpp>

Modified: branches/release/boost/log/attributes/mutable_constant.hpp
==============================================================================
--- branches/release/boost/log/attributes/mutable_constant.hpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/boost/log/attributes/mutable_constant.hpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -15,9 +15,8 @@
 #ifndef BOOST_LOG_ATTRIBUTES_MUTABLE_CONSTANT_HPP_INCLUDED_
 #define BOOST_LOG_ATTRIBUTES_MUTABLE_CONSTANT_HPP_INCLUDED_
 
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
 #include <boost/static_assert.hpp>
+#include <boost/smart_ptr/intrusive_ptr.hpp>
 #include <boost/mpl/if.hpp>
 #include <boost/move/core.hpp>
 #include <boost/move/utility.hpp>

Modified: branches/release/boost/log/attributes/value_visitation.hpp
==============================================================================
--- branches/release/boost/log/attributes/value_visitation.hpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/boost/log/attributes/value_visitation.hpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -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: branches/release/boost/log/core/core.hpp
==============================================================================
--- branches/release/boost/log/core/core.hpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/boost/log/core/core.hpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -16,7 +16,7 @@
 #define BOOST_LOG_CORE_CORE_HPP_INCLUDED_
 
 #include <utility>
-#include <boost/shared_ptr.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
 #include <boost/move/core.hpp>
 #include <boost/log/detail/config.hpp>
 #include <boost/log/detail/light_function.hpp>

Modified: branches/release/boost/log/core/record.hpp
==============================================================================
--- branches/release/boost/log/core/record.hpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/boost/log/core/record.hpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -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: branches/release/boost/log/core/record_view.hpp
==============================================================================
--- branches/release/boost/log/core/record_view.hpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/boost/log/core/record_view.hpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -15,10 +15,10 @@
 #ifndef BOOST_LOG_CORE_RECORD_VIEW_HPP_INCLUDED_
 #define BOOST_LOG_CORE_RECORD_VIEW_HPP_INCLUDED_
 
-#include <boost/intrusive_ptr.hpp>
+#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: branches/release/boost/log/detail/light_function.hpp
==============================================================================
--- branches/release/boost/log/detail/light_function.hpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/boost/log/detail/light_function.hpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -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: branches/release/boost/log/detail/light_function_pp.hpp
==============================================================================
--- branches/release/boost/log/detail/light_function_pp.hpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/boost/log/detail/light_function_pp.hpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -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: branches/release/boost/log/detail/locking_ptr.hpp
==============================================================================
--- branches/release/boost/log/detail/locking_ptr.hpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/boost/log/detail/locking_ptr.hpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -16,9 +16,9 @@
 #ifndef BOOST_LOG_DETAIL_LOCKING_PTR_HPP_INCLUDED_
 #define BOOST_LOG_DETAIL_LOCKING_PTR_HPP_INCLUDED_
 
-#include <boost/shared_ptr.hpp>
+#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
@@ -31,120 +31,120 @@
 
 namespace aux {
 
-    //! Shared lock object to support locking_ptr
-    struct BOOST_LOG_NO_VTABLE locking_ptr_counter_base
-    {
-        unsigned int m_RefCounter;
+//! Shared lock object to support locking_ptr
+struct BOOST_LOG_NO_VTABLE locking_ptr_counter_base
+{
+    unsigned int m_RefCounter;
 
-        locking_ptr_counter_base() : m_RefCounter(0)
-        {
-        }
+    locking_ptr_counter_base() : m_RefCounter(0)
+    {
+    }
 
-        virtual ~locking_ptr_counter_base() {}
-        virtual void lock() = 0;
-        virtual bool try_lock() = 0;
-        virtual void unlock() = 0;
-
-    private:
-        locking_ptr_counter_base(locking_ptr_counter_base const&);
-        locking_ptr_counter_base& operator= (locking_ptr_counter_base const&);
-    };
-
-    struct try_lock_tag {};
-    const try_lock_tag try_lock = {};
-
-    //! A pointer type that locks the backend until it's destroyed
-    template< typename T >
-    class locking_ptr
-    {
-    public:
-        //! Pointed type
-        typedef T element_type;
-
-    private:
-        //! The pointer to the backend
-        shared_ptr< element_type > m_pElement;
-        //! Reference to the shared lock control object
-        locking_ptr_counter_base* m_pLock;
-
-    public:
-        //! Constructor
-        locking_ptr(shared_ptr< element_type > const& p, locking_ptr_counter_base& l)
-            : m_pElement(p), m_pLock(&l)
+    virtual ~locking_ptr_counter_base() {}
+    virtual void lock() = 0;
+    virtual bool try_lock() = 0;
+    virtual void unlock() = 0;
+
+private:
+    locking_ptr_counter_base(locking_ptr_counter_base const&);
+    locking_ptr_counter_base& operator= (locking_ptr_counter_base const&);
+};
+
+struct try_lock_tag {};
+BOOST_CONSTEXPR_OR_CONST try_lock_tag try_lock = {};
+
+//! A pointer type that locks the backend until it's destroyed
+template< typename T >
+class locking_ptr
+{
+public:
+    //! Pointed type
+    typedef T element_type;
+
+private:
+    //! The pointer to the backend
+    shared_ptr< element_type > m_pElement;
+    //! Reference to the shared lock control object
+    locking_ptr_counter_base* m_pLock;
+
+public:
+    //! Constructor
+    locking_ptr(shared_ptr< element_type > const& p, locking_ptr_counter_base& l)
+        : m_pElement(p), m_pLock(&l)
+    {
+        if (m_pLock->m_RefCounter == 0)
+            m_pLock->lock();
+        ++m_pLock->m_RefCounter;
+    }
+    //! Constructor
+    locking_ptr(shared_ptr< element_type > const& p, locking_ptr_counter_base& l, try_lock_tag const&)
+        : m_pElement(p), m_pLock(&l)
+    {
+        if (m_pLock->m_RefCounter > 0 || m_pLock->try_lock())
         {
-            if (m_pLock->m_RefCounter == 0)
-                m_pLock->lock();
             ++m_pLock->m_RefCounter;
         }
-        //! Constructor
-        locking_ptr(shared_ptr< element_type > const& p, locking_ptr_counter_base& l, try_lock_tag const&)
-            : m_pElement(p), m_pLock(&l)
-        {
-            if (m_pLock->m_RefCounter > 0 || m_pLock->try_lock())
-            {
-                ++m_pLock->m_RefCounter;
-            }
-            else
-            {
-                m_pElement.reset();
-                m_pLock = NULL;
-            }
-        }
-        //! Copy constructor
-        locking_ptr(locking_ptr const& that) : m_pElement(that.m_pElement), m_pLock(that.m_pLock)
-        {
-            if (m_pLock)
-                ++m_pLock->m_RefCounter;
-        }
-        //! Destructor
-        ~locking_ptr()
-        {
-            if (m_pLock && --m_pLock->m_RefCounter == 0)
-                m_pLock->unlock();
-        }
-
-        //! Assignment
-        locking_ptr& operator= (locking_ptr that)
+        else
         {
-            this->swap(that);
-            return *this;
+            m_pElement.reset();
+            m_pLock = NULL;
         }
+    }
+    //! Copy constructor
+    locking_ptr(locking_ptr const& that) : m_pElement(that.m_pElement), m_pLock(that.m_pLock)
+    {
+        if (m_pLock)
+            ++m_pLock->m_RefCounter;
+    }
+    //! Destructor
+    ~locking_ptr()
+    {
+        if (m_pLock && --m_pLock->m_RefCounter == 0)
+            m_pLock->unlock();
+    }
 
-        //! Indirection
-        element_type* operator-> () const { return m_pElement.get(); }
-        //! Dereferencing
-        element_type& operator* () const { return *m_pElement; }
-
-        //! Accessor to the raw pointer
-        element_type* get() const { return m_pElement.get(); }
-
-        //! Checks for null pointer
-        BOOST_LOG_EXPLICIT_OPERATOR_BOOL()
-        //! Checks for null pointer
-        bool operator! () const { return !m_pElement; }
-
-        //! Swaps two pointers
-        void swap(locking_ptr& that)
-        {
-            m_pElement.swap(that.m_pElement);
-            register locking_ptr_counter_base* p = m_pLock;
-            m_pLock = that.m_pLock;
-            that.m_pLock = p;
-        }
-    };
-
-    //! Free raw pointer getter to assist generic programming
-    template< typename T >
-    inline T* get_pointer(locking_ptr< T > const& p)
+    //! Assignment
+    locking_ptr& operator= (locking_ptr that)
     {
-        return p.get();
+        this->swap(that);
+        return *this;
     }
-    //! Free swap operation
-    template< typename T >
-    inline void swap(locking_ptr< T >& left, locking_ptr< T >& right)
+
+    //! Indirection
+    element_type* operator-> () const { return m_pElement.get(); }
+    //! Dereferencing
+    element_type& operator* () const { return *m_pElement; }
+
+    //! Accessor to the raw pointer
+    element_type* get() const { return m_pElement.get(); }
+
+    //! Checks for null pointer
+    BOOST_EXPLICIT_OPERATOR_BOOL()
+    //! Checks for null pointer
+    bool operator! () const { return !m_pElement; }
+
+    //! Swaps two pointers
+    void swap(locking_ptr& that)
     {
-        left.swap(right);
+        m_pElement.swap(that.m_pElement);
+        register locking_ptr_counter_base* p = m_pLock;
+        m_pLock = that.m_pLock;
+        that.m_pLock = p;
     }
+};
+
+//! Free raw pointer getter to assist generic programming
+template< typename T >
+inline T* get_pointer(locking_ptr< T > const& p)
+{
+    return p.get();
+}
+//! Free swap operation
+template< typename T >
+inline void swap(locking_ptr< T >& left, locking_ptr< T >& right)
+{
+    left.swap(right);
+}
 
 } // namespace aux
 

Modified: branches/release/boost/log/sinks/async_frontend.hpp
==============================================================================
--- branches/release/boost/log/sinks/async_frontend.hpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/boost/log/sinks/async_frontend.hpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -15,9 +15,6 @@
 #ifndef BOOST_LOG_SINKS_ASYNC_FRONTEND_HPP_INCLUDED_
 #define BOOST_LOG_SINKS_ASYNC_FRONTEND_HPP_INCLUDED_
 
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
-#include <boost/static_assert.hpp>
 #include <boost/log/detail/config.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
@@ -29,6 +26,9 @@
 #endif
 
 #include <boost/bind.hpp>
+#include <boost/static_assert.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/smart_ptr/make_shared_object.hpp>
 #include <boost/thread/locks.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/thread.hpp>

Modified: branches/release/boost/log/sinks/sync_frontend.hpp
==============================================================================
--- branches/release/boost/log/sinks/sync_frontend.hpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/boost/log/sinks/sync_frontend.hpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -25,9 +25,9 @@
 #error Boost.Log: Synchronous sink frontend is only supported in multithreaded environment
 #endif
 
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
 #include <boost/static_assert.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/smart_ptr/make_shared_object.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/log/detail/locking_ptr.hpp>
 #include <boost/log/detail/parameter_tools.hpp>

Modified: branches/release/boost/log/sinks/syslog_backend.hpp
==============================================================================
--- branches/release/boost/log/sinks/syslog_backend.hpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/boost/log/sinks/syslog_backend.hpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -24,7 +24,6 @@
 #ifndef BOOST_LOG_WITHOUT_SYSLOG
 
 #include <string>
-#include <boost/shared_ptr.hpp>
 #include <boost/log/detail/asio_fwd.hpp>
 #include <boost/log/detail/light_function.hpp>
 #include <boost/log/detail/parameter_tools.hpp>

Modified: branches/release/boost/log/sinks/text_file_backend.hpp
==============================================================================
--- branches/release/boost/log/sinks/text_file_backend.hpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/boost/log/sinks/text_file_backend.hpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -20,7 +20,7 @@
 #include <ostream>
 #include <boost/limits.hpp>
 #include <boost/cstdint.hpp>
-#include <boost/shared_ptr.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
 #include <boost/date_time/date_defs.hpp>
 #include <boost/date_time/special_defs.hpp>
 #include <boost/date_time/gregorian/greg_day.hpp>

Modified: branches/release/boost/log/sinks/text_ostream_backend.hpp
==============================================================================
--- branches/release/boost/log/sinks/text_ostream_backend.hpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/boost/log/sinks/text_ostream_backend.hpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -16,7 +16,7 @@
 #define BOOST_LOG_SINKS_TEXT_OSTREAM_BACKEND_HPP_INCLUDED_
 
 #include <ostream>
-#include <boost/shared_ptr.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
 #include <boost/log/detail/config.hpp>
 #include <boost/log/sinks/basic_sink_backend.hpp>
 #include <boost/log/sinks/frontend_requirements.hpp>

Modified: branches/release/boost/log/sinks/unlocked_frontend.hpp
==============================================================================
--- branches/release/boost/log/sinks/unlocked_frontend.hpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/boost/log/sinks/unlocked_frontend.hpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -15,9 +15,9 @@
 #ifndef BOOST_LOG_SINKS_UNLOCKED_FRONTEND_HPP_INCLUDED_
 #define BOOST_LOG_SINKS_UNLOCKED_FRONTEND_HPP_INCLUDED_
 
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
 #include <boost/static_assert.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/smart_ptr/make_shared_object.hpp>
 #include <boost/log/detail/config.hpp>
 #include <boost/log/detail/parameter_tools.hpp>
 #include <boost/log/detail/fake_mutex.hpp>

Modified: branches/release/boost/log/sources/basic_logger.hpp
==============================================================================
--- branches/release/boost/log/sources/basic_logger.hpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/boost/log/sources/basic_logger.hpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -20,7 +20,6 @@
 #include <utility>
 #include <ostream>
 #include <boost/assert.hpp>
-#include <boost/shared_ptr.hpp>
 #include <boost/move/core.hpp>
 #include <boost/move/utility.hpp>
 #include <boost/utility/addressof.hpp>

Modified: branches/release/boost/log/sources/global_logger_storage.hpp
==============================================================================
--- branches/release/boost/log/sources/global_logger_storage.hpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/boost/log/sources/global_logger_storage.hpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -17,8 +17,8 @@
 
 #include <typeinfo>
 #include <stdexcept>
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/smart_ptr/make_shared_object.hpp>
 #include <boost/preprocessor/seq/enum.hpp>
 #include <boost/log/detail/config.hpp>
 #include <boost/log/detail/singleton.hpp>

Modified: branches/release/boost/log/sources/record_ostream.hpp
==============================================================================
--- branches/release/boost/log/sources/record_ostream.hpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/boost/log/sources/record_ostream.hpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -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: branches/release/boost/log/sources/severity_feature.hpp
==============================================================================
--- branches/release/boost/log/sources/severity_feature.hpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/boost/log/sources/severity_feature.hpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -16,8 +16,8 @@
 #define BOOST_LOG_SOURCES_SEVERITY_FEATURE_HPP_INCLUDED_
 
 #include <boost/cstdint.hpp>
-#include <boost/intrusive_ptr.hpp>
 #include <boost/static_assert.hpp>
+#include <boost/smart_ptr/intrusive_ptr.hpp>
 #include <boost/move/core.hpp>
 #include <boost/move/utility.hpp>
 #include <boost/log/detail/config.hpp>

Modified: branches/release/boost/log/utility/empty_deleter.hpp
==============================================================================
--- branches/release/boost/log/utility/empty_deleter.hpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/boost/log/utility/empty_deleter.hpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -9,36 +9,31 @@
  * \author Andrey Semashev
  * \date   22.04.2007
  *
- * This header contains an \c empty_deleter implementation. This is an empty
- * function object that receives a pointer and does nothing with it.
- * Such empty deletion strategy may be convenient, for example, when
- * constructing <tt>shared_ptr</tt>s that point to some object that should not be
- * deleted (i.e. a variable on the stack or some global singleton, like <tt>std::cout</tt>).
+ * This header is deprecated, use boost/utility/empty_deleter.hpp instead. The header is left for
+ * backward compatibility and will be removed in future versions.
  */
 
 #ifndef BOOST_LOG_UTILITY_EMPTY_DELETER_HPP_INCLUDED_
 #define BOOST_LOG_UTILITY_EMPTY_DELETER_HPP_INCLUDED_
 
+#include <boost/utility/empty_deleter.hpp>
 #include <boost/log/detail/config.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
 #pragma once
 #endif
 
+#if defined(__GNUC__)
+#pragma message "Boost.Log: This header is deprecated, use boost/utility/empty_deleter.hpp instead."
+#elif defined(_MSC_VER)
+#pragma message("Boost.Log: This header is deprecated, use boost/utility/empty_deleter.hpp instead.")
+#endif
+
 namespace boost {
 
 BOOST_LOG_OPEN_NAMESPACE
 
-//! A function object that does nothing and can be used as an empty deleter for \c shared_ptr
-struct empty_deleter
-{
-    //! Function object result type
-    typedef void result_type;
-    /*!
-     * Does nothing
-     */
-    void operator() (const volatile void*) const {}
-};
+using boost::empty_deleter
 
 BOOST_LOG_CLOSE_NAMESPACE // namespace log
 

Modified: branches/release/boost/log/utility/explicit_operator_bool.hpp
==============================================================================
--- branches/release/boost/log/utility/explicit_operator_bool.hpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/boost/log/utility/explicit_operator_bool.hpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -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: branches/release/boost/log/utility/formatting_ostream.hpp
==============================================================================
--- branches/release/boost/log/utility/formatting_ostream.hpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/boost/log/utility/formatting_ostream.hpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -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(); }
@@ -545,6 +545,24 @@
         m_stream.fill(static_cast< char_type >(' '));
     }
 
+    basic_formatting_ostream& formatted_write(const char_type* p, std::streamsize size)
+    {
+        sentry guard(*this);
+        if (guard)
+        {
+            m_stream.flush();
+
+            if (m_stream.width() <= size)
+                m_streambuf.storage()->append(p, static_cast< std::size_t >(size));
+            else
+                this->aligned_write(p, size);
+
+            m_stream.width(0);
+        }
+
+        return *this;
+    }
+
     template< typename OtherCharT >
     basic_formatting_ostream& formatted_write(const OtherCharT* p, std::streamsize size)
     {
@@ -552,26 +570,11 @@
         if (guard)
         {
             m_stream.flush();
-            string_type* const storage = m_streambuf.storage();
 
-            const std::streamsize w = m_stream.width();
-            if (w <= size)
-            {
-                aux::code_convert(p, static_cast< std::size_t >(size), *storage, m_stream.getloc());
-            }
+            if (m_stream.width() <= size)
+                aux::code_convert(p, static_cast< std::size_t >(size), *m_streambuf.storage(), m_stream.getloc());
             else
-            {
-                const bool align_left = (m_stream.flags() & ostream_type::adjustfield) == ostream_type::left;
-                typename string_type::size_type const alignment_size =
-                    static_cast< typename string_type::size_type >(w - size);
-                if (!align_left)
-                    storage->append(alignment_size, m_stream.fill());
-
-                aux::code_convert(p, static_cast< std::size_t >(size), *storage, m_stream.getloc());
-
-                if (align_left)
-                    storage->append(alignment_size, m_stream.fill());
-            }
+                this->aligned_write(p, size);
 
             m_stream.width(0);
         }
@@ -579,6 +582,11 @@
         return *this;
     }
 
+    void aligned_write(const char_type* p, std::streamsize size);
+
+    template< typename OtherCharT >
+    void aligned_write(const OtherCharT* p, std::streamsize size);
+
     //! Copy constructor (closed)
     BOOST_DELETED_FUNCTION(basic_formatting_ostream(basic_formatting_ostream const& that))
     //! Assignment (closed)
@@ -656,6 +664,44 @@
 template< typename CharT, typename TraitsT, typename AllocatorT >
 BOOST_CONSTEXPR_OR_CONST typename basic_formatting_ostream< CharT, TraitsT, AllocatorT >::event basic_formatting_ostream< CharT, TraitsT, AllocatorT >::copyfmt_event;
 
+template< typename CharT, typename TraitsT, typename AllocatorT >
+void basic_formatting_ostream< CharT, TraitsT, AllocatorT >::aligned_write(const char_type* p, std::streamsize size)
+{
+    string_type* const storage = m_streambuf.storage();
+    typename string_type::size_type const alignment_size =
+        static_cast< typename string_type::size_type >(m_stream.width() - size);
+    const bool align_left = (m_stream.flags() & ostream_type::adjustfield) == ostream_type::left;
+    if (align_left)
+    {
+        storage->append(p, static_cast< std::size_t >(size));
+        storage->append(alignment_size, m_stream.fill());
+    }
+    else
+    {
+        storage->append(alignment_size, m_stream.fill());
+        storage->append(p, static_cast< std::size_t >(size));
+    }
+}
+
+template< typename CharT, typename TraitsT, typename AllocatorT >
+template< typename OtherCharT >
+void basic_formatting_ostream< CharT, TraitsT, AllocatorT >::aligned_write(const OtherCharT* p, std::streamsize size)
+{
+    string_type* const storage = m_streambuf.storage();
+    typename string_type::size_type const alignment_size =
+        static_cast< typename string_type::size_type >(m_stream.width() - size);
+    const bool align_left = (m_stream.flags() & ostream_type::adjustfield) == ostream_type::left;
+    if (align_left)
+    {
+        aux::code_convert(p, static_cast< std::size_t >(size), *storage, m_stream.getloc());
+        storage->append(alignment_size, m_stream.fill());
+    }
+    else
+    {
+        storage->append(alignment_size, m_stream.fill());
+        aux::code_convert(p, static_cast< std::size_t >(size), *storage, m_stream.getloc());
+    }
+}
 
 template< typename CharT, typename TraitsT, typename AllocatorT, typename T >
 inline basic_formatting_ostream< CharT, TraitsT, AllocatorT >&

Modified: branches/release/boost/log/utility/functional/nop.hpp
==============================================================================
--- branches/release/boost/log/utility/functional/nop.hpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/boost/log/utility/functional/nop.hpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -31,18 +31,18 @@
 {
     typedef void result_type;
 
-    void operator() () const {}
+    void operator() () const BOOST_NOEXCEPT {}
 
 #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
     template< typename... ArgsT >
-    void operator() (ArgsT const&...) const {}
+    void operator() (ArgsT const&...) const BOOST_NOEXCEPT {}
 #else
     template< typename T >
-    void operator() (T const&) const {}
+    void operator() (T const&) const BOOST_NOEXCEPT {}
     template< typename T1, typename T2 >
-    void operator() (T1 const&, T2 const&) const {}
+    void operator() (T1 const&, T2 const&) const BOOST_NOEXCEPT {}
     template< typename T1, typename T2, typename T3 >
-    void operator() (T1 const&, T2 const&, T3 const&) const {}
+    void operator() (T1 const&, T2 const&, T3 const&) const BOOST_NOEXCEPT {}
 #endif
 };
 

Modified: branches/release/boost/log/utility/intrusive_ref_counter.hpp
==============================================================================
--- branches/release/boost/log/utility/intrusive_ref_counter.hpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/boost/log/utility/intrusive_ref_counter.hpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -9,109 +9,42 @@
  * \author Andrey Semashev
  * \date   12.03.2009
  *
- * This header contains a reference counter class for \c intrusive_ptr.
+ * This header is deprecated, use boost/smart_ptr/intrusive_ref_counter.hpp instead. The header is left for
+ * backward compatibility and will be removed in future versions.
  */
 
 #ifndef BOOST_LOG_UTILITY_INTRUSIVE_REF_COUNTER_HPP_INCLUDED_
 #define BOOST_LOG_UTILITY_INTRUSIVE_REF_COUNTER_HPP_INCLUDED_
 
-#include <boost/intrusive_ptr.hpp>
+#include <boost/smart_ptr/intrusive_ptr.hpp>
+#include <boost/smart_ptr/intrusive_ref_counter.hpp>
 #include <boost/log/detail/config.hpp>
-#ifndef BOOST_LOG_NO_THREADS
-#include <boost/detail/atomic_count.hpp>
-#endif // BOOST_LOG_NO_THREADS
 #include <boost/log/detail/header.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
 #pragma once
 #endif
 
+#if defined(__GNUC__)
+#pragma message "Boost.Log: This header is deprecated, use boost/smart_ptr/intrusive_ref_counter.hpp instead."
+#elif defined(_MSC_VER)
+#pragma message("Boost.Log: This header is deprecated, use boost/smart_ptr/intrusive_ref_counter.hpp instead.")
+#endif
+
 namespace boost {
 
 BOOST_LOG_OPEN_NAMESPACE
 
-class intrusive_ref_counter;
+namespace aux {
 
-#ifndef BOOST_LOG_DOXYGEN_PASS
-void intrusive_ptr_add_ref(const intrusive_ref_counter* p);
-void intrusive_ptr_release(const intrusive_ref_counter* p);
-#endif // BOOST_LOG_DOXYGEN_PASS
-
-/*!
- * \brief A reference counter base class
- *
- * This base class can be used with user-defined classes to add support
- * for \c intrusive_ptr. The class contains a thread-safe reference counter
- * and a virtual destructor, which makes the derived class polymorphic.
- * Upon releasing the last \c intrusive_ptr referencing the object
- * derived from the \c intrusive_ref_counter class, operator \c delete
- * is automatically called on the pointer to the object.
- */
-class intrusive_ref_counter
+struct legacy_intrusive_ref_counter_root
 {
-private:
-    //! Reference counter
-#ifndef BOOST_LOG_NO_THREADS
-    mutable boost::detail::atomic_count m_RefCounter;
-#else
-    mutable unsigned long m_RefCounter;
-#endif // BOOST_LOG_NO_THREADS
-
-public:
-    /*!
-     * Default constructor
-     *
-     * \post <tt>use_count() == 0</tt>
-     */
-    intrusive_ref_counter() : m_RefCounter(0)
-    {
-    }
-    /*!
-     * Copy constructor
-     *
-     * \post <tt>use_count() == 0</tt>
-     */
-    intrusive_ref_counter(intrusive_ref_counter const&) : m_RefCounter(0)
-    {
-    }
-
-    /*!
-     * Virtual destructor
-     */
-    virtual ~intrusive_ref_counter() {}
-
-    /*!
-     * Assignment
-     *
-     * \post The reference counter is not modified after assignment
-     */
-    intrusive_ref_counter& operator= (intrusive_ref_counter const&) { return *this; }
-
-    /*!
-     * \return The reference counter
-     */
-    unsigned long use_count() const
-    {
-        return static_cast< unsigned long >(static_cast< long >(m_RefCounter));
-    }
-
-#ifndef BOOST_LOG_DOXYGEN_PASS
-    friend void intrusive_ptr_add_ref(const intrusive_ref_counter* p);
-    friend void intrusive_ptr_release(const intrusive_ref_counter* p);
-#endif // BOOST_LOG_DOXYGEN_PASS
+    virtual ~legacy_intrusive_ref_counter_root() {}
 };
 
-#ifndef BOOST_LOG_DOXYGEN_PASS
-inline void intrusive_ptr_add_ref(const intrusive_ref_counter* p)
-{
-    ++p->m_RefCounter;
-}
-inline void intrusive_ptr_release(const intrusive_ref_counter* p)
-{
-    if (--p->m_RefCounter == 0)
-        delete p;
-}
-#endif // BOOST_LOG_DOXYGEN_PASS
+} // namespace aux
+
+typedef boost::intrusive_ref_counter< aux::legacy_intrusive_ref_counter_root > intrusive_ref_counter;
 
 BOOST_LOG_CLOSE_NAMESPACE // namespace log
 

Modified: branches/release/boost/log/utility/setup/console.hpp
==============================================================================
--- branches/release/boost/log/utility/setup/console.hpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/boost/log/utility/setup/console.hpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -16,8 +16,9 @@
 #define BOOST_LOG_UTILITY_SETUP_CONSOLE_HPP_INCLUDED_
 
 #include <iostream>
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/smart_ptr/make_shared_object.hpp>
+#include <boost/utility/empty_deleter.hpp>
 #include <boost/log/detail/config.hpp>
 #include <boost/log/detail/sink_init_helpers.hpp>
 #ifndef BOOST_LOG_NO_THREADS
@@ -26,7 +27,6 @@
 #include <boost/log/sinks/unlocked_frontend.hpp>
 #endif
 #include <boost/log/sinks/text_ostream_backend.hpp>
-#include <boost/log/utility/empty_deleter.hpp>
 #include <boost/log/keywords/format.hpp>
 #include <boost/log/keywords/filter.hpp>
 #include <boost/log/keywords/auto_flush.hpp>
@@ -59,7 +59,7 @@
     >
 > add_console_log(std::basic_ostream< CharT >& strm, ArgsT const& args)
 {
-    shared_ptr< std::basic_ostream< CharT > > pStream(&strm, empty_deleter());
+    shared_ptr< std::basic_ostream< CharT > > pStream(&strm, boost::empty_deleter());
 
     typedef sinks::basic_text_ostream_backend< CharT > backend_t;
     shared_ptr< backend_t > pBackend = boost::make_shared< backend_t >();

Modified: branches/release/boost/log/utility/setup/file.hpp
==============================================================================
--- branches/release/boost/log/utility/setup/file.hpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/boost/log/utility/setup/file.hpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -15,8 +15,8 @@
 #ifndef BOOST_LOG_UTILITY_SETUP_FILE_HPP_INCLUDED_
 #define BOOST_LOG_UTILITY_SETUP_FILE_HPP_INCLUDED_
 
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/smart_ptr/make_shared_object.hpp>
 #include <boost/parameter/parameters.hpp> // for is_named_argument
 #include <boost/preprocessor/comparison/greater.hpp>
 #include <boost/preprocessor/punctuation/comma_if.hpp>

Modified: branches/release/boost/log/utility/setup/filter_parser.hpp
==============================================================================
--- branches/release/boost/log/utility/setup/filter_parser.hpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/boost/log/utility/setup/filter_parser.hpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -16,9 +16,9 @@
 #define BOOST_LOG_UTILITY_SETUP_FILTER_PARSER_HPP_INCLUDED_
 
 #include <string>
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
 #include <boost/lexical_cast.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/smart_ptr/make_shared_object.hpp>
 #include <boost/phoenix/operator/comparison.hpp>
 #include <boost/type_traits/is_base_and_derived.hpp>
 #include <boost/utility/enable_if.hpp>

Modified: branches/release/boost/log/utility/setup/formatter_parser.hpp
==============================================================================
--- branches/release/boost/log/utility/setup/formatter_parser.hpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/boost/log/utility/setup/formatter_parser.hpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -19,8 +19,8 @@
 #include <iosfwd>
 #include <map>
 #include <string>
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/smart_ptr/make_shared_object.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_base_and_derived.hpp>
 #include <boost/log/detail/setup_config.hpp>

Modified: branches/release/boost/log/utility/setup/from_settings.hpp
==============================================================================
--- branches/release/boost/log/utility/setup/from_settings.hpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/boost/log/utility/setup/from_settings.hpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -17,7 +17,7 @@
 #define BOOST_LOG_UTILITY_SETUP_FROM_SETTINGS_HPP_INCLUDED_
 
 #include <string>
-#include <boost/shared_ptr.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_base_and_derived.hpp>
 #include <boost/log/detail/setup_config.hpp>

Modified: branches/release/boost/log/utility/setup/settings.hpp
==============================================================================
--- branches/release/boost/log/utility/setup/settings.hpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/boost/log/utility/setup/settings.hpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -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: branches/release/boost/log/utility/string_literal.hpp
==============================================================================
--- branches/release/boost/log/utility/string_literal.hpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/boost/log/utility/string_literal.hpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -92,7 +92,7 @@
      *
      * \post <tt>empty() == true</tt>
      */
-    basic_string_literal() { clear(); }
+    basic_string_literal() BOOST_NOEXCEPT { clear(); }
 
     /*!
      * Constructor from a string literal
@@ -105,7 +105,7 @@
         //! \cond
         , typename enable_if< is_same< T, const value_type >, int >::type = 0
         //! \endcond
-        )
+        ) BOOST_NOEXCEPT
         : m_pStart(p), m_Len(LenV - 1)
     {
     }
@@ -116,7 +116,7 @@
      * \post <tt>*this == that</tt>
      * \param that Source literal to copy string from
      */
-    basic_string_literal(basic_string_literal const& that) : m_pStart(that.m_pStart), m_Len(that.m_Len) {}
+    basic_string_literal(basic_string_literal const& that) BOOST_NOEXCEPT : m_pStart(that.m_pStart), m_Len(that.m_Len) {}
 
     /*!
      * Assignment operator
@@ -124,7 +124,7 @@
      * \post <tt>*this == that</tt>
      * \param that Source literal to copy string from
      */
-    this_type& operator= (this_type const& that)
+    this_type& operator= (this_type const& that) BOOST_NOEXCEPT
     {
         return assign(that);
     }
@@ -143,7 +143,7 @@
 #else
     this_type&
 #endif // BOOST_LOG_DOXYGEN_PASS
-    operator= (T(&p)[LenV])
+    operator= (T(&p)[LenV]) BOOST_NOEXCEPT
     {
         return assign(p);
     }
@@ -154,7 +154,7 @@
      * \param that Comparand
      * \return \c true if the comparand string equals to this string, \c false otherwise
      */
-    bool operator== (this_type const& that) const
+    bool operator== (this_type const& that) const BOOST_NOEXCEPT
     {
         return (compare_internal(m_pStart, m_Len, that.m_pStart, that.m_Len) == 0);
     }
@@ -164,7 +164,7 @@
      * \param str Comparand. Must point to a zero-terminated sequence of characters, must not be NULL.
      * \return \c true if the comparand string equals to this string, \c false otherwise
      */
-    bool operator== (const_pointer str) const
+    bool operator== (const_pointer str) const BOOST_NOEXCEPT
     {
         return (compare_internal(m_pStart, m_Len, str, traits_type::length(str)) == 0);
     }
@@ -185,7 +185,7 @@
      * \param that Comparand
      * \return \c true if this string is less than the comparand, \c false otherwise
      */
-    bool operator< (this_type const& that) const
+    bool operator< (this_type const& that) const BOOST_NOEXCEPT
     {
         return (compare_internal(m_pStart, m_Len, that.m_pStart, that.m_Len) < 0);
     }
@@ -195,7 +195,7 @@
      * \param str Comparand. Must point to a zero-terminated sequence of characters, must not be NULL.
      * \return \c true if this string is less than the comparand, \c false otherwise
      */
-    bool operator< (const_pointer str) const
+    bool operator< (const_pointer str) const BOOST_NOEXCEPT
     {
         return (compare_internal(m_pStart, m_Len, str, traits_type::length(str)) < 0);
     }
@@ -216,7 +216,7 @@
      * \param that Comparand
      * \return \c true if this string is greater than the comparand, \c false otherwise
      */
-    bool operator> (this_type const& that) const
+    bool operator> (this_type const& that) const BOOST_NOEXCEPT
     {
         return (compare_internal(m_pStart, m_Len, that.m_pStart, that.m_Len) > 0);
     }
@@ -226,7 +226,7 @@
      * \param str Comparand. Must point to a zero-terminated sequence of characters, must not be NULL.
      * \return \c true if this string is greater than the comparand, \c false otherwise
      */
-    bool operator> (const_pointer str) const
+    bool operator> (const_pointer str) const BOOST_NOEXCEPT
     {
         return (compare_internal(m_pStart, m_Len, str, traits_type::length(str)) > 0);
     }
@@ -248,7 +248,7 @@
      * \param i Requested character index
      * \return Constant reference to the requested character
      */
-    const_reference operator[] (size_type i) const
+    const_reference operator[] (size_type i) const BOOST_NOEXCEPT
     {
         return m_pStart[i];
     }
@@ -270,24 +270,24 @@
     /*!
      * \return Pointer to the beginning of the literal
      */
-    const_pointer c_str() const { return m_pStart; }
+    const_pointer c_str() const BOOST_NOEXCEPT { return m_pStart; }
     /*!
      * \return Pointer to the beginning of the literal
      */
-    const_pointer data() const { return m_pStart; }
+    const_pointer data() const BOOST_NOEXCEPT { return m_pStart; }
     /*!
      * \return Length of the literal
      */
-    size_type size() const { return m_Len; }
+    size_type size() const BOOST_NOEXCEPT { return m_Len; }
     /*!
      * \return Length of the literal
      */
-    size_type length() const { return m_Len; }
+    size_type length() const BOOST_NOEXCEPT { return m_Len; }
 
     /*!
      * \return \c true if the literal is an empty string, \c false otherwise
      */
-    bool empty() const
+    bool empty() const BOOST_NOEXCEPT
     {
         return (m_Len == 0);
     }
@@ -295,19 +295,19 @@
     /*!
      * \return Iterator that points to the first character of the literal
      */
-    const_iterator begin() const { return m_pStart; }
+    const_iterator begin() const BOOST_NOEXCEPT { return m_pStart; }
     /*!
      * \return Iterator that points after the last character of the literal
      */
-    const_iterator end() const { return m_pStart + m_Len; }
+    const_iterator end() const BOOST_NOEXCEPT { return m_pStart + m_Len; }
     /*!
      * \return Reverse iterator that points to the last character of the literal
      */
-    const_reverse_iterator rbegin() const { return const_reverse_iterator(end()); }
+    const_reverse_iterator rbegin() const BOOST_NOEXCEPT { return const_reverse_iterator(end()); }
     /*!
      * \return Reverse iterator that points before the first character of the literal
      */
-    const_reverse_iterator rend() const { return const_reverse_iterator(begin()); }
+    const_reverse_iterator rend() const BOOST_NOEXCEPT { return const_reverse_iterator(begin()); }
 
     /*!
      * \return STL string constructed from the literal
@@ -322,7 +322,7 @@
      *
      * \post <tt>empty() == true</tt>
      */
-    void clear()
+    void clear() BOOST_NOEXCEPT
     {
         m_pStart = g_EmptyString;
         m_Len = 0;
@@ -330,7 +330,7 @@
     /*!
      * The method swaps two literals
      */
-    void swap(this_type& that)
+    void swap(this_type& that) BOOST_NOEXCEPT
     {
         register const_pointer p = m_pStart;
         m_pStart = that.m_pStart;
@@ -347,7 +347,7 @@
      * \post <tt>*this == that</tt>
      * \param that Source literal to copy string from
      */
-    this_type& assign(this_type const& that)
+    this_type& assign(this_type const& that) BOOST_NOEXCEPT
     {
         m_pStart = that.m_pStart;
         m_Len = that.m_Len;
@@ -368,7 +368,7 @@
 #else
     this_type&
 #endif // BOOST_LOG_DOXYGEN_PASS
-    assign(T(&p)[LenV])
+    assign(T(&p)[LenV]) BOOST_NOEXCEPT
     {
         m_pStart = p;
         m_Len = LenV - 1;
@@ -436,7 +436,7 @@
      *
      * \b Throws: An <tt>std::exception</tt>-based exception if \a pos is out of range.
      */
-    int compare(size_type pos, size_type n, const_pointer str) const
+    int compare(size_type pos, size_type n, const_pointer str) const BOOST_NOEXCEPT
     {
         return compare(pos, n, str, traits_type::length(str));
     }
@@ -452,7 +452,7 @@
      *
      * \b Throws: An <tt>std::exception</tt>-based exception if \a pos is out of range.
      */
-    int compare(size_type pos, size_type n, this_type const& that) const
+    int compare(size_type pos, size_type n, this_type const& that) const BOOST_NOEXCEPT
     {
         return compare(pos, n, that.c_str(), that.size());
     }
@@ -464,7 +464,7 @@
      * \return Zero if the comparand equals this string, a negative value if this string is less than the comparand,
      *         a positive value if this string is greater than the comparand.
      */
-    int compare(const_pointer str, size_type len) const
+    int compare(const_pointer str, size_type len) const BOOST_NOEXCEPT
     {
         return compare(0, m_Len, str, len);
     }
@@ -475,7 +475,7 @@
      * \return Zero if the comparand equals this string, a negative value if this string is less than the comparand,
      *         a positive value if this string is greater than the comparand.
      */
-    int compare(const_pointer str) const
+    int compare(const_pointer str) const BOOST_NOEXCEPT
     {
         return compare(0, m_Len, str, traits_type::length(str));
     }
@@ -486,7 +486,7 @@
      * \return Zero if the comparand equals this string, a negative value if this string is less than the comparand,
      *         a positive value if this string is greater than the comparand.
      */
-    int compare(this_type const& that) const
+    int compare(this_type const& that) const BOOST_NOEXCEPT
     {
         return compare(0, m_Len, that.c_str(), that.size());
     }
@@ -494,7 +494,7 @@
 private:
 #ifndef BOOST_LOG_DOXYGEN_PASS
     //! Internal comparison implementation
-    static int compare_internal(const_pointer pLeft, size_type LeftLen, const_pointer pRight, size_type RightLen)
+    static int compare_internal(const_pointer pLeft, size_type LeftLen, const_pointer pRight, size_type RightLen) BOOST_NOEXCEPT
     {
         if (pLeft != pRight)
         {
@@ -503,7 +503,7 @@
             if (result != 0)
                 return result;
         }
-        return static_cast< int >(LeftLen - RightLen);
+        return LeftLen < RightLen ? -1 : (LeftLen > RightLen ? 1 : 0);
     }
 #endif // BOOST_LOG_DOXYGEN_PASS
 };
@@ -512,20 +512,64 @@
 typename basic_string_literal< CharT, TraitsT >::value_type const
 basic_string_literal< CharT, TraitsT >::g_EmptyString[1] = { 0 };
 
+namespace aux {
+
+template< typename CharT, typename TraitsT >
+inline void insert_fill_chars(std::basic_ostream< CharT, TraitsT >& strm, std::size_t n)
+{
+    enum { chunk_size = 8 };
+    CharT fill_chars[chunk_size];
+    const CharT filler = strm.fill();
+    for (unsigned int i = 0; i < chunk_size; ++i)
+        fill_chars[i] = filler;
+    for (; n >= chunk_size && strm.good(); n -= chunk_size)
+        strm.write(fill_chars, static_cast< std::size_t >(chunk_size));
+    if (n > 0 && strm.good())
+        strm.write(fill_chars, n);
+}
+
+template< typename CharT, typename TraitsT >
+void insert_aligned(std::basic_ostream< CharT, TraitsT >& strm, const CharT* p, std::size_t size)
+{
+    const std::size_t alignment_size = static_cast< std::size_t >(strm.width()) - size;
+    const bool align_left = (strm.flags() & std::basic_ostream< CharT, TraitsT >::adjustfield) == std::basic_ostream< CharT, TraitsT >::left;
+    if (align_left)
+    {
+        strm.write(p, size);
+        if (strm.good())
+            aux::insert_fill_chars(strm, alignment_size);
+    }
+    else
+    {
+        aux::insert_fill_chars(strm, alignment_size);
+        if (strm.good())
+            strm.write(p, size);
+    }
+}
+
+} // namespace aux
+
 //! Output operator
 template< typename CharT, typename StrmTraitsT, typename LitTraitsT >
 inline std::basic_ostream< CharT, StrmTraitsT >& operator<< (
     std::basic_ostream< CharT, StrmTraitsT >& strm, basic_string_literal< CharT, LitTraitsT > const& lit)
 {
-    strm.write(lit.c_str(), static_cast< std::streamsize >(lit.size()));
+    if (strm.good())
+    {
+        const std::size_t size = lit.size();
+        const std::size_t w = static_cast< std::size_t >(strm.width());
+        if (w <= size)
+            strm.write(lit.c_str(), static_cast< std::streamsize >(size));
+        else
+            aux::insert_aligned(strm, lit.c_str(), lit.size());
+        strm.width(0);
+    }
     return strm;
 }
 
 //! External swap
 template< typename CharT, typename TraitsT >
-inline void swap(
-    basic_string_literal< CharT, TraitsT >& left,
-    basic_string_literal< CharT, TraitsT >& right)
+inline void swap(basic_string_literal< CharT, TraitsT >& left, basic_string_literal< CharT, TraitsT >& right) BOOST_NOEXCEPT
 {
     left.swap(right);
 }

Modified: branches/release/boost/log/utility/type_dispatch/dynamic_type_dispatcher.hpp
==============================================================================
--- branches/release/boost/log/utility/type_dispatch/dynamic_type_dispatcher.hpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/boost/log/utility/type_dispatch/dynamic_type_dispatcher.hpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -19,8 +19,8 @@
 #include <memory>
 #include <map>
 #include <boost/ref.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/smart_ptr/make_shared_object.hpp>
 #include <boost/log/detail/config.hpp>
 #include <boost/log/detail/visible_type.hpp>
 #include <boost/log/utility/type_info_wrapper.hpp>

Modified: branches/release/boost/log/utility/type_dispatch/type_dispatcher.hpp
==============================================================================
--- branches/release/boost/log/utility/type_dispatch/type_dispatcher.hpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/boost/log/utility/type_dispatch/type_dispatcher.hpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -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: branches/release/boost/log/utility/type_info_wrapper.hpp
==============================================================================
--- branches/release/boost/log/utility/type_info_wrapper.hpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/boost/log/utility/type_info_wrapper.hpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -17,8 +17,8 @@
 
 #include <typeinfo>
 #include <string>
+#include <boost/utility/explicit_operator_bool.hpp>
 #include <boost/log/detail/config.hpp>
-#include <boost/log/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: branches/release/boost/log/utility/value_ref.hpp
==============================================================================
--- branches/release/boost/log/utility/value_ref.hpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/boost/log/utility/value_ref.hpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -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: branches/release/libs/log/doc/Jamfile.v2
==============================================================================
--- branches/release/libs/log/doc/Jamfile.v2	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/doc/Jamfile.v2	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -69,6 +69,7 @@
                         BOOST_LOG_CLOSE_NAMESPACE=\"}\" \\
                         BOOST_DEFAULTED_FUNCTION(x,y)=\"x = default;\" \\
                         BOOST_DELETED_FUNCTION(x)=\"x = delete;\" \\
+                        BOOST_EXPLICIT_OPERATOR_BOOL()=\"explicit operator bool() const;\" \\
                         BOOST_LOG_USE_CHAR \\
                         BOOST_LOG_USE_WCHAR_T \\
                         BOOST_LOG_API= \\

Modified: branches/release/libs/log/doc/changelog.qbk
==============================================================================
--- branches/release/libs/log/doc/changelog.qbk	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/doc/changelog.qbk	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -14,7 +14,10 @@
 [*General changes:]
 
 * 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.
+* 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 reworked and 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`.
+* The header `boost/log/utility/empty_deleter.hpp` is deprecated and will be removed in future releases. Its contents have been moved to __boost_utility__, as `boost/utility/empty_deleter.hpp`.
 
 [*Bug fixes:]
 

Modified: branches/release/libs/log/doc/log.qbk
==============================================================================
--- branches/release/libs/log/doc/log.qbk	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/doc/log.qbk	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -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>''']

Modified: branches/release/libs/log/example/advanced_usage/Jamfile.v2
==============================================================================
--- branches/release/libs/log/example/advanced_usage/Jamfile.v2	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/advanced_usage/Jamfile.v2	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -12,12 +12,15 @@
         <toolset>msvc:<define>_SCL_SECURE_NO_DEPRECATE
         <toolset>msvc:<define>_CRT_SECURE_NO_WARNINGS
         <toolset>msvc:<define>_CRT_SECURE_NO_DEPRECATE
+        <toolset>msvc:<cxxflags>/bigobj
+        <toolset>msvc:<cxxflags>/wd4503 # decorated name length exceeded, name was truncated
         <toolset>intel-win:<define>_SCL_SECURE_NO_WARNINGS
         <toolset>intel-win:<define>_SCL_SECURE_NO_DEPRECATE
         <toolset>intel-win:<define>_CRT_SECURE_NO_WARNINGS
         <toolset>intel-win:<define>_CRT_SECURE_NO_DEPRECATE
-        <toolset>gcc:<cxxflags>-fno-strict-aliasing  # avoids strict aliasing violations in other Boost components
+        <toolset>darwin:<cxxflags>-ftemplate-depth-1024
         <toolset>gcc:<cxxflags>-ftemplate-depth-1024
+        <toolset>gcc:<cxxflags>-fno-strict-aliasing  # avoids strict aliasing violations in other Boost components
         <library>/boost/log//boost_log
         <library>/boost/date_time//boost_date_time
         <library>/boost/filesystem//boost_filesystem

Modified: branches/release/libs/log/example/advanced_usage/main.cpp
==============================================================================
--- branches/release/libs/log/example/advanced_usage/main.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/advanced_usage/main.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -21,14 +21,14 @@
 #include <cassert>
 #include <iostream>
 #include <fstream>
-#include <boost/shared_ptr.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/utility/empty_deleter.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/log/common.hpp>
 #include <boost/log/expressions.hpp>
 #include <boost/log/attributes.hpp>
 #include <boost/log/sinks.hpp>
 #include <boost/log/sources/logger.hpp>
-#include <boost/log/utility/empty_deleter.hpp>
 #include <boost/log/utility/manipulators/add_value.hpp>
 #include <boost/log/attributes/scoped_attribute.hpp>
 #include <boost/log/support/date_time.hpp>
@@ -113,7 +113,7 @@
         // interference of other threads that might be trying to log.
 
         // Next we add streams to which logging records should be output
-        shared_ptr< std::ostream > pStream(&std::clog, logging::empty_deleter());
+        shared_ptr< std::ostream > pStream(&std::clog, boost::empty_deleter());
         pBackend->add_stream(pStream);
 
         // We can add more than one stream to the sink backend

Modified: branches/release/libs/log/example/async_log/Jamfile.v2
==============================================================================
--- branches/release/libs/log/example/async_log/Jamfile.v2	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/async_log/Jamfile.v2	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -12,12 +12,15 @@
         <toolset>msvc:<define>_SCL_SECURE_NO_DEPRECATE
         <toolset>msvc:<define>_CRT_SECURE_NO_WARNINGS
         <toolset>msvc:<define>_CRT_SECURE_NO_DEPRECATE
+        <toolset>msvc:<cxxflags>/bigobj
+        <toolset>msvc:<cxxflags>/wd4503 # decorated name length exceeded, name was truncated
         <toolset>intel-win:<define>_SCL_SECURE_NO_WARNINGS
         <toolset>intel-win:<define>_SCL_SECURE_NO_DEPRECATE
         <toolset>intel-win:<define>_CRT_SECURE_NO_WARNINGS
         <toolset>intel-win:<define>_CRT_SECURE_NO_DEPRECATE
-        <toolset>gcc:<cxxflags>-fno-strict-aliasing  # avoids strict aliasing violations in other Boost components
+        <toolset>darwin:<cxxflags>-ftemplate-depth-1024
         <toolset>gcc:<cxxflags>-ftemplate-depth-1024
+        <toolset>gcc:<cxxflags>-fno-strict-aliasing  # avoids strict aliasing violations in other Boost components
         <library>/boost/log//boost_log
         <library>/boost/date_time//boost_date_time
         <library>/boost/filesystem//boost_filesystem

Modified: branches/release/libs/log/example/async_log/main.cpp
==============================================================================
--- branches/release/libs/log/example/async_log/main.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/async_log/main.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -21,7 +21,7 @@
 #include <functional>
 #include <boost/ref.hpp>
 #include <boost/bind.hpp>
-#include <boost/shared_ptr.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/thread/thread.hpp>
 #include <boost/thread/barrier.hpp>
@@ -31,7 +31,6 @@
 #include <boost/log/attributes.hpp>
 #include <boost/log/sinks.hpp>
 #include <boost/log/sources/logger.hpp>
-#include <boost/log/utility/empty_deleter.hpp>
 #include <boost/log/utility/record_ordering.hpp>
 
 namespace logging = boost::log;

Modified: branches/release/libs/log/example/basic_usage/Jamfile.v2
==============================================================================
--- branches/release/libs/log/example/basic_usage/Jamfile.v2	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/basic_usage/Jamfile.v2	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -12,12 +12,15 @@
         <toolset>msvc:<define>_SCL_SECURE_NO_DEPRECATE
         <toolset>msvc:<define>_CRT_SECURE_NO_WARNINGS
         <toolset>msvc:<define>_CRT_SECURE_NO_DEPRECATE
+        <toolset>msvc:<cxxflags>/bigobj
+        <toolset>msvc:<cxxflags>/wd4503 # decorated name length exceeded, name was truncated
         <toolset>intel-win:<define>_SCL_SECURE_NO_WARNINGS
         <toolset>intel-win:<define>_SCL_SECURE_NO_DEPRECATE
         <toolset>intel-win:<define>_CRT_SECURE_NO_WARNINGS
         <toolset>intel-win:<define>_CRT_SECURE_NO_DEPRECATE
-        <toolset>gcc:<cxxflags>-fno-strict-aliasing  # avoids strict aliasing violations in other Boost components
+        <toolset>darwin:<cxxflags>-ftemplate-depth-1024
         <toolset>gcc:<cxxflags>-ftemplate-depth-1024
+        <toolset>gcc:<cxxflags>-fno-strict-aliasing  # avoids strict aliasing violations in other Boost components
         <library>/boost/log//boost_log
         <library>/boost/log//boost_log_setup
         <library>/boost/date_time//boost_date_time

Modified: branches/release/libs/log/example/bounded_async_log/Jamfile.v2
==============================================================================
--- branches/release/libs/log/example/bounded_async_log/Jamfile.v2	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/bounded_async_log/Jamfile.v2	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -12,12 +12,15 @@
         <toolset>msvc:<define>_SCL_SECURE_NO_DEPRECATE
         <toolset>msvc:<define>_CRT_SECURE_NO_WARNINGS
         <toolset>msvc:<define>_CRT_SECURE_NO_DEPRECATE
+        <toolset>msvc:<cxxflags>/bigobj
+        <toolset>msvc:<cxxflags>/wd4503 # decorated name length exceeded, name was truncated
         <toolset>intel-win:<define>_SCL_SECURE_NO_WARNINGS
         <toolset>intel-win:<define>_SCL_SECURE_NO_DEPRECATE
         <toolset>intel-win:<define>_CRT_SECURE_NO_WARNINGS
         <toolset>intel-win:<define>_CRT_SECURE_NO_DEPRECATE
-        <toolset>gcc:<cxxflags>-fno-strict-aliasing  # avoids strict aliasing violations in other Boost components
+        <toolset>darwin:<cxxflags>-ftemplate-depth-1024
         <toolset>gcc:<cxxflags>-ftemplate-depth-1024
+        <toolset>gcc:<cxxflags>-fno-strict-aliasing  # avoids strict aliasing violations in other Boost components
         <library>/boost/log//boost_log
         <library>/boost/date_time//boost_date_time
         <library>/boost/filesystem//boost_filesystem

Modified: branches/release/libs/log/example/bounded_async_log/main.cpp
==============================================================================
--- branches/release/libs/log/example/bounded_async_log/main.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/bounded_async_log/main.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -21,7 +21,7 @@
 #include <functional>
 #include <boost/ref.hpp>
 #include <boost/bind.hpp>
-#include <boost/shared_ptr.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/thread/thread.hpp>
 #include <boost/thread/barrier.hpp>
@@ -31,7 +31,6 @@
 #include <boost/log/attributes.hpp>
 #include <boost/log/sinks.hpp>
 #include <boost/log/sources/logger.hpp>
-#include <boost/log/utility/empty_deleter.hpp>
 #include <boost/log/utility/record_ordering.hpp>
 
 namespace logging = boost::log;

Modified: branches/release/libs/log/example/doc/Jamfile.v2
==============================================================================
--- branches/release/libs/log/example/doc/Jamfile.v2	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/doc/Jamfile.v2	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -15,12 +15,15 @@
         <toolset>msvc:<define>_SCL_SECURE_NO_DEPRECATE
         <toolset>msvc:<define>_CRT_SECURE_NO_WARNINGS
         <toolset>msvc:<define>_CRT_SECURE_NO_DEPRECATE
+        <toolset>msvc:<cxxflags>/bigobj
+        <toolset>msvc:<cxxflags>/wd4503 # decorated name length exceeded, name was truncated
         <toolset>intel-win:<define>_SCL_SECURE_NO_WARNINGS
         <toolset>intel-win:<define>_SCL_SECURE_NO_DEPRECATE
         <toolset>intel-win:<define>_CRT_SECURE_NO_WARNINGS
         <toolset>intel-win:<define>_CRT_SECURE_NO_DEPRECATE
-        <toolset>gcc:<cxxflags>-fno-strict-aliasing  # avoids strict aliasing violations in other Boost components
+        <toolset>darwin:<cxxflags>-ftemplate-depth-1024
         <toolset>gcc:<cxxflags>-ftemplate-depth-1024
+        <toolset>gcc:<cxxflags>-fno-strict-aliasing  # avoids strict aliasing violations in other Boost components
         <library>/boost/log//boost_log
         <library>/boost/log//boost_log_setup
         <library>/boost/date_time//boost_date_time

Modified: branches/release/libs/log/example/doc/core_core_manual.cpp
==============================================================================
--- branches/release/libs/log/example/doc/core_core_manual.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/doc/core_core_manual.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -5,7 +5,7 @@
  *          http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/shared_ptr.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
 #include <boost/move/utility.hpp>
 #include <boost/log/core.hpp>
 #include <boost/log/sources/record_ostream.hpp>

Modified: branches/release/libs/log/example/doc/exception_handling.cpp
==============================================================================
--- branches/release/libs/log/example/doc/exception_handling.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/doc/exception_handling.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -10,8 +10,8 @@
 #include <fstream>
 #include <iostream>
 #include <stdexcept>
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/smart_ptr/make_shared_object.hpp>
 #include <boost/thread/shared_mutex.hpp>
 #include <boost/log/core.hpp>
 #include <boost/log/expressions.hpp>

Modified: branches/release/libs/log/example/doc/expressions_has_attr_stat_accum.cpp
==============================================================================
--- branches/release/libs/log/example/doc/expressions_has_attr_stat_accum.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/doc/expressions_has_attr_stat_accum.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -10,8 +10,8 @@
 #include <map>
 #include <iostream>
 #include <fstream>
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/smart_ptr/make_shared_object.hpp>
 #include <boost/log/sinks.hpp>
 #include <boost/log/expressions.hpp>
 #include <boost/log/attributes/scoped_attribute.hpp>

Modified: branches/release/libs/log/example/doc/extension_app_launcher.cpp
==============================================================================
--- branches/release/libs/log/example/doc/extension_app_launcher.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/doc/extension_app_launcher.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -9,7 +9,7 @@
 #include <string>
 #include <utility>
 #include <stdexcept>
-#include <boost/shared_ptr.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
 #include <boost/phoenix.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/log/core.hpp>

Modified: branches/release/libs/log/example/doc/extension_filter_parser.cpp
==============================================================================
--- branches/release/libs/log/example/doc/extension_filter_parser.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/doc/extension_filter_parser.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -8,8 +8,8 @@
 #include <string>
 #include <iostream>
 #include <stdexcept>
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/smart_ptr/make_shared_object.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/phoenix.hpp>
 #include <boost/log/core.hpp>

Modified: branches/release/libs/log/example/doc/extension_filter_parser_custom_rel.cpp
==============================================================================
--- branches/release/libs/log/example/doc/extension_filter_parser_custom_rel.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/doc/extension_filter_parser_custom_rel.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -8,8 +8,8 @@
 #include <string>
 #include <iostream>
 #include <stdexcept>
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/smart_ptr/make_shared_object.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/phoenix.hpp>
 #include <boost/log/core.hpp>

Modified: branches/release/libs/log/example/doc/extension_formatter_parser.cpp
==============================================================================
--- branches/release/libs/log/example/doc/extension_formatter_parser.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/doc/extension_formatter_parser.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -8,8 +8,8 @@
 #include <string>
 #include <iostream>
 #include <stdexcept>
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/smart_ptr/make_shared_object.hpp>
 #include <boost/format.hpp>
 #include <boost/phoenix.hpp>
 #include <boost/log/core.hpp>

Modified: branches/release/libs/log/example/doc/extension_record_tagger.cpp
==============================================================================
--- branches/release/libs/log/example/doc/extension_record_tagger.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/doc/extension_record_tagger.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -8,8 +8,8 @@
 #include <string>
 #include <ostream>
 #include <fstream>
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/smart_ptr/make_shared_object.hpp>
 #include <boost/scope_exit.hpp>
 #include <boost/mpl/quote.hpp>
 #include <boost/parameter/keyword.hpp>

Modified: branches/release/libs/log/example/doc/extension_stat_collector.cpp
==============================================================================
--- branches/release/libs/log/example/doc/extension_stat_collector.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/doc/extension_stat_collector.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -9,7 +9,7 @@
 #include <fstream>
 #include <iostream>
 #include <stdexcept>
-#include <boost/shared_ptr.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
 #include <boost/date_time/posix_time/posix_time_types.hpp>
 #include <boost/phoenix.hpp>
 #include <boost/log/core.hpp>

Modified: branches/release/libs/log/example/doc/extension_stat_collector_settings.cpp
==============================================================================
--- branches/release/libs/log/example/doc/extension_stat_collector_settings.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/doc/extension_stat_collector_settings.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -10,8 +10,8 @@
 #include <sstream>
 #include <iostream>
 #include <stdexcept>
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/smart_ptr/make_shared_object.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/optional/optional.hpp>
 #include <boost/date_time/posix_time/posix_time_types.hpp>

Modified: branches/release/libs/log/example/doc/extension_system_uptime_attr.cpp
==============================================================================
--- branches/release/libs/log/example/doc/extension_system_uptime_attr.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/doc/extension_system_uptime_attr.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -9,7 +9,8 @@
 #include <iostream>
 #include <stdexcept>
 #include <boost/config.hpp>
-#include <boost/shared_ptr.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/utility/empty_deleter.hpp>
 #include <boost/log/core.hpp>
 #include <boost/log/expressions.hpp>
 #include <boost/log/sinks/sync_frontend.hpp>
@@ -20,7 +21,6 @@
 #include <boost/log/attributes/attribute_value.hpp>
 #include <boost/log/attributes/attribute_value_impl.hpp>
 #include <boost/log/attributes/attribute_cast.hpp>
-#include <boost/log/utility/empty_deleter.hpp>
 
 // Includes for get_uptime()
 #include <boost/throw_exception.hpp>
@@ -85,7 +85,7 @@
     // Initialize the sink
     typedef sinks::synchronous_sink< sinks::text_ostream_backend > sink_t;
     boost::shared_ptr< sink_t > sink(new sink_t());
-    sink->locked_backend()->add_stream(boost::shared_ptr< std::ostream >(&std::clog, logging::empty_deleter()));
+    sink->locked_backend()->add_stream(boost::shared_ptr< std::ostream >(&std::clog, boost::empty_deleter()));
     sink->set_formatter(expr::stream << expr::attr< unsigned int >("SystemUptime") << ": " << expr::smessage);
     core->add_sink(sink);
     //->

Modified: branches/release/libs/log/example/doc/sinks_async.cpp
==============================================================================
--- branches/release/libs/log/example/doc/sinks_async.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/doc/sinks_async.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -8,14 +8,14 @@
 #include <string>
 #include <fstream>
 #include <iostream>
-#include <boost/shared_ptr.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/utility/empty_deleter.hpp>
 #include <boost/log/core.hpp>
 #include <boost/log/expressions.hpp>
 #include <boost/log/sinks/async_frontend.hpp>
 #include <boost/log/sinks/text_ostream_backend.hpp>
 #include <boost/log/sources/severity_channel_logger.hpp>
 #include <boost/log/sources/record_ostream.hpp>
-#include <boost/log/utility/empty_deleter.hpp>
 
 namespace logging = boost::log;
 namespace src = boost::log::sources;
@@ -42,7 +42,7 @@
     boost::shared_ptr< sinks::text_ostream_backend > backend =
         boost::make_shared< sinks::text_ostream_backend >();
     backend->add_stream(
-        boost::shared_ptr< std::ostream >(&std::clog, logging::empty_deleter()));
+        boost::shared_ptr< std::ostream >(&std::clog, boost::empty_deleter()));
 
     // Wrap it into the frontend and register in the core
     boost::shared_ptr< sink_t > sink(new sink_t(backend));

Modified: branches/release/libs/log/example/doc/sinks_async_bounded.cpp
==============================================================================
--- branches/release/libs/log/example/doc/sinks_async_bounded.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/doc/sinks_async_bounded.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -8,7 +8,8 @@
 #include <string>
 #include <fstream>
 #include <iostream>
-#include <boost/shared_ptr.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/utility/empty_deleter.hpp>
 #include <boost/log/core.hpp>
 #include <boost/log/expressions.hpp>
 #include <boost/log/sinks/async_frontend.hpp>
@@ -17,7 +18,6 @@
 #include <boost/log/sinks/drop_on_overflow.hpp>
 #include <boost/log/sources/severity_channel_logger.hpp>
 #include <boost/log/sources/record_ostream.hpp>
-#include <boost/log/utility/empty_deleter.hpp>
 
 namespace logging = boost::log;
 namespace src = boost::log::sources;
@@ -50,7 +50,7 @@
     boost::shared_ptr< sinks::text_ostream_backend > backend =
         boost::make_shared< sinks::text_ostream_backend >();
     backend->add_stream(
-        boost::shared_ptr< std::ostream >(&std::clog, logging::empty_deleter()));
+        boost::shared_ptr< std::ostream >(&std::clog, boost::empty_deleter()));
 
     // Wrap it into the frontend and register in the core
     boost::shared_ptr< sink_t > sink(new sink_t(backend));

Modified: branches/release/libs/log/example/doc/sinks_async_ordering.cpp
==============================================================================
--- branches/release/libs/log/example/doc/sinks_async_ordering.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/doc/sinks_async_ordering.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -9,7 +9,8 @@
 #include <fstream>
 #include <iostream>
 #include <functional>
-#include <boost/shared_ptr.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/utility/empty_deleter.hpp>
 #include <boost/date_time/posix_time/posix_time_types.hpp>
 #include <boost/log/core.hpp>
 #include <boost/log/expressions.hpp>
@@ -18,7 +19,6 @@
 #include <boost/log/sinks/text_ostream_backend.hpp>
 #include <boost/log/sources/severity_channel_logger.hpp>
 #include <boost/log/sources/record_ostream.hpp>
-#include <boost/log/utility/empty_deleter.hpp>
 #include <boost/log/utility/record_ordering.hpp>
 #include <boost/log/utility/setup/common_attributes.hpp>
 
@@ -55,7 +55,7 @@
     boost::shared_ptr< sinks::text_ostream_backend > backend =
         boost::make_shared< sinks::text_ostream_backend >();
     backend->add_stream(
-        boost::shared_ptr< std::ostream >(&std::clog, logging::empty_deleter()));
+        boost::shared_ptr< std::ostream >(&std::clog, boost::empty_deleter()));
 
     // Wrap it into the frontend and register in the core
     boost::shared_ptr< sink_t > sink(new sink_t(

Modified: branches/release/libs/log/example/doc/sinks_debugger.cpp
==============================================================================
--- branches/release/libs/log/example/doc/sinks_debugger.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/doc/sinks_debugger.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -5,7 +5,7 @@
  *          http://www.boost.org/LICENSE_1_0.txt)
  */
 
-#include <boost/shared_ptr.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
 #include <boost/log/core.hpp>
 #include <boost/log/expressions/predicates/is_debugger_present.hpp>
 #include <boost/log/sinks/sync_frontend.hpp>

Modified: branches/release/libs/log/example/doc/sinks_file.cpp
==============================================================================
--- branches/release/libs/log/example/doc/sinks_file.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/doc/sinks_file.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -8,13 +8,12 @@
 #include <string>
 #include <fstream>
 #include <iostream>
-#include <boost/shared_ptr.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
 #include <boost/log/core.hpp>
 #include <boost/log/sinks/sync_frontend.hpp>
 #include <boost/log/sinks/text_file_backend.hpp>
 #include <boost/log/sources/severity_channel_logger.hpp>
 #include <boost/log/sources/record_ostream.hpp>
-#include <boost/log/utility/empty_deleter.hpp>
 
 namespace logging = boost::log;
 namespace src = boost::log::sources;

Modified: branches/release/libs/log/example/doc/sinks_multifile.cpp
==============================================================================
--- branches/release/libs/log/example/doc/sinks_multifile.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/doc/sinks_multifile.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -7,8 +7,8 @@
 
 #include <string>
 #include <iostream>
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/smart_ptr/make_shared_object.hpp>
 #include <boost/log/core.hpp>
 #include <boost/log/expressions.hpp>
 #include <boost/log/sinks/sync_frontend.hpp>

Modified: branches/release/libs/log/example/doc/sinks_ostream.cpp
==============================================================================
--- branches/release/libs/log/example/doc/sinks_ostream.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/doc/sinks_ostream.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -8,13 +8,13 @@
 #include <string>
 #include <fstream>
 #include <iostream>
-#include <boost/shared_ptr.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/utility/empty_deleter.hpp>
 #include <boost/log/core.hpp>
 #include <boost/log/sinks/sync_frontend.hpp>
 #include <boost/log/sinks/text_ostream_backend.hpp>
 #include <boost/log/sources/severity_channel_logger.hpp>
 #include <boost/log/sources/record_ostream.hpp>
-#include <boost/log/utility/empty_deleter.hpp>
 
 namespace logging = boost::log;
 namespace src = boost::log::sources;
@@ -30,7 +30,7 @@
     boost::shared_ptr< sinks::text_ostream_backend > backend =
         boost::make_shared< sinks::text_ostream_backend >();
     backend->add_stream(
-        boost::shared_ptr< std::ostream >(&std::clog, logging::empty_deleter()));
+        boost::shared_ptr< std::ostream >(&std::clog, boost::empty_deleter()));
     backend->add_stream(
         boost::shared_ptr< std::ostream >(new std::ofstream("sample.log")));
 

Modified: branches/release/libs/log/example/doc/sinks_simple_event_log.cpp
==============================================================================
--- branches/release/libs/log/example/doc/sinks_simple_event_log.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/doc/sinks_simple_event_log.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -8,7 +8,7 @@
 #include <stdexcept>
 #include <string>
 #include <iostream>
-#include <boost/shared_ptr.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 
 #include <boost/log/common.hpp>

Modified: branches/release/libs/log/example/doc/sinks_sync.cpp
==============================================================================
--- branches/release/libs/log/example/doc/sinks_sync.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/doc/sinks_sync.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -8,14 +8,14 @@
 #include <string>
 #include <fstream>
 #include <iostream>
-#include <boost/shared_ptr.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/utility/empty_deleter.hpp>
 #include <boost/log/core.hpp>
 #include <boost/log/expressions.hpp>
 #include <boost/log/sinks/sync_frontend.hpp>
 #include <boost/log/sinks/text_ostream_backend.hpp>
 #include <boost/log/sources/severity_channel_logger.hpp>
 #include <boost/log/sources/record_ostream.hpp>
-#include <boost/log/utility/empty_deleter.hpp>
 
 namespace logging = boost::log;
 namespace src = boost::log::sources;
@@ -42,7 +42,7 @@
     boost::shared_ptr< sinks::text_ostream_backend > backend =
         boost::make_shared< sinks::text_ostream_backend >();
     backend->add_stream(
-        boost::shared_ptr< std::ostream >(&std::clog, logging::empty_deleter()));
+        boost::shared_ptr< std::ostream >(&std::clog, boost::empty_deleter()));
 
     // Wrap it into the frontend and register in the core
     boost::shared_ptr< sink_t > sink(new sink_t(backend));

Modified: branches/release/libs/log/example/doc/sinks_syslog.cpp
==============================================================================
--- branches/release/libs/log/example/doc/sinks_syslog.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/doc/sinks_syslog.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -6,8 +6,8 @@
  */
 
 #include <string>
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/smart_ptr/make_shared_object.hpp>
 #include <boost/log/core.hpp>
 #include <boost/log/sinks/sync_frontend.hpp>
 #include <boost/log/sinks/syslog_backend.hpp>

Modified: branches/release/libs/log/example/doc/sinks_unlocked.cpp
==============================================================================
--- branches/release/libs/log/example/doc/sinks_unlocked.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/doc/sinks_unlocked.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -7,7 +7,7 @@
 
 #include <string>
 #include <iostream>
-#include <boost/shared_ptr.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
 #include <boost/log/core.hpp>
 #include <boost/log/expressions.hpp>
 #include <boost/log/sinks/unlocked_frontend.hpp>

Modified: branches/release/libs/log/example/doc/sinks_xml_file.cpp
==============================================================================
--- branches/release/libs/log/example/doc/sinks_xml_file.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/doc/sinks_xml_file.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -8,7 +8,7 @@
 #include <stdexcept>
 #include <string>
 #include <iostream>
-#include <boost/shared_ptr.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 

Modified: branches/release/libs/log/example/doc/sources_net_connection.cpp
==============================================================================
--- branches/release/libs/log/example/doc/sources_net_connection.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/doc/sources_net_connection.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -8,8 +8,8 @@
 #include <cstddef>
 #include <string>
 #include <fstream>
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/smart_ptr/make_shared_object.hpp>
 #include <boost/move/utility.hpp>
 #include <boost/log/core.hpp>
 #include <boost/log/expressions.hpp>

Modified: branches/release/libs/log/example/doc/sources_net_connection_chan.cpp
==============================================================================
--- branches/release/libs/log/example/doc/sources_net_connection_chan.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/doc/sources_net_connection_chan.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -8,8 +8,8 @@
 #include <cstddef>
 #include <string>
 #include <fstream>
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/smart_ptr/make_shared_object.hpp>
 #include <boost/log/core.hpp>
 #include <boost/log/expressions.hpp>
 #include <boost/log/attributes/constant.hpp>

Modified: branches/release/libs/log/example/doc/sources_net_connection_dynamic_chan.cpp
==============================================================================
--- branches/release/libs/log/example/doc/sources_net_connection_dynamic_chan.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/doc/sources_net_connection_dynamic_chan.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -8,8 +8,8 @@
 #include <cstddef>
 #include <string>
 #include <fstream>
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/smart_ptr/make_shared_object.hpp>
 #include <boost/log/core.hpp>
 #include <boost/log/expressions.hpp>
 #include <boost/log/attributes/constant.hpp>

Modified: branches/release/libs/log/example/doc/sources_severity.cpp
==============================================================================
--- branches/release/libs/log/example/doc/sources_severity.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/doc/sources_severity.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -10,8 +10,8 @@
 #include <ostream>
 #include <fstream>
 #include <boost/move/utility.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/smart_ptr/make_shared_object.hpp>
 #include <boost/log/core.hpp>
 #include <boost/log/expressions.hpp>
 #include <boost/log/sources/severity_logger.hpp>

Modified: branches/release/libs/log/example/doc/sources_severity_channel.cpp
==============================================================================
--- branches/release/libs/log/example/doc/sources_severity_channel.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/doc/sources_severity_channel.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -9,8 +9,8 @@
 #include <string>
 #include <ostream>
 #include <fstream>
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/smart_ptr/make_shared_object.hpp>
 #include <boost/log/core.hpp>
 #include <boost/log/expressions.hpp>
 #include <boost/log/sources/severity_channel_logger.hpp>

Modified: branches/release/libs/log/example/doc/tutorial_attributes.cpp
==============================================================================
--- branches/release/libs/log/example/doc/tutorial_attributes.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/doc/tutorial_attributes.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -10,8 +10,8 @@
 #include <ostream>
 #include <fstream>
 #include <iomanip>
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/smart_ptr/make_shared_object.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/log/core.hpp>
 #include <boost/log/expressions.hpp>

Modified: branches/release/libs/log/example/doc/tutorial_file_manual.cpp
==============================================================================
--- branches/release/libs/log/example/doc/tutorial_file_manual.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/doc/tutorial_file_manual.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -6,8 +6,8 @@
  */
 
 #include <fstream>
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/smart_ptr/make_shared_object.hpp>
 #include <boost/log/core.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/log/sinks/sync_frontend.hpp>

Modified: branches/release/libs/log/example/doc/tutorial_filtering.cpp
==============================================================================
--- branches/release/libs/log/example/doc/tutorial_filtering.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/doc/tutorial_filtering.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -10,8 +10,8 @@
 #include <ostream>
 #include <fstream>
 #include <iomanip>
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/smart_ptr/make_shared_object.hpp>
 #include <boost/phoenix/bind.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/log/core.hpp>

Modified: branches/release/libs/log/example/doc/tutorial_fmt_custom.cpp
==============================================================================
--- branches/release/libs/log/example/doc/tutorial_fmt_custom.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/doc/tutorial_fmt_custom.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -7,8 +7,8 @@
 
 #include <ostream>
 #include <fstream>
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/smart_ptr/make_shared_object.hpp>
 #include <boost/optional.hpp>
 #include <boost/log/core.hpp>
 #include <boost/log/trivial.hpp>

Modified: branches/release/libs/log/example/doc/tutorial_fmt_format.cpp
==============================================================================
--- branches/release/libs/log/example/doc/tutorial_fmt_format.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/doc/tutorial_fmt_format.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -6,8 +6,8 @@
  */
 
 #include <fstream>
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/smart_ptr/make_shared_object.hpp>
 #include <boost/log/core.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/log/expressions.hpp>

Modified: branches/release/libs/log/example/doc/tutorial_fmt_stream_manual.cpp
==============================================================================
--- branches/release/libs/log/example/doc/tutorial_fmt_stream_manual.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/doc/tutorial_fmt_stream_manual.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -7,8 +7,8 @@
 
 #include <fstream>
 #include <iomanip>
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/smart_ptr/make_shared_object.hpp>
 #include <boost/log/core.hpp>
 #include <boost/log/trivial.hpp>
 #include <boost/log/expressions.hpp>

Modified: branches/release/libs/log/example/event_log/Jamfile.v2
==============================================================================
--- branches/release/libs/log/example/event_log/Jamfile.v2	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/event_log/Jamfile.v2	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -14,12 +14,15 @@
         <toolset>msvc:<define>_SCL_SECURE_NO_DEPRECATE
         <toolset>msvc:<define>_CRT_SECURE_NO_WARNINGS
         <toolset>msvc:<define>_CRT_SECURE_NO_DEPRECATE
+        <toolset>msvc:<cxxflags>/bigobj
+        <toolset>msvc:<cxxflags>/wd4503 # decorated name length exceeded, name was truncated
         <toolset>intel-win:<define>_SCL_SECURE_NO_WARNINGS
         <toolset>intel-win:<define>_SCL_SECURE_NO_DEPRECATE
         <toolset>intel-win:<define>_CRT_SECURE_NO_WARNINGS
         <toolset>intel-win:<define>_CRT_SECURE_NO_DEPRECATE
-        <toolset>gcc:<cxxflags>-fno-strict-aliasing  # avoids strict aliasing violations in other Boost components
+        <toolset>darwin:<cxxflags>-ftemplate-depth-1024
         <toolset>gcc:<cxxflags>-ftemplate-depth-1024
+        <toolset>gcc:<cxxflags>-fno-strict-aliasing  # avoids strict aliasing violations in other Boost components
         <library>/boost/log//boost_log
         <library>/boost/date_time//boost_date_time
         <library>/boost/filesystem//boost_filesystem

Modified: branches/release/libs/log/example/event_log/main.cpp
==============================================================================
--- branches/release/libs/log/example/event_log/main.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/event_log/main.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -21,7 +21,7 @@
 #include <stdexcept>
 #include <string>
 #include <iostream>
-#include <boost/shared_ptr.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
 #include <boost/date_time/posix_time/posix_time_types.hpp>
 
 #include <boost/log/common.hpp>

Modified: branches/release/libs/log/example/keywords/Jamfile.v2
==============================================================================
--- branches/release/libs/log/example/keywords/Jamfile.v2	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/keywords/Jamfile.v2	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -12,12 +12,15 @@
         <toolset>msvc:<define>_SCL_SECURE_NO_DEPRECATE
         <toolset>msvc:<define>_CRT_SECURE_NO_WARNINGS
         <toolset>msvc:<define>_CRT_SECURE_NO_DEPRECATE
+        <toolset>msvc:<cxxflags>/bigobj
+        <toolset>msvc:<cxxflags>/wd4503 # decorated name length exceeded, name was truncated
         <toolset>intel-win:<define>_SCL_SECURE_NO_WARNINGS
         <toolset>intel-win:<define>_SCL_SECURE_NO_DEPRECATE
         <toolset>intel-win:<define>_CRT_SECURE_NO_WARNINGS
         <toolset>intel-win:<define>_CRT_SECURE_NO_DEPRECATE
-        <toolset>gcc:<cxxflags>-fno-strict-aliasing  # avoids strict aliasing violations in other Boost components
+        <toolset>darwin:<cxxflags>-ftemplate-depth-1024
         <toolset>gcc:<cxxflags>-ftemplate-depth-1024
+        <toolset>gcc:<cxxflags>-fno-strict-aliasing  # avoids strict aliasing violations in other Boost components
         <library>/boost/log//boost_log
         <library>/boost/log//boost_log_setup
         <library>/boost/date_time//boost_date_time

Modified: branches/release/libs/log/example/multiple_files/Jamfile.v2
==============================================================================
--- branches/release/libs/log/example/multiple_files/Jamfile.v2	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/multiple_files/Jamfile.v2	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -12,12 +12,15 @@
         <toolset>msvc:<define>_SCL_SECURE_NO_DEPRECATE
         <toolset>msvc:<define>_CRT_SECURE_NO_WARNINGS
         <toolset>msvc:<define>_CRT_SECURE_NO_DEPRECATE
+        <toolset>msvc:<cxxflags>/bigobj
+        <toolset>msvc:<cxxflags>/wd4503 # decorated name length exceeded, name was truncated
         <toolset>intel-win:<define>_SCL_SECURE_NO_WARNINGS
         <toolset>intel-win:<define>_SCL_SECURE_NO_DEPRECATE
         <toolset>intel-win:<define>_CRT_SECURE_NO_WARNINGS
         <toolset>intel-win:<define>_CRT_SECURE_NO_DEPRECATE
-        <toolset>gcc:<cxxflags>-fno-strict-aliasing  # avoids strict aliasing violations in other Boost components
+        <toolset>darwin:<cxxflags>-ftemplate-depth-1024
         <toolset>gcc:<cxxflags>-ftemplate-depth-1024
+        <toolset>gcc:<cxxflags>-fno-strict-aliasing  # avoids strict aliasing violations in other Boost components
         <library>/boost/log//boost_log
         <library>/boost/date_time//boost_date_time
         <library>/boost/filesystem//boost_filesystem

Modified: branches/release/libs/log/example/multiple_files/main.cpp
==============================================================================
--- branches/release/libs/log/example/multiple_files/main.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/multiple_files/main.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -21,7 +21,7 @@
 #include <stdexcept>
 #include <string>
 #include <iostream>
-#include <boost/shared_ptr.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
 #include <boost/thread/thread.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 

Modified: branches/release/libs/log/example/multiple_threads/Jamfile.v2
==============================================================================
--- branches/release/libs/log/example/multiple_threads/Jamfile.v2	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/multiple_threads/Jamfile.v2	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -12,12 +12,15 @@
         <toolset>msvc:<define>_SCL_SECURE_NO_DEPRECATE
         <toolset>msvc:<define>_CRT_SECURE_NO_WARNINGS
         <toolset>msvc:<define>_CRT_SECURE_NO_DEPRECATE
+        <toolset>msvc:<cxxflags>/bigobj
+        <toolset>msvc:<cxxflags>/wd4503 # decorated name length exceeded, name was truncated
         <toolset>intel-win:<define>_SCL_SECURE_NO_WARNINGS
         <toolset>intel-win:<define>_SCL_SECURE_NO_DEPRECATE
         <toolset>intel-win:<define>_CRT_SECURE_NO_WARNINGS
         <toolset>intel-win:<define>_CRT_SECURE_NO_DEPRECATE
-        <toolset>gcc:<cxxflags>-fno-strict-aliasing  # avoids strict aliasing violations in other Boost components
+        <toolset>darwin:<cxxflags>-ftemplate-depth-1024
         <toolset>gcc:<cxxflags>-ftemplate-depth-1024
+        <toolset>gcc:<cxxflags>-fno-strict-aliasing  # avoids strict aliasing violations in other Boost components
         <library>/boost/log//boost_log
         <library>/boost/date_time//boost_date_time
         <library>/boost/filesystem//boost_filesystem

Modified: branches/release/libs/log/example/multiple_threads/main.cpp
==============================================================================
--- branches/release/libs/log/example/multiple_threads/main.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/multiple_threads/main.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -23,7 +23,7 @@
 #include <fstream>
 #include <boost/ref.hpp>
 #include <boost/bind.hpp>
-#include <boost/shared_ptr.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <boost/thread/thread.hpp>
 #include <boost/thread/barrier.hpp>
@@ -33,7 +33,6 @@
 #include <boost/log/attributes.hpp>
 #include <boost/log/sinks.hpp>
 #include <boost/log/sources/logger.hpp>
-#include <boost/log/utility/empty_deleter.hpp>
 
 namespace logging = boost::log;
 namespace attrs = boost::log::attributes;

Modified: branches/release/libs/log/example/native_syslog/Jamfile.v2
==============================================================================
--- branches/release/libs/log/example/native_syslog/Jamfile.v2	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/native_syslog/Jamfile.v2	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -13,12 +13,15 @@
         <toolset>msvc:<define>_SCL_SECURE_NO_DEPRECATE
         <toolset>msvc:<define>_CRT_SECURE_NO_WARNINGS
         <toolset>msvc:<define>_CRT_SECURE_NO_DEPRECATE
+        <toolset>msvc:<cxxflags>/bigobj
+        <toolset>msvc:<cxxflags>/wd4503 # decorated name length exceeded, name was truncated
         <toolset>intel-win:<define>_SCL_SECURE_NO_WARNINGS
         <toolset>intel-win:<define>_SCL_SECURE_NO_DEPRECATE
         <toolset>intel-win:<define>_CRT_SECURE_NO_WARNINGS
         <toolset>intel-win:<define>_CRT_SECURE_NO_DEPRECATE
-        <toolset>gcc:<cxxflags>-fno-strict-aliasing  # avoids strict aliasing violations in other Boost components
+        <toolset>darwin:<cxxflags>-ftemplate-depth-1024
         <toolset>gcc:<cxxflags>-ftemplate-depth-1024
+        <toolset>gcc:<cxxflags>-fno-strict-aliasing  # avoids strict aliasing violations in other Boost components
         <library>/boost/log//boost_log
         <library>/boost/date_time//boost_date_time
         <library>/boost/filesystem//boost_filesystem

Modified: branches/release/libs/log/example/native_syslog/main.cpp
==============================================================================
--- branches/release/libs/log/example/native_syslog/main.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/native_syslog/main.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -20,7 +20,7 @@
 #include <stdexcept>
 #include <string>
 #include <iostream>
-#include <boost/shared_ptr.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
 
 #include <boost/log/common.hpp>
 #include <boost/log/expressions.hpp>

Modified: branches/release/libs/log/example/rotating_file/Jamfile.v2
==============================================================================
--- branches/release/libs/log/example/rotating_file/Jamfile.v2	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/rotating_file/Jamfile.v2	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -12,12 +12,15 @@
         <toolset>msvc:<define>_SCL_SECURE_NO_DEPRECATE
         <toolset>msvc:<define>_CRT_SECURE_NO_WARNINGS
         <toolset>msvc:<define>_CRT_SECURE_NO_DEPRECATE
+        <toolset>msvc:<cxxflags>/bigobj
+        <toolset>msvc:<cxxflags>/wd4503 # decorated name length exceeded, name was truncated
         <toolset>intel-win:<define>_SCL_SECURE_NO_WARNINGS
         <toolset>intel-win:<define>_SCL_SECURE_NO_DEPRECATE
         <toolset>intel-win:<define>_CRT_SECURE_NO_WARNINGS
         <toolset>intel-win:<define>_CRT_SECURE_NO_DEPRECATE
-        <toolset>gcc:<cxxflags>-fno-strict-aliasing  # avoids strict aliasing violations in other Boost components
+        <toolset>darwin:<cxxflags>-ftemplate-depth-1024
         <toolset>gcc:<cxxflags>-ftemplate-depth-1024
+        <toolset>gcc:<cxxflags>-fno-strict-aliasing  # avoids strict aliasing violations in other Boost components
         <library>/boost/log//boost_log
         <library>/boost/date_time//boost_date_time
         <library>/boost/filesystem//boost_filesystem

Modified: branches/release/libs/log/example/rotating_file/main.cpp
==============================================================================
--- branches/release/libs/log/example/rotating_file/main.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/rotating_file/main.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -20,7 +20,7 @@
 #include <stdexcept>
 #include <string>
 #include <iostream>
-#include <boost/shared_ptr.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 
 #include <boost/log/common.hpp>

Modified: branches/release/libs/log/example/settings_file/Jamfile.v2
==============================================================================
--- branches/release/libs/log/example/settings_file/Jamfile.v2	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/settings_file/Jamfile.v2	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -12,12 +12,15 @@
         <toolset>msvc:<define>_SCL_SECURE_NO_DEPRECATE
         <toolset>msvc:<define>_CRT_SECURE_NO_WARNINGS
         <toolset>msvc:<define>_CRT_SECURE_NO_DEPRECATE
+        <toolset>msvc:<cxxflags>/bigobj
+        <toolset>msvc:<cxxflags>/wd4503 # decorated name length exceeded, name was truncated
         <toolset>intel-win:<define>_SCL_SECURE_NO_WARNINGS
         <toolset>intel-win:<define>_SCL_SECURE_NO_DEPRECATE
         <toolset>intel-win:<define>_CRT_SECURE_NO_WARNINGS
         <toolset>intel-win:<define>_CRT_SECURE_NO_DEPRECATE
-        <toolset>gcc:<cxxflags>-fno-strict-aliasing  # avoids strict aliasing violations in other Boost components
+        <toolset>darwin:<cxxflags>-ftemplate-depth-1024
         <toolset>gcc:<cxxflags>-ftemplate-depth-1024
+        <toolset>gcc:<cxxflags>-fno-strict-aliasing  # avoids strict aliasing violations in other Boost components
         <library>/boost/log//boost_log
         <library>/boost/log//boost_log_setup
         <library>/boost/date_time//boost_date_time

Modified: branches/release/libs/log/example/settings_file_formatter_factory/Jamfile.v2
==============================================================================
--- branches/release/libs/log/example/settings_file_formatter_factory/Jamfile.v2	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/settings_file_formatter_factory/Jamfile.v2	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -12,12 +12,15 @@
         <toolset>msvc:<define>_SCL_SECURE_NO_DEPRECATE
         <toolset>msvc:<define>_CRT_SECURE_NO_WARNINGS
         <toolset>msvc:<define>_CRT_SECURE_NO_DEPRECATE
+        <toolset>msvc:<cxxflags>/bigobj
+        <toolset>msvc:<cxxflags>/wd4503 # decorated name length exceeded, name was truncated
         <toolset>intel-win:<define>_SCL_SECURE_NO_WARNINGS
         <toolset>intel-win:<define>_SCL_SECURE_NO_DEPRECATE
         <toolset>intel-win:<define>_CRT_SECURE_NO_WARNINGS
         <toolset>intel-win:<define>_CRT_SECURE_NO_DEPRECATE
-        <toolset>gcc:<cxxflags>-fno-strict-aliasing  # avoids strict aliasing violations in other Boost components
+        <toolset>darwin:<cxxflags>-ftemplate-depth-1024
         <toolset>gcc:<cxxflags>-ftemplate-depth-1024
+        <toolset>gcc:<cxxflags>-fno-strict-aliasing  # avoids strict aliasing violations in other Boost components
         <library>/boost/log//boost_log
         <library>/boost/log//boost_log_setup
         <library>/boost/date_time//boost_date_time

Modified: branches/release/libs/log/example/settings_file_formatter_factory/main.cpp
==============================================================================
--- branches/release/libs/log/example/settings_file_formatter_factory/main.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/settings_file_formatter_factory/main.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -21,7 +21,7 @@
 #include <stdexcept>
 #include <boost/ref.hpp>
 #include <boost/bind.hpp>
-#include <boost/make_shared.hpp>
+#include <boost/smart_ptr/make_shared_object.hpp>
 #include <boost/log/core.hpp>
 #include <boost/log/common.hpp>
 #include <boost/log/attributes.hpp>

Modified: branches/release/libs/log/example/syslog/Jamfile.v2
==============================================================================
--- branches/release/libs/log/example/syslog/Jamfile.v2	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/syslog/Jamfile.v2	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -13,12 +13,15 @@
         <toolset>msvc:<define>_SCL_SECURE_NO_DEPRECATE
         <toolset>msvc:<define>_CRT_SECURE_NO_WARNINGS
         <toolset>msvc:<define>_CRT_SECURE_NO_DEPRECATE
+        <toolset>msvc:<cxxflags>/bigobj
+        <toolset>msvc:<cxxflags>/wd4503 # decorated name length exceeded, name was truncated
         <toolset>intel-win:<define>_SCL_SECURE_NO_WARNINGS
         <toolset>intel-win:<define>_SCL_SECURE_NO_DEPRECATE
         <toolset>intel-win:<define>_CRT_SECURE_NO_WARNINGS
         <toolset>intel-win:<define>_CRT_SECURE_NO_DEPRECATE
-        <toolset>gcc:<cxxflags>-fno-strict-aliasing  # avoids strict aliasing violations in other Boost components
+        <toolset>darwin:<cxxflags>-ftemplate-depth-1024
         <toolset>gcc:<cxxflags>-ftemplate-depth-1024
+        <toolset>gcc:<cxxflags>-fno-strict-aliasing  # avoids strict aliasing violations in other Boost components
         <library>/boost/log//boost_log
         <library>/boost/date_time//boost_date_time
         <library>/boost/filesystem//boost_filesystem

Modified: branches/release/libs/log/example/syslog/main.cpp
==============================================================================
--- branches/release/libs/log/example/syslog/main.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/syslog/main.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -20,7 +20,7 @@
 #include <stdexcept>
 #include <string>
 #include <iostream>
-#include <boost/shared_ptr.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
 
 #include <boost/log/common.hpp>
 #include <boost/log/expressions.hpp>

Modified: branches/release/libs/log/example/trivial/Jamfile.v2
==============================================================================
--- branches/release/libs/log/example/trivial/Jamfile.v2	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/trivial/Jamfile.v2	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -12,12 +12,15 @@
         <toolset>msvc:<define>_SCL_SECURE_NO_DEPRECATE
         <toolset>msvc:<define>_CRT_SECURE_NO_WARNINGS
         <toolset>msvc:<define>_CRT_SECURE_NO_DEPRECATE
+        <toolset>msvc:<cxxflags>/bigobj
+        <toolset>msvc:<cxxflags>/wd4503 # decorated name length exceeded, name was truncated
         <toolset>intel-win:<define>_SCL_SECURE_NO_WARNINGS
         <toolset>intel-win:<define>_SCL_SECURE_NO_DEPRECATE
         <toolset>intel-win:<define>_CRT_SECURE_NO_WARNINGS
         <toolset>intel-win:<define>_CRT_SECURE_NO_DEPRECATE
-        <toolset>gcc:<cxxflags>-fno-strict-aliasing  # avoids strict aliasing violations in other Boost components
+        <toolset>darwin:<cxxflags>-ftemplate-depth-1024
         <toolset>gcc:<cxxflags>-ftemplate-depth-1024
+        <toolset>gcc:<cxxflags>-fno-strict-aliasing  # avoids strict aliasing violations in other Boost components
         <library>/boost/log//boost_log
         <library>/boost/date_time//boost_date_time
         <library>/boost/filesystem//boost_filesystem

Modified: branches/release/libs/log/example/wide_char/Jamfile.v2
==============================================================================
--- branches/release/libs/log/example/wide_char/Jamfile.v2	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/example/wide_char/Jamfile.v2	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -12,12 +12,15 @@
         <toolset>msvc:<define>_SCL_SECURE_NO_DEPRECATE
         <toolset>msvc:<define>_CRT_SECURE_NO_WARNINGS
         <toolset>msvc:<define>_CRT_SECURE_NO_DEPRECATE
+        <toolset>msvc:<cxxflags>/bigobj
+        <toolset>msvc:<cxxflags>/wd4503 # decorated name length exceeded, name was truncated
         <toolset>intel-win:<define>_SCL_SECURE_NO_WARNINGS
         <toolset>intel-win:<define>_SCL_SECURE_NO_DEPRECATE
         <toolset>intel-win:<define>_CRT_SECURE_NO_WARNINGS
         <toolset>intel-win:<define>_CRT_SECURE_NO_DEPRECATE
-        <toolset>gcc:<cxxflags>-fno-strict-aliasing  # avoids strict aliasing violations in other Boost components
+        <toolset>darwin:<cxxflags>-ftemplate-depth-1024
         <toolset>gcc:<cxxflags>-ftemplate-depth-1024
+        <toolset>gcc:<cxxflags>-fno-strict-aliasing  # avoids strict aliasing violations in other Boost components
         <library>/boost/log//boost_log
         <library>/boost/log//boost_log_setup
         <library>/boost/date_time//boost_date_time

Modified: branches/release/libs/log/src/attribute_name.cpp
==============================================================================
--- branches/release/libs/log/src/attribute_name.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/src/attribute_name.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -18,9 +18,9 @@
 #include <ostream>
 #include <stdexcept>
 #include <boost/assert.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
 #include <boost/throw_exception.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/smart_ptr/make_shared_object.hpp>
 #include <boost/intrusive/set.hpp>
 #include <boost/intrusive/set_hook.hpp>
 #include <boost/intrusive/options.hpp>

Modified: branches/release/libs/log/src/core.cpp
==============================================================================
--- branches/release/libs/log/src/core.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/src/core.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -20,9 +20,9 @@
 #include <algorithm>
 #include <boost/cstdint.hpp>
 #include <boost/assert.hpp>
-#include <boost/weak_ptr.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
+#include <boost/smart_ptr/weak_ptr.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/smart_ptr/make_shared_object.hpp>
 #include <boost/range/iterator_range_core.hpp>
 #include <boost/move/core.hpp>
 #include <boost/move/utility.hpp>

Modified: branches/release/libs/log/src/default_attribute_names.cpp
==============================================================================
--- branches/release/libs/log/src/default_attribute_names.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/src/default_attribute_names.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -13,7 +13,7 @@
  *         at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */
 
-#include <boost/shared_ptr.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
 #include <boost/log/detail/default_attribute_names.hpp>
 #include <boost/log/detail/singleton.hpp>
 #include <boost/log/detail/header.hpp>

Modified: branches/release/libs/log/src/init_from_settings.cpp
==============================================================================
--- branches/release/libs/log/src/init_from_settings.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/src/init_from_settings.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -29,8 +29,9 @@
 #include <boost/bind.hpp>
 #include <boost/limits.hpp>
 #include <boost/cstdint.hpp>
-#include <boost/make_shared.hpp>
-#include <boost/optional.hpp>
+#include <boost/smart_ptr/make_shared_object.hpp>
+#include <boost/utility/empty_deleter.hpp>
+#include <boost/optional/optional.hpp>
 #include <boost/filesystem/path.hpp>
 #include <boost/date_time/date_defs.hpp>
 #include <boost/property_tree/ptree.hpp>
@@ -49,7 +50,6 @@
 #include <boost/log/sinks/frontend_requirements.hpp>
 #include <boost/log/expressions/filter.hpp>
 #include <boost/log/expressions/formatter.hpp>
-#include <boost/log/utility/empty_deleter.hpp>
 #include <boost/log/utility/setup/from_settings.hpp>
 #include <boost/log/utility/setup/filter_parser.hpp>
 #include <boost/log/utility/setup/formatter_parser.hpp>
@@ -312,7 +312,7 @@
             typedef boost::log::aux::char_constants< BackendCharT > constants;
             typedef sinks::basic_text_ostream_backend< BackendCharT > backend_t;
             shared_ptr< backend_t > backend = boost::make_shared< backend_t >();
-            backend->add_stream(shared_ptr< typename backend_t::stream_type >(&constants::get_console_log_stream(), empty_deleter()));
+            backend->add_stream(shared_ptr< typename backend_t::stream_type >(&constants::get_console_log_stream(), boost::empty_deleter()));
 
             // Auto flush
             if (optional< string_type > auto_flush_param = params["AutoFlush"])

Modified: branches/release/libs/log/src/named_scope.cpp
==============================================================================
--- branches/release/libs/log/src/named_scope.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/src/named_scope.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -15,10 +15,7 @@
 
 #include <memory>
 #include <algorithm>
-#include <boost/optional.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
-#include <boost/enable_shared_from_this.hpp>
+#include <boost/optional/optional.hpp>
 #include <boost/log/attributes/attribute.hpp>
 #include <boost/log/attributes/attribute_value.hpp>
 #include <boost/log/attributes/named_scope.hpp>

Modified: branches/release/libs/log/src/syslog_backend.cpp
==============================================================================
--- branches/release/libs/log/src/syslog_backend.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/src/syslog_backend.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -22,9 +22,9 @@
 #include <stdexcept>
 #include <boost/limits.hpp>
 #include <boost/assert.hpp>
-#include <boost/weak_ptr.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
+#include <boost/smart_ptr/weak_ptr.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/smart_ptr/make_shared_object.hpp>
 #include <boost/throw_exception.hpp>
 #if !defined(BOOST_LOG_NO_ASIO)
 #include <boost/asio/buffer.hpp>

Modified: branches/release/libs/log/src/text_file_backend.cpp
==============================================================================
--- branches/release/libs/log/src/text_file_backend.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/src/text_file_backend.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -31,7 +31,7 @@
 #include <stdexcept>
 #include <boost/ref.hpp>
 #include <boost/bind.hpp>
-#include <boost/make_shared.hpp>
+#include <boost/smart_ptr/make_shared_object.hpp>
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/throw_exception.hpp>
 #include <boost/mpl/if.hpp>

Modified: branches/release/libs/log/src/unhandled_exception_count.cpp
==============================================================================
--- branches/release/libs/log/src/unhandled_exception_count.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/src/unhandled_exception_count.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -31,7 +31,7 @@
 
 #if defined(BOOST_LOG_HAS_CXXABI_H)
 // MinGW GCC 4.4 seem to not work the same way the newer GCC versions do. As a result, __cxa_get_globals based implementation will always return 0.
-// Just disable it for now and fall back to std::unhandled_exception().
+// Just disable it for now and fall back to std::uncaught_exception().
 #if !defined(__MINGW32__) || (defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)))
 // Only GCC 4.7 declares __cxa_get_globals() in cxxabi.h, older compilers do not expose this function but it's there
 #define BOOST_LOG_HAS_CXA_GET_GLOBALS
@@ -55,7 +55,7 @@
     return *(reinterpret_cast< const unsigned int* >(static_cast< const char* >(_getptd()) + (sizeof(void*) == 8 ? 0x100 : 0x90))); // _tiddata::_ProcessingThrow, x32 offset - 0x90, x64 - 0x100
 #else
     // Portable implementation. Does not allow to detect multiple nested exceptions.
-    return static_cast< unsigned int >(std::unhandled_exception());
+    return static_cast< unsigned int >(std::uncaught_exception());
 #endif
 }
 

Modified: branches/release/libs/log/test/Jamfile.v2
==============================================================================
--- branches/release/libs/log/test/Jamfile.v2	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/test/Jamfile.v2	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -15,10 +15,14 @@
         <toolset>msvc:<define>_SCL_SECURE_NO_DEPRECATE
         <toolset>msvc:<define>_CRT_SECURE_NO_WARNINGS
         <toolset>msvc:<define>_CRT_SECURE_NO_DEPRECATE
+        <toolset>msvc:<cxxflags>/bigobj
+        <toolset>msvc:<cxxflags>/wd4503 # decorated name length exceeded, name was truncated
         <toolset>intel-win:<define>_SCL_SECURE_NO_WARNINGS
         <toolset>intel-win:<define>_SCL_SECURE_NO_DEPRECATE
         <toolset>intel-win:<define>_CRT_SECURE_NO_WARNINGS
         <toolset>intel-win:<define>_CRT_SECURE_NO_DEPRECATE
+        <toolset>darwin:<cxxflags>-ftemplate-depth-1024
+        <toolset>gcc:<cxxflags>-ftemplate-depth-1024
         <toolset>gcc:<cxxflags>-fno-strict-aliasing  # avoids strict aliasing violations in other Boost components
         <library>/boost/log//boost_log
         <library>/boost/log//boost_log_setup

Deleted: branches/release/libs/log/test/compile/util_explicit_operator_bool.cpp
==============================================================================
--- branches/release/libs/log/test/compile/util_explicit_operator_bool.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85656)
+++ /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: branches/release/libs/log/test/compile_fail/util_explicit_operator_bool_conv_int.cpp
==============================================================================
--- branches/release/libs/log/test/compile_fail/util_explicit_operator_bool_conv_int.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85656)
+++ /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: branches/release/libs/log/test/compile_fail/util_explicit_operator_bool_conv_pvoid.cpp
==============================================================================
--- branches/release/libs/log/test/compile_fail/util_explicit_operator_bool_conv_pvoid.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85656)
+++ /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: branches/release/libs/log/test/compile_fail/util_explicit_operator_bool_delete.cpp
==============================================================================
--- branches/release/libs/log/test/compile_fail/util_explicit_operator_bool_delete.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85656)
+++ /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: branches/release/libs/log/test/compile_fail/util_explicit_operator_bool_shift.cpp
==============================================================================
--- branches/release/libs/log/test/compile_fail/util_explicit_operator_bool_shift.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85656)
+++ /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;
-}

Modified: branches/release/libs/log/test/performance/record_emission.cpp
==============================================================================
--- branches/release/libs/log/test/performance/record_emission.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/test/performance/record_emission.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -21,8 +21,8 @@
 #include <iostream>
 #include <boost/ref.hpp>
 #include <boost/bind.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/make_shared.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
+#include <boost/smart_ptr/make_shared_object.hpp>
 #include <boost/date_time/microsec_time_clock.hpp>
 #include <boost/date_time/posix_time/posix_time_types.hpp>
 #include <boost/thread/thread.hpp>

Modified: branches/release/libs/log/test/run/core.cpp
==============================================================================
--- branches/release/libs/log/test/run/core.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/test/run/core.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -17,7 +17,7 @@
 #include <cstddef>
 #include <map>
 #include <string>
-#include <boost/shared_ptr.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
 #include <boost/move/utility.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/log/core/core.hpp>

Modified: branches/release/libs/log/test/run/util_stp_filter_parser.cpp
==============================================================================
--- branches/release/libs/log/test/run/util_stp_filter_parser.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/test/run/util_stp_filter_parser.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -20,7 +20,7 @@
 
 #if !defined(BOOST_LOG_WITHOUT_SETTINGS_PARSERS) && !defined(BOOST_LOG_WITHOUT_DEFAULT_FACTORIES)
 
-#include <boost/shared_ptr.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
 #include <boost/log/exceptions.hpp>
 #include <boost/log/attributes/constant.hpp>
 #include <boost/log/attributes/attribute_set.hpp>

Modified: branches/release/libs/log/test/run/util_stp_formatter_parser.cpp
==============================================================================
--- branches/release/libs/log/test/run/util_stp_formatter_parser.cpp	Thu Sep 12 11:17:53 2013	(r85656)
+++ branches/release/libs/log/test/run/util_stp_formatter_parser.cpp	2013-09-12 13:17:07 EDT (Thu, 12 Sep 2013)	(r85657)
@@ -20,7 +20,7 @@
 
 #if !defined(BOOST_LOG_WITHOUT_SETTINGS_PARSERS) && !defined(BOOST_LOG_WITHOUT_DEFAULT_FACTORIES)
 
-#include <boost/shared_ptr.hpp>
+#include <boost/smart_ptr/shared_ptr.hpp>
 #include <boost/log/exceptions.hpp>
 #include <boost/log/core/record.hpp>
 #include <boost/log/core/record_view.hpp>