diff options
Diffstat (limited to '3party/boost/boost/log/sources')
12 files changed, 47 insertions, 47 deletions
diff --git a/3party/boost/boost/log/sources/basic_logger.hpp b/3party/boost/boost/log/sources/basic_logger.hpp index 5adac6e155..0f0842934b 100644 --- a/3party/boost/boost/log/sources/basic_logger.hpp +++ b/3party/boost/boost/log/sources/basic_logger.hpp @@ -1,5 +1,5 @@ /* - * Copyright Andrey Semashev 2007 - 2013. + * Copyright Andrey Semashev 2007 - 2014. * 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) @@ -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> @@ -41,7 +40,7 @@ #include <boost/log/sources/threading_models.hpp> #include <boost/log/detail/header.hpp> -#ifdef BOOST_LOG_HAS_PRAGMA_ONCE +#ifdef BOOST_HAS_PRAGMA_ONCE #pragma once #endif @@ -101,7 +100,7 @@ public: //! Lock requirement for the remove_all_attributes_unlocked method typedef boost::log::aux::exclusive_lock_guard< threading_model > remove_all_attributes_lock; //! Lock requirement for the get_attributes method - typedef boost::log::aux::shared_lock_guard< threading_model > get_attributes_lock; + typedef boost::log::aux::shared_lock_guard< const threading_model > get_attributes_lock; //! Lock requirement for the open_record_unlocked method typedef boost::log::aux::shared_lock_guard< threading_model > open_record_lock; //! Lock requirement for the set_attributes method @@ -111,7 +110,7 @@ public: typedef no_lock< threading_model > add_attribute_lock; typedef no_lock< threading_model > remove_attribute_lock; typedef no_lock< threading_model > remove_all_attributes_lock; - typedef no_lock< threading_model > get_attributes_lock; + typedef no_lock< const threading_model > get_attributes_lock; typedef no_lock< threading_model > open_record_lock; typedef no_lock< threading_model > set_attributes_lock; #endif @@ -285,7 +284,7 @@ protected: } //! Assignment is closed (should be implemented through copy and swap in the final class) - BOOST_LOG_DELETED_FUNCTION(basic_logger& operator= (basic_logger const&)) + BOOST_DELETED_FUNCTION(basic_logger& operator= (basic_logger const&)) }; /*! @@ -599,7 +598,7 @@ protected: #define BOOST_LOG_FORWARD_LOGGER_CONSTRUCTORS_IMPL(class_type, typename_keyword)\ public:\ - BOOST_LOG_DEFAULTED_FUNCTION(class_type(), {})\ + BOOST_DEFAULTED_FUNCTION(class_type(), {})\ class_type(class_type const& that) : class_type::logger_base(\ static_cast< typename_keyword() class_type::logger_base const& >(that)) {}\ class_type(BOOST_RV_REF(class_type) that) : class_type::logger_base(\ diff --git a/3party/boost/boost/log/sources/channel_feature.hpp b/3party/boost/boost/log/sources/channel_feature.hpp index 8e6079d66d..c93ee6fa2d 100644 --- a/3party/boost/boost/log/sources/channel_feature.hpp +++ b/3party/boost/boost/log/sources/channel_feature.hpp @@ -1,5 +1,5 @@ /* - * Copyright Andrey Semashev 2007 - 2013. + * Copyright Andrey Semashev 2007 - 2014. * 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) @@ -27,7 +27,7 @@ #include <boost/log/core/record.hpp> #include <boost/log/detail/header.hpp> -#ifdef BOOST_LOG_HAS_PRAGMA_ONCE +#ifdef BOOST_HAS_PRAGMA_ONCE #pragma once #endif diff --git a/3party/boost/boost/log/sources/channel_logger.hpp b/3party/boost/boost/log/sources/channel_logger.hpp index e3414de199..737faa1f17 100644 --- a/3party/boost/boost/log/sources/channel_logger.hpp +++ b/3party/boost/boost/log/sources/channel_logger.hpp @@ -1,5 +1,5 @@ /* - * Copyright Andrey Semashev 2007 - 2013. + * Copyright Andrey Semashev 2007 - 2014. * 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) @@ -26,7 +26,7 @@ #include <boost/log/keywords/channel.hpp> #include <boost/log/detail/header.hpp> -#ifdef BOOST_LOG_HAS_PRAGMA_ONCE +#ifdef BOOST_HAS_PRAGMA_ONCE #pragma once #endif diff --git a/3party/boost/boost/log/sources/exception_handler_feature.hpp b/3party/boost/boost/log/sources/exception_handler_feature.hpp index 21b516cfd0..d665d0d84b 100644 --- a/3party/boost/boost/log/sources/exception_handler_feature.hpp +++ b/3party/boost/boost/log/sources/exception_handler_feature.hpp @@ -1,5 +1,5 @@ /* - * Copyright Andrey Semashev 2007 - 2013. + * Copyright Andrey Semashev 2007 - 2014. * 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) @@ -22,6 +22,7 @@ #include <boost/log/detail/config.hpp> #include <boost/log/detail/light_function.hpp> #include <boost/log/detail/locks.hpp> +#include <boost/log/core/record.hpp> #include <boost/log/sources/threading_models.hpp> #include <boost/log/utility/strictest_lock.hpp> #if !defined(BOOST_LOG_NO_THREADS) @@ -29,7 +30,7 @@ #endif #include <boost/log/detail/header.hpp> -#ifdef BOOST_LOG_HAS_PRAGMA_ONCE +#ifdef BOOST_HAS_PRAGMA_ONCE #pragma once #endif diff --git a/3party/boost/boost/log/sources/features.hpp b/3party/boost/boost/log/sources/features.hpp index ca19d0b4cf..295cc0bb4f 100644 --- a/3party/boost/boost/log/sources/features.hpp +++ b/3party/boost/boost/log/sources/features.hpp @@ -1,5 +1,5 @@ /* - * Copyright Andrey Semashev 2007 - 2013. + * Copyright Andrey Semashev 2007 - 2014. * 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) @@ -18,15 +18,15 @@ #include <boost/mpl/lambda.hpp> #include <boost/log/detail/config.hpp> -#ifdef BOOST_LOG_HAS_PRAGMA_ONCE +#ifdef BOOST_HAS_PRAGMA_ONCE #pragma once #endif #if defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) #include <boost/preprocessor/repetition/enum_params.hpp> +#include <boost/preprocessor/repetition/enum_binary_params.hpp> #include <boost/preprocessor/repetition/enum_shifted_params.hpp> -#include <boost/preprocessor/repetition/enum_shifted_binary_params.hpp> #include <boost/preprocessor/facilities/intercept.hpp> //! The macro defines the maximum number of features that can be specified for a logger diff --git a/3party/boost/boost/log/sources/global_logger_storage.hpp b/3party/boost/boost/log/sources/global_logger_storage.hpp index 37acdb7ce0..65811edd2e 100644 --- a/3party/boost/boost/log/sources/global_logger_storage.hpp +++ b/3party/boost/boost/log/sources/global_logger_storage.hpp @@ -1,5 +1,5 @@ /* - * Copyright Andrey Semashev 2007 - 2013. + * Copyright Andrey Semashev 2007 - 2014. * 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) @@ -17,15 +17,15 @@ #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> #include <boost/log/detail/visible_type.hpp> #include <boost/log/detail/header.hpp> -#ifdef BOOST_LOG_HAS_PRAGMA_ONCE +#ifdef BOOST_HAS_PRAGMA_ONCE #pragma once #endif @@ -38,7 +38,7 @@ namespace sources { namespace aux { //! The base class for logger holders -struct BOOST_LOG_NO_VTABLE BOOST_LOG_VISIBLE logger_holder_base +struct BOOST_LOG_NO_VTABLE BOOST_SYMBOL_VISIBLE logger_holder_base { //! The source file name where the logger was registered const char* m_RegistrationFile; @@ -56,7 +56,7 @@ struct BOOST_LOG_NO_VTABLE BOOST_LOG_VISIBLE logger_holder_base //! The actual logger holder class template< typename LoggerT > -struct BOOST_LOG_VISIBLE logger_holder : +struct BOOST_SYMBOL_VISIBLE logger_holder : public logger_holder_base { //! The logger instance @@ -79,9 +79,9 @@ struct global_storage BOOST_LOG_API static shared_ptr< logger_holder_base > get_or_init(std::type_info const& key, initializer_t initializer); // Non-constructible, non-copyable, non-assignable - BOOST_LOG_DELETED_FUNCTION(global_storage()) - BOOST_LOG_DELETED_FUNCTION(global_storage(global_storage const&)) - BOOST_LOG_DELETED_FUNCTION(global_storage& operator= (global_storage const&)) + BOOST_DELETED_FUNCTION(global_storage()) + BOOST_DELETED_FUNCTION(global_storage(global_storage const&)) + BOOST_DELETED_FUNCTION(global_storage& operator= (global_storage const&)) }; //! Throws the \c odr_violation exception diff --git a/3party/boost/boost/log/sources/logger.hpp b/3party/boost/boost/log/sources/logger.hpp index 022e1ce35f..4f5fbf1ff6 100644 --- a/3party/boost/boost/log/sources/logger.hpp +++ b/3party/boost/boost/log/sources/logger.hpp @@ -1,5 +1,5 @@ /* - * Copyright Andrey Semashev 2007 - 2013. + * Copyright Andrey Semashev 2007 - 2014. * 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) @@ -24,7 +24,7 @@ #endif // !defined(BOOST_LOG_NO_THREADS) #include <boost/log/detail/header.hpp> -#ifdef BOOST_LOG_HAS_PRAGMA_ONCE +#ifdef BOOST_HAS_PRAGMA_ONCE #pragma once #endif diff --git a/3party/boost/boost/log/sources/record_ostream.hpp b/3party/boost/boost/log/sources/record_ostream.hpp index e640b32696..239f3c9f6a 100644 --- a/3party/boost/boost/log/sources/record_ostream.hpp +++ b/3party/boost/boost/log/sources/record_ostream.hpp @@ -1,5 +1,5 @@ /* - * Copyright Andrey Semashev 2007 - 2013. + * Copyright Andrey Semashev 2007 - 2014. * 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) @@ -27,11 +27,11 @@ #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> -#ifdef BOOST_LOG_HAS_PRAGMA_ONCE +#ifdef BOOST_HAS_PRAGMA_ONCE #pragma once #endif @@ -103,7 +103,7 @@ public: * \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_NOEXCEPT() /*! * Inverted conversion to an unspecified boolean type @@ -162,8 +162,8 @@ private: BOOST_LOG_API void init_stream(); // Copy and assignment are closed - BOOST_LOG_DELETED_FUNCTION(basic_record_ostream(basic_record_ostream const&)) - BOOST_LOG_DELETED_FUNCTION(basic_record_ostream& operator= (basic_record_ostream const&)) + BOOST_DELETED_FUNCTION(basic_record_ostream(basic_record_ostream const&)) + BOOST_DELETED_FUNCTION(basic_record_ostream& operator= (basic_record_ostream const&)) }; @@ -201,9 +201,9 @@ struct stream_provider BOOST_LOG_API static void release_compound(stream_compound* compound) BOOST_NOEXCEPT; // Non-constructible, non-copyable, non-assignable - BOOST_LOG_DELETED_FUNCTION(stream_provider()) - BOOST_LOG_DELETED_FUNCTION(stream_provider(stream_provider const&)) - BOOST_LOG_DELETED_FUNCTION(stream_provider& operator= (stream_provider const&)) + BOOST_DELETED_FUNCTION(stream_provider()) + BOOST_DELETED_FUNCTION(stream_provider(stream_provider const&)) + BOOST_DELETED_FUNCTION(stream_provider& operator= (stream_provider const&)) }; @@ -289,7 +289,7 @@ public: }; template< typename LoggerT > -BOOST_LOG_FORCEINLINE record_pump< LoggerT > make_record_pump(LoggerT& lg, record& rec) +BOOST_FORCEINLINE record_pump< LoggerT > make_record_pump(LoggerT& lg, record& rec) { return record_pump< LoggerT >(lg, rec); } diff --git a/3party/boost/boost/log/sources/severity_channel_logger.hpp b/3party/boost/boost/log/sources/severity_channel_logger.hpp index 84c6929cb3..aa567e82f6 100644 --- a/3party/boost/boost/log/sources/severity_channel_logger.hpp +++ b/3party/boost/boost/log/sources/severity_channel_logger.hpp @@ -1,5 +1,5 @@ /* - * Copyright Andrey Semashev 2007 - 2013. + * Copyright Andrey Semashev 2007 - 2014. * 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) @@ -27,7 +27,7 @@ #include <boost/log/sources/channel_feature.hpp> #include <boost/log/detail/header.hpp> -#ifdef BOOST_LOG_HAS_PRAGMA_ONCE +#ifdef BOOST_HAS_PRAGMA_ONCE #pragma once #endif diff --git a/3party/boost/boost/log/sources/severity_feature.hpp b/3party/boost/boost/log/sources/severity_feature.hpp index 80fc07b329..ae34c4c587 100644 --- a/3party/boost/boost/log/sources/severity_feature.hpp +++ b/3party/boost/boost/log/sources/severity_feature.hpp @@ -1,5 +1,5 @@ /* - * Copyright Andrey Semashev 2007 - 2013. + * Copyright Andrey Semashev 2007 - 2014. * 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) @@ -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> @@ -32,7 +32,7 @@ #include <boost/log/core/record.hpp> #include <boost/log/detail/header.hpp> -#ifdef BOOST_LOG_HAS_PRAGMA_ONCE +#ifdef BOOST_HAS_PRAGMA_ONCE #pragma once #endif @@ -62,7 +62,7 @@ namespace aux { protected: //! Factory implementation - class BOOST_LOG_VISIBLE impl : + class BOOST_SYMBOL_VISIBLE impl : public attribute_value::impl { public: diff --git a/3party/boost/boost/log/sources/severity_logger.hpp b/3party/boost/boost/log/sources/severity_logger.hpp index 5b0c5b8027..4e9fa580c0 100644 --- a/3party/boost/boost/log/sources/severity_logger.hpp +++ b/3party/boost/boost/log/sources/severity_logger.hpp @@ -1,5 +1,5 @@ /* - * Copyright Andrey Semashev 2007 - 2013. + * Copyright Andrey Semashev 2007 - 2014. * 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) @@ -26,7 +26,7 @@ #include <boost/log/keywords/severity.hpp> #include <boost/log/detail/header.hpp> -#ifdef BOOST_LOG_HAS_PRAGMA_ONCE +#ifdef BOOST_HAS_PRAGMA_ONCE #pragma once #endif diff --git a/3party/boost/boost/log/sources/threading_models.hpp b/3party/boost/boost/log/sources/threading_models.hpp index 9ca68c7a85..0cfaf80034 100644 --- a/3party/boost/boost/log/sources/threading_models.hpp +++ b/3party/boost/boost/log/sources/threading_models.hpp @@ -1,5 +1,5 @@ /* - * Copyright Andrey Semashev 2007 - 2013. + * Copyright Andrey Semashev 2007 - 2014. * 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) @@ -24,7 +24,7 @@ #endif #include <boost/log/detail/header.hpp> -#ifdef BOOST_LOG_HAS_PRAGMA_ONCE +#ifdef BOOST_HAS_PRAGMA_ONCE #pragma once #endif |