|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r85542 - in trunk: boost/log/attributes boost/log/core boost/log/detail boost/log/sinks boost/log/sources boost/log/utility boost/log/utility/setup boost/log/utility/type_dispatch libs/log/doc libs/log/example/advanced_usage libs/log/example/async_log libs/log/example/bounded_async_log libs/log/example/doc libs/log/example/event_log 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_formatter_factory libs/log/example/syslog libs/log/src libs/log/test/performance libs/log/test/run
From: andrey.semashev_at_[hidden]
Date: 2013-09-01 07:15:01
Author: andysem
Date: 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013)
New Revision: 85542
URL: http://svn.boost.org/trac/boost/changeset/85542
Log:
intrusive_ref_counter moved to Boost.SmartPtr. Cleaned some of the includes.
Text files modified:
trunk/boost/log/attributes/attribute.hpp | 6
trunk/boost/log/attributes/attribute_value.hpp | 3
trunk/boost/log/attributes/current_thread_id.hpp | 2
trunk/boost/log/attributes/mutable_constant.hpp | 3
trunk/boost/log/core/core.hpp | 2
trunk/boost/log/core/record_view.hpp | 2
trunk/boost/log/detail/locking_ptr.hpp | 206 ++++++++++++++++++++--------------------
trunk/boost/log/sinks/async_frontend.hpp | 6
trunk/boost/log/sinks/sync_frontend.hpp | 4
trunk/boost/log/sinks/syslog_backend.hpp | 1
trunk/boost/log/sinks/text_file_backend.hpp | 2
trunk/boost/log/sinks/text_ostream_backend.hpp | 2
trunk/boost/log/sinks/unlocked_frontend.hpp | 4
trunk/boost/log/sources/basic_logger.hpp | 1
trunk/boost/log/sources/global_logger_storage.hpp | 4
trunk/boost/log/sources/severity_feature.hpp | 2
trunk/boost/log/utility/intrusive_ref_counter.hpp | 98 ++----------------
trunk/boost/log/utility/setup/console.hpp | 4
trunk/boost/log/utility/setup/file.hpp | 4
trunk/boost/log/utility/setup/filter_parser.hpp | 4
trunk/boost/log/utility/setup/formatter_parser.hpp | 4
trunk/boost/log/utility/setup/from_settings.hpp | 2
trunk/boost/log/utility/type_dispatch/dynamic_type_dispatcher.hpp | 4
trunk/libs/log/doc/changelog.qbk | 3
trunk/libs/log/example/advanced_usage/main.cpp | 2
trunk/libs/log/example/async_log/main.cpp | 2
trunk/libs/log/example/bounded_async_log/main.cpp | 2
trunk/libs/log/example/doc/core_core_manual.cpp | 2
trunk/libs/log/example/doc/exception_handling.cpp | 4
trunk/libs/log/example/doc/expressions_has_attr_stat_accum.cpp | 4
trunk/libs/log/example/doc/extension_app_launcher.cpp | 2
trunk/libs/log/example/doc/extension_filter_parser.cpp | 4
trunk/libs/log/example/doc/extension_filter_parser_custom_rel.cpp | 4
trunk/libs/log/example/doc/extension_formatter_parser.cpp | 4
trunk/libs/log/example/doc/extension_record_tagger.cpp | 4
trunk/libs/log/example/doc/extension_stat_collector.cpp | 2
trunk/libs/log/example/doc/extension_stat_collector_settings.cpp | 4
trunk/libs/log/example/doc/extension_system_uptime_attr.cpp | 2
trunk/libs/log/example/doc/sinks_async.cpp | 2
trunk/libs/log/example/doc/sinks_async_bounded.cpp | 2
trunk/libs/log/example/doc/sinks_async_ordering.cpp | 2
trunk/libs/log/example/doc/sinks_debugger.cpp | 2
trunk/libs/log/example/doc/sinks_file.cpp | 2
trunk/libs/log/example/doc/sinks_multifile.cpp | 4
trunk/libs/log/example/doc/sinks_ostream.cpp | 2
trunk/libs/log/example/doc/sinks_simple_event_log.cpp | 2
trunk/libs/log/example/doc/sinks_sync.cpp | 2
trunk/libs/log/example/doc/sinks_syslog.cpp | 4
trunk/libs/log/example/doc/sinks_unlocked.cpp | 2
trunk/libs/log/example/doc/sinks_xml_file.cpp | 2
trunk/libs/log/example/doc/sources_net_connection.cpp | 4
trunk/libs/log/example/doc/sources_net_connection_chan.cpp | 4
trunk/libs/log/example/doc/sources_net_connection_dynamic_chan.cpp | 4
trunk/libs/log/example/doc/sources_severity.cpp | 4
trunk/libs/log/example/doc/sources_severity_channel.cpp | 4
trunk/libs/log/example/doc/tutorial_attributes.cpp | 4
trunk/libs/log/example/doc/tutorial_file_manual.cpp | 4
trunk/libs/log/example/doc/tutorial_filtering.cpp | 4
trunk/libs/log/example/doc/tutorial_fmt_custom.cpp | 4
trunk/libs/log/example/doc/tutorial_fmt_format.cpp | 4
trunk/libs/log/example/doc/tutorial_fmt_stream_manual.cpp | 4
trunk/libs/log/example/event_log/main.cpp | 2
trunk/libs/log/example/multiple_files/main.cpp | 2
trunk/libs/log/example/multiple_threads/main.cpp | 2
trunk/libs/log/example/native_syslog/main.cpp | 2
trunk/libs/log/example/rotating_file/main.cpp | 2
trunk/libs/log/example/settings_file_formatter_factory/main.cpp | 2
trunk/libs/log/example/syslog/main.cpp | 2
trunk/libs/log/src/attribute_name.cpp | 4
trunk/libs/log/src/core.cpp | 6
trunk/libs/log/src/default_attribute_names.cpp | 2
trunk/libs/log/src/init_from_settings.cpp | 2
trunk/libs/log/src/named_scope.cpp | 5
trunk/libs/log/src/syslog_backend.cpp | 6
trunk/libs/log/src/text_file_backend.cpp | 2
trunk/libs/log/test/performance/record_emission.cpp | 4
trunk/libs/log/test/run/core.cpp | 2
trunk/libs/log/test/run/util_stp_filter_parser.cpp | 2
trunk/libs/log/test/run/util_stp_formatter_parser.cpp | 2
79 files changed, 228 insertions(+), 310 deletions(-)
Modified: trunk/boost/log/attributes/attribute.hpp
==============================================================================
--- trunk/boost/log/attributes/attribute.hpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/boost/log/attributes/attribute.hpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -16,10 +16,10 @@
#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/log/detail/header.hpp>
@@ -67,7 +67,7 @@
* 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
{
/*!
* \return The actual attribute value. It shall not return empty values (exceptions
Modified: trunk/boost/log/attributes/attribute_value.hpp
==============================================================================
--- trunk/boost/log/attributes/attribute_value.hpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/boost/log/attributes/attribute_value.hpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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/log/utility/type_info_wrapper.hpp>
#include <boost/log/utility/type_dispatch/type_dispatcher.hpp>
#include <boost/log/attributes/attribute.hpp>
Modified: trunk/boost/log/attributes/current_thread_id.hpp
==============================================================================
--- trunk/boost/log/attributes/current_thread_id.hpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/boost/log/attributes/current_thread_id.hpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/boost/log/attributes/mutable_constant.hpp
==============================================================================
--- trunk/boost/log/attributes/mutable_constant.hpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/boost/log/attributes/mutable_constant.hpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/boost/log/core/core.hpp
==============================================================================
--- trunk/boost/log/core/core.hpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/boost/log/core/core.hpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/boost/log/core/record_view.hpp
==============================================================================
--- trunk/boost/log/core/record_view.hpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/boost/log/core/record_view.hpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -15,7 +15,7 @@
#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>
Modified: trunk/boost/log/detail/locking_ptr.hpp
==============================================================================
--- trunk/boost/log/detail/locking_ptr.hpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/boost/log/detail/locking_ptr.hpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -16,7 +16,7 @@
#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/log/detail/header.hpp>
@@ -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_LOG_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: trunk/boost/log/sinks/async_frontend.hpp
==============================================================================
--- trunk/boost/log/sinks/async_frontend.hpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/boost/log/sinks/async_frontend.hpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/boost/log/sinks/sync_frontend.hpp
==============================================================================
--- trunk/boost/log/sinks/sync_frontend.hpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/boost/log/sinks/sync_frontend.hpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/boost/log/sinks/syslog_backend.hpp
==============================================================================
--- trunk/boost/log/sinks/syslog_backend.hpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/boost/log/sinks/syslog_backend.hpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/boost/log/sinks/text_file_backend.hpp
==============================================================================
--- trunk/boost/log/sinks/text_file_backend.hpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/boost/log/sinks/text_file_backend.hpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/boost/log/sinks/text_ostream_backend.hpp
==============================================================================
--- trunk/boost/log/sinks/text_ostream_backend.hpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/boost/log/sinks/text_ostream_backend.hpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/boost/log/sinks/unlocked_frontend.hpp
==============================================================================
--- trunk/boost/log/sinks/unlocked_frontend.hpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/boost/log/sinks/unlocked_frontend.hpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/boost/log/sources/basic_logger.hpp
==============================================================================
--- trunk/boost/log/sources/basic_logger.hpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/boost/log/sources/basic_logger.hpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/boost/log/sources/global_logger_storage.hpp
==============================================================================
--- trunk/boost/log/sources/global_logger_storage.hpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/boost/log/sources/global_logger_storage.hpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/boost/log/sources/severity_feature.hpp
==============================================================================
--- trunk/boost/log/sources/severity_feature.hpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/boost/log/sources/severity_feature.hpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/boost/log/utility/intrusive_ref_counter.hpp
==============================================================================
--- trunk/boost/log/utility/intrusive_ref_counter.hpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/boost/log/utility/intrusive_ref_counter.hpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -9,109 +9,33 @@
* \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;
-
-#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
-{
-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
-};
-
-#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
+using boost::intrusive_ref_counter;
BOOST_LOG_CLOSE_NAMESPACE // namespace log
Modified: trunk/boost/log/utility/setup/console.hpp
==============================================================================
--- trunk/boost/log/utility/setup/console.hpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/boost/log/utility/setup/console.hpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -16,8 +16,8 @@
#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/log/detail/config.hpp>
#include <boost/log/detail/sink_init_helpers.hpp>
#ifndef BOOST_LOG_NO_THREADS
Modified: trunk/boost/log/utility/setup/file.hpp
==============================================================================
--- trunk/boost/log/utility/setup/file.hpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/boost/log/utility/setup/file.hpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/boost/log/utility/setup/filter_parser.hpp
==============================================================================
--- trunk/boost/log/utility/setup/filter_parser.hpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/boost/log/utility/setup/filter_parser.hpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/boost/log/utility/setup/formatter_parser.hpp
==============================================================================
--- trunk/boost/log/utility/setup/formatter_parser.hpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/boost/log/utility/setup/formatter_parser.hpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/boost/log/utility/setup/from_settings.hpp
==============================================================================
--- trunk/boost/log/utility/setup/from_settings.hpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/boost/log/utility/setup/from_settings.hpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/boost/log/utility/type_dispatch/dynamic_type_dispatcher.hpp
==============================================================================
--- trunk/boost/log/utility/type_dispatch/dynamic_type_dispatcher.hpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/boost/log/utility/type_dispatch/dynamic_type_dispatcher.hpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/libs/log/doc/changelog.qbk
==============================================================================
--- trunk/libs/log/doc/changelog.qbk Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/doc/changelog.qbk 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -14,7 +14,8 @@
[*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 moved to __boost_smart_ptr__, as `boost/smart_ptr/intrusive_ref_counter.hpp`.
[*Bug fixes:]
Modified: trunk/libs/log/example/advanced_usage/main.cpp
==============================================================================
--- trunk/libs/log/example/advanced_usage/main.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/advanced_usage/main.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -21,7 +21,7 @@
#include <cassert>
#include <iostream>
#include <fstream>
-#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>
#include <boost/log/expressions.hpp>
Modified: trunk/libs/log/example/async_log/main.cpp
==============================================================================
--- trunk/libs/log/example/async_log/main.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/async_log/main.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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>
Modified: trunk/libs/log/example/bounded_async_log/main.cpp
==============================================================================
--- trunk/libs/log/example/bounded_async_log/main.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/bounded_async_log/main.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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>
Modified: trunk/libs/log/example/doc/core_core_manual.cpp
==============================================================================
--- trunk/libs/log/example/doc/core_core_manual.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/doc/core_core_manual.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/libs/log/example/doc/exception_handling.cpp
==============================================================================
--- trunk/libs/log/example/doc/exception_handling.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/doc/exception_handling.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/libs/log/example/doc/expressions_has_attr_stat_accum.cpp
==============================================================================
--- trunk/libs/log/example/doc/expressions_has_attr_stat_accum.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/doc/expressions_has_attr_stat_accum.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/libs/log/example/doc/extension_app_launcher.cpp
==============================================================================
--- trunk/libs/log/example/doc/extension_app_launcher.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/doc/extension_app_launcher.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/libs/log/example/doc/extension_filter_parser.cpp
==============================================================================
--- trunk/libs/log/example/doc/extension_filter_parser.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/doc/extension_filter_parser.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/libs/log/example/doc/extension_filter_parser_custom_rel.cpp
==============================================================================
--- trunk/libs/log/example/doc/extension_filter_parser_custom_rel.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/doc/extension_filter_parser_custom_rel.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/libs/log/example/doc/extension_formatter_parser.cpp
==============================================================================
--- trunk/libs/log/example/doc/extension_formatter_parser.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/doc/extension_formatter_parser.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/libs/log/example/doc/extension_record_tagger.cpp
==============================================================================
--- trunk/libs/log/example/doc/extension_record_tagger.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/doc/extension_record_tagger.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/libs/log/example/doc/extension_stat_collector.cpp
==============================================================================
--- trunk/libs/log/example/doc/extension_stat_collector.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/doc/extension_stat_collector.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/libs/log/example/doc/extension_stat_collector_settings.cpp
==============================================================================
--- trunk/libs/log/example/doc/extension_stat_collector_settings.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/doc/extension_stat_collector_settings.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/libs/log/example/doc/extension_system_uptime_attr.cpp
==============================================================================
--- trunk/libs/log/example/doc/extension_system_uptime_attr.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/doc/extension_system_uptime_attr.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -9,7 +9,7 @@
#include <iostream>
#include <stdexcept>
#include <boost/config.hpp>
-#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/sync_frontend.hpp>
Modified: trunk/libs/log/example/doc/sinks_async.cpp
==============================================================================
--- trunk/libs/log/example/doc/sinks_async.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/doc/sinks_async.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -8,7 +8,7 @@
#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/expressions.hpp>
#include <boost/log/sinks/async_frontend.hpp>
Modified: trunk/libs/log/example/doc/sinks_async_bounded.cpp
==============================================================================
--- trunk/libs/log/example/doc/sinks_async_bounded.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/doc/sinks_async_bounded.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -8,7 +8,7 @@
#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/expressions.hpp>
#include <boost/log/sinks/async_frontend.hpp>
Modified: trunk/libs/log/example/doc/sinks_async_ordering.cpp
==============================================================================
--- trunk/libs/log/example/doc/sinks_async_ordering.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/doc/sinks_async_ordering.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -9,7 +9,7 @@
#include <fstream>
#include <iostream>
#include <functional>
-#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/core.hpp>
#include <boost/log/expressions.hpp>
Modified: trunk/libs/log/example/doc/sinks_debugger.cpp
==============================================================================
--- trunk/libs/log/example/doc/sinks_debugger.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/doc/sinks_debugger.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/libs/log/example/doc/sinks_file.cpp
==============================================================================
--- trunk/libs/log/example/doc/sinks_file.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/doc/sinks_file.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -8,7 +8,7 @@
#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>
Modified: trunk/libs/log/example/doc/sinks_multifile.cpp
==============================================================================
--- trunk/libs/log/example/doc/sinks_multifile.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/doc/sinks_multifile.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/libs/log/example/doc/sinks_ostream.cpp
==============================================================================
--- trunk/libs/log/example/doc/sinks_ostream.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/doc/sinks_ostream.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -8,7 +8,7 @@
#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_ostream_backend.hpp>
Modified: trunk/libs/log/example/doc/sinks_simple_event_log.cpp
==============================================================================
--- trunk/libs/log/example/doc/sinks_simple_event_log.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/doc/sinks_simple_event_log.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/libs/log/example/doc/sinks_sync.cpp
==============================================================================
--- trunk/libs/log/example/doc/sinks_sync.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/doc/sinks_sync.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -8,7 +8,7 @@
#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/expressions.hpp>
#include <boost/log/sinks/sync_frontend.hpp>
Modified: trunk/libs/log/example/doc/sinks_syslog.cpp
==============================================================================
--- trunk/libs/log/example/doc/sinks_syslog.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/doc/sinks_syslog.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/libs/log/example/doc/sinks_unlocked.cpp
==============================================================================
--- trunk/libs/log/example/doc/sinks_unlocked.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/doc/sinks_unlocked.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/libs/log/example/doc/sinks_xml_file.cpp
==============================================================================
--- trunk/libs/log/example/doc/sinks_xml_file.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/doc/sinks_xml_file.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/libs/log/example/doc/sources_net_connection.cpp
==============================================================================
--- trunk/libs/log/example/doc/sources_net_connection.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/doc/sources_net_connection.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/libs/log/example/doc/sources_net_connection_chan.cpp
==============================================================================
--- trunk/libs/log/example/doc/sources_net_connection_chan.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/doc/sources_net_connection_chan.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/libs/log/example/doc/sources_net_connection_dynamic_chan.cpp
==============================================================================
--- trunk/libs/log/example/doc/sources_net_connection_dynamic_chan.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/doc/sources_net_connection_dynamic_chan.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/libs/log/example/doc/sources_severity.cpp
==============================================================================
--- trunk/libs/log/example/doc/sources_severity.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/doc/sources_severity.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/libs/log/example/doc/sources_severity_channel.cpp
==============================================================================
--- trunk/libs/log/example/doc/sources_severity_channel.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/doc/sources_severity_channel.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/libs/log/example/doc/tutorial_attributes.cpp
==============================================================================
--- trunk/libs/log/example/doc/tutorial_attributes.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/doc/tutorial_attributes.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/libs/log/example/doc/tutorial_file_manual.cpp
==============================================================================
--- trunk/libs/log/example/doc/tutorial_file_manual.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/doc/tutorial_file_manual.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/libs/log/example/doc/tutorial_filtering.cpp
==============================================================================
--- trunk/libs/log/example/doc/tutorial_filtering.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/doc/tutorial_filtering.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/libs/log/example/doc/tutorial_fmt_custom.cpp
==============================================================================
--- trunk/libs/log/example/doc/tutorial_fmt_custom.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/doc/tutorial_fmt_custom.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/libs/log/example/doc/tutorial_fmt_format.cpp
==============================================================================
--- trunk/libs/log/example/doc/tutorial_fmt_format.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/doc/tutorial_fmt_format.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/libs/log/example/doc/tutorial_fmt_stream_manual.cpp
==============================================================================
--- trunk/libs/log/example/doc/tutorial_fmt_stream_manual.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/doc/tutorial_fmt_stream_manual.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/libs/log/example/event_log/main.cpp
==============================================================================
--- trunk/libs/log/example/event_log/main.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/event_log/main.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/libs/log/example/multiple_files/main.cpp
==============================================================================
--- trunk/libs/log/example/multiple_files/main.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/multiple_files/main.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/libs/log/example/multiple_threads/main.cpp
==============================================================================
--- trunk/libs/log/example/multiple_threads/main.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/multiple_threads/main.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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>
Modified: trunk/libs/log/example/native_syslog/main.cpp
==============================================================================
--- trunk/libs/log/example/native_syslog/main.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/native_syslog/main.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/libs/log/example/rotating_file/main.cpp
==============================================================================
--- trunk/libs/log/example/rotating_file/main.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/rotating_file/main.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/libs/log/example/settings_file_formatter_factory/main.cpp
==============================================================================
--- trunk/libs/log/example/settings_file_formatter_factory/main.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/settings_file_formatter_factory/main.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/libs/log/example/syslog/main.cpp
==============================================================================
--- trunk/libs/log/example/syslog/main.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/example/syslog/main.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/libs/log/src/attribute_name.cpp
==============================================================================
--- trunk/libs/log/src/attribute_name.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/src/attribute_name.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/libs/log/src/core.cpp
==============================================================================
--- trunk/libs/log/src/core.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/src/core.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/libs/log/src/default_attribute_names.cpp
==============================================================================
--- trunk/libs/log/src/default_attribute_names.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/src/default_attribute_names.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/libs/log/src/init_from_settings.cpp
==============================================================================
--- trunk/libs/log/src/init_from_settings.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/src/init_from_settings.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -29,7 +29,7 @@
#include <boost/bind.hpp>
#include <boost/limits.hpp>
#include <boost/cstdint.hpp>
-#include <boost/make_shared.hpp>
+#include <boost/smart_ptr/make_shared_object.hpp>
#include <boost/optional.hpp>
#include <boost/filesystem/path.hpp>
#include <boost/date_time/date_defs.hpp>
Modified: trunk/libs/log/src/named_scope.cpp
==============================================================================
--- trunk/libs/log/src/named_scope.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/src/named_scope.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/libs/log/src/syslog_backend.cpp
==============================================================================
--- trunk/libs/log/src/syslog_backend.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/src/syslog_backend.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/libs/log/src/text_file_backend.cpp
==============================================================================
--- trunk/libs/log/src/text_file_backend.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/src/text_file_backend.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/libs/log/test/performance/record_emission.cpp
==============================================================================
--- trunk/libs/log/test/performance/record_emission.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/test/performance/record_emission.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/libs/log/test/run/core.cpp
==============================================================================
--- trunk/libs/log/test/run/core.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/test/run/core.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/libs/log/test/run/util_stp_filter_parser.cpp
==============================================================================
--- trunk/libs/log/test/run/util_stp_filter_parser.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/test/run/util_stp_filter_parser.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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: trunk/libs/log/test/run/util_stp_formatter_parser.cpp
==============================================================================
--- trunk/libs/log/test/run/util_stp_formatter_parser.cpp Sun Sep 1 06:54:47 2013 (r85541)
+++ trunk/libs/log/test/run/util_stp_formatter_parser.cpp 2013-09-01 07:15:01 EDT (Sun, 01 Sep 2013) (r85542)
@@ -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>
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk