Boost-Commit :

Date view	Thread view	Subject view	Author view

Subject: [Boost-commit] svn:boost r85461 - in branches/release: boost/log boost/log/attributes boost/log/core boost/log/detail boost/log/expressions boost/log/expressions/formatters boost/log/expressions/predicates boost/log/keywords boost/log/sinks boost/log/sources boost/log/support boost/log/utility boost/log/utility/functional boost/log/utility/manipulators boost/log/utility/setup boost/log/utility/type_dispatch libs/log libs/log/build libs/log/doc libs/log/example/doc libs/log/src libs/log/test libs/log/test/run
From: andrey.semashev_at_[hidden]
Date: 2013-08-25 10:20:22

Next message: vicente.botet_at_[hidden]: "[Boost-commit] svn:boost r85462 - trunk/boost/thread"
Previous message: andrey.semashev_at_[hidden]: "[Boost-commit] svn:boost r85460 - trunk/libs/log/doc"

Author: andysem
Date: 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013)
New Revision: 85461
URL: http://svn.boost.org/trac/boost/changeset/85461

Log:
Merged latest changes from trunk.

Added:
   branches/release/libs/log/src/matches_relation_factory.cpp
      - copied unchanged from r85460, trunk/libs/log/src/matches_relation_factory.cpp
   branches/release/libs/log/test/run/setup_filter_parser.cpp
      - copied unchanged from r85460, trunk/libs/log/test/run/setup_filter_parser.cpp
   branches/release/libs/log/test/run/setup_formatter_parser.cpp
      - copied unchanged from r85460, trunk/libs/log/test/run/setup_formatter_parser.cpp
   branches/release/libs/log/test/run/setup_settings_parser.cpp
      - copied unchanged from r85460, trunk/libs/log/test/run/setup_settings_parser.cpp
Deleted:
   branches/release/boost/log/detail/alignas.hpp
   branches/release/boost/log/detail/intptr_t.hpp
Properties modified:
   branches/release/boost/log/ (props changed)
   branches/release/libs/log/ (props changed)
Text files modified:
   branches/release/boost/log/attributes.hpp | 2
   branches/release/boost/log/attributes/attribute.hpp | 6
   branches/release/boost/log/attributes/attribute_cast.hpp | 2
   branches/release/boost/log/attributes/attribute_name.hpp | 2
   branches/release/boost/log/attributes/attribute_set.hpp | 6
   branches/release/boost/log/attributes/attribute_value.hpp | 4
   branches/release/boost/log/attributes/attribute_value_impl.hpp | 2
   branches/release/boost/log/attributes/attribute_value_set.hpp | 6
   branches/release/boost/log/attributes/clock.hpp | 4
   branches/release/boost/log/attributes/constant.hpp | 4
   branches/release/boost/log/attributes/counter.hpp | 4
   branches/release/boost/log/attributes/current_process_id.hpp | 2
   branches/release/boost/log/attributes/current_process_name.hpp | 2
   branches/release/boost/log/attributes/current_thread_id.hpp | 4
   branches/release/boost/log/attributes/fallback_policy.hpp | 2
   branches/release/boost/log/attributes/fallback_policy_fwd.hpp | 2
   branches/release/boost/log/attributes/function.hpp | 4
   branches/release/boost/log/attributes/mutable_constant.hpp | 6
   branches/release/boost/log/attributes/named_scope.hpp | 8
   branches/release/boost/log/attributes/scoped_attribute.hpp | 14
   branches/release/boost/log/attributes/time_traits.hpp | 2
   branches/release/boost/log/attributes/timer.hpp | 4
   branches/release/boost/log/attributes/value_extraction.hpp | 8
   branches/release/boost/log/attributes/value_extraction_fwd.hpp | 2
   branches/release/boost/log/attributes/value_visitation.hpp | 4
   branches/release/boost/log/attributes/value_visitation_fwd.hpp | 2
   branches/release/boost/log/common.hpp | 2
   branches/release/boost/log/core.hpp | 2
   branches/release/boost/log/core/core.hpp | 10
   branches/release/boost/log/core/record.hpp | 2
   branches/release/boost/log/core/record_view.hpp | 8
   /dev/null | 45 --
   branches/release/boost/log/detail/asio_fwd.hpp | 4
   branches/release/boost/log/detail/attachable_sstream_buf.hpp | 8
   branches/release/boost/log/detail/attr_output_impl.hpp | 12
   branches/release/boost/log/detail/attr_output_terminal.hpp | 4
   branches/release/boost/log/detail/attribute_get_value_impl.hpp | 4
   branches/release/boost/log/detail/attribute_predicate.hpp | 2
   branches/release/boost/log/detail/cleanup_scope_guard.hpp | 8
   branches/release/boost/log/detail/code_conversion.hpp | 4
   branches/release/boost/log/detail/config.hpp | 65 ---
   branches/release/boost/log/detail/custom_terminal_spec.hpp | 2
   branches/release/boost/log/detail/date_time_fmt_gen_traits_fwd.hpp | 4
   branches/release/boost/log/detail/date_time_format_parser.hpp | 2
   branches/release/boost/log/detail/decomposed_time.hpp | 12
   branches/release/boost/log/detail/deduce_char_type.hpp | 4
   branches/release/boost/log/detail/default_attribute_names.hpp | 4
   branches/release/boost/log/detail/embedded_string_type.hpp | 4
   branches/release/boost/log/detail/event.hpp | 17
   branches/release/boost/log/detail/fake_mutex.hpp | 10
   branches/release/boost/log/detail/footer.hpp | 6
   branches/release/boost/log/detail/format.hpp | 10
   branches/release/boost/log/detail/function_traits.hpp | 4
   branches/release/boost/log/detail/header.hpp | 20 +
   branches/release/boost/log/detail/id.hpp | 4
   /dev/null | 64 ---
   branches/release/boost/log/detail/light_function.hpp | 4
   branches/release/boost/log/detail/light_rw_mutex.hpp | 16
   branches/release/boost/log/detail/locking_ptr.hpp | 4
   branches/release/boost/log/detail/locks.hpp | 4
   branches/release/boost/log/detail/malloc_aligned.hpp | 4
   branches/release/boost/log/detail/named_scope_fmt_pp.hpp | 6
   branches/release/boost/log/detail/native_typeof.hpp | 4
   branches/release/boost/log/detail/parameter_tools.hpp | 4
   branches/release/boost/log/detail/pp_identity.hpp | 4
   branches/release/boost/log/detail/process_id.hpp | 4
   branches/release/boost/log/detail/setup_config.hpp | 4
   branches/release/boost/log/detail/singleton.hpp | 10
   branches/release/boost/log/detail/sink_init_helpers.hpp | 4
   branches/release/boost/log/detail/snprintf.hpp | 4
   branches/release/boost/log/detail/spin_mutex.hpp | 87 +++
   branches/release/boost/log/detail/tagged_integer.hpp | 4
   branches/release/boost/log/detail/thread_id.hpp | 4
   branches/release/boost/log/detail/thread_specific.hpp | 10
   branches/release/boost/log/detail/threadsafe_queue.hpp | 9
   branches/release/boost/log/detail/timestamp.hpp | 4
   branches/release/boost/log/detail/trivial_keyword.hpp | 4
   branches/release/boost/log/detail/unary_function_terminal.hpp | 4
   branches/release/boost/log/detail/unhandled_exception_count.hpp | 4
   branches/release/boost/log/detail/value_ref_visitation.hpp | 6
   branches/release/boost/log/detail/visible_type.hpp | 6
   branches/release/boost/log/exceptions.hpp | 4
   branches/release/boost/log/expressions.hpp | 2
   branches/release/boost/log/expressions/attr.hpp | 8
   branches/release/boost/log/expressions/attr_fwd.hpp | 2
   branches/release/boost/log/expressions/filter.hpp | 6
   branches/release/boost/log/expressions/formatter.hpp | 6
   branches/release/boost/log/expressions/formatters.hpp | 2
   branches/release/boost/log/expressions/formatters/c_decorator.hpp | 10
   branches/release/boost/log/expressions/formatters/char_decorator.hpp | 16
   branches/release/boost/log/expressions/formatters/csv_decorator.hpp | 6
   branches/release/boost/log/expressions/formatters/date_time.hpp | 18
   branches/release/boost/log/expressions/formatters/format.hpp | 8
   branches/release/boost/log/expressions/formatters/if.hpp | 16
   branches/release/boost/log/expressions/formatters/named_scope.hpp | 20
   branches/release/boost/log/expressions/formatters/stream.hpp | 2
   branches/release/boost/log/expressions/formatters/wrap_formatter.hpp | 10
   branches/release/boost/log/expressions/formatters/xml_decorator.hpp | 6
   branches/release/boost/log/expressions/is_keyword_descriptor.hpp | 2
   branches/release/boost/log/expressions/keyword.hpp | 2
   branches/release/boost/log/expressions/keyword_fwd.hpp | 2
   branches/release/boost/log/expressions/message.hpp | 2
   branches/release/boost/log/expressions/predicates.hpp | 2
   branches/release/boost/log/expressions/predicates/begins_with.hpp | 8
   branches/release/boost/log/expressions/predicates/channel_severity_filter.hpp | 44 +-
   branches/release/boost/log/expressions/predicates/contains.hpp | 8
   branches/release/boost/log/expressions/predicates/ends_with.hpp | 8
   branches/release/boost/log/expressions/predicates/has_attr.hpp | 8
   branches/release/boost/log/expressions/predicates/is_debugger_present.hpp | 2
   branches/release/boost/log/expressions/predicates/is_in_range.hpp | 8
   branches/release/boost/log/expressions/predicates/matches.hpp | 8
   branches/release/boost/log/expressions/record.hpp | 2
   branches/release/boost/log/keywords/auto_flush.hpp | 2
   branches/release/boost/log/keywords/channel.hpp | 2
   branches/release/boost/log/keywords/delimiter.hpp | 2
   branches/release/boost/log/keywords/depth.hpp | 2
   branches/release/boost/log/keywords/facility.hpp | 2
   branches/release/boost/log/keywords/file_name.hpp | 2
   branches/release/boost/log/keywords/filter.hpp | 2
   branches/release/boost/log/keywords/format.hpp | 2
   branches/release/boost/log/keywords/ident.hpp | 2
   branches/release/boost/log/keywords/ip_version.hpp | 2
   branches/release/boost/log/keywords/iteration.hpp | 2
   branches/release/boost/log/keywords/log_name.hpp | 2
   branches/release/boost/log/keywords/log_source.hpp | 2
   branches/release/boost/log/keywords/max_size.hpp | 2
   branches/release/boost/log/keywords/message_file.hpp | 2
   branches/release/boost/log/keywords/min_free_space.hpp | 2
   branches/release/boost/log/keywords/open_mode.hpp | 2
   branches/release/boost/log/keywords/order.hpp | 2
   branches/release/boost/log/keywords/ordering_window.hpp | 2
   branches/release/boost/log/keywords/registration.hpp | 2
   branches/release/boost/log/keywords/rotation_size.hpp | 2
   branches/release/boost/log/keywords/scan_method.hpp | 2
   branches/release/boost/log/keywords/severity.hpp | 2
   branches/release/boost/log/keywords/start_thread.hpp | 2
   branches/release/boost/log/keywords/target.hpp | 2
   branches/release/boost/log/keywords/time_based_rotation.hpp | 2
   branches/release/boost/log/keywords/use_impl.hpp | 2
   branches/release/boost/log/sinks.hpp | 2
   branches/release/boost/log/sinks/async_frontend.hpp | 2
   branches/release/boost/log/sinks/attribute_mapping.hpp | 2
   branches/release/boost/log/sinks/basic_sink_backend.hpp | 8
   branches/release/boost/log/sinks/basic_sink_frontend.hpp | 2
   branches/release/boost/log/sinks/block_on_overflow.hpp | 2
   branches/release/boost/log/sinks/bounded_fifo_queue.hpp | 2
   branches/release/boost/log/sinks/bounded_ordering_queue.hpp | 2
   branches/release/boost/log/sinks/debug_output_backend.hpp | 2
   branches/release/boost/log/sinks/drop_on_overflow.hpp | 2
   branches/release/boost/log/sinks/event_log_backend.hpp | 2
   branches/release/boost/log/sinks/event_log_constants.hpp | 2
   branches/release/boost/log/sinks/frontend_requirements.hpp | 2
   branches/release/boost/log/sinks/sink.hpp | 6
   branches/release/boost/log/sinks/sync_frontend.hpp | 2
   branches/release/boost/log/sinks/syslog_backend.hpp | 2
   branches/release/boost/log/sinks/syslog_constants.hpp | 2
   branches/release/boost/log/sinks/text_file_backend.hpp | 8
   branches/release/boost/log/sinks/text_multifile_backend.hpp | 2
   branches/release/boost/log/sinks/text_ostream_backend.hpp | 2
   branches/release/boost/log/sinks/unbounded_fifo_queue.hpp | 2
   branches/release/boost/log/sinks/unbounded_ordering_queue.hpp | 2
   branches/release/boost/log/sinks/unlocked_frontend.hpp | 2
   branches/release/boost/log/sources/basic_logger.hpp | 6
   branches/release/boost/log/sources/channel_feature.hpp | 2
   branches/release/boost/log/sources/channel_logger.hpp | 2
   branches/release/boost/log/sources/exception_handler_feature.hpp | 2
   branches/release/boost/log/sources/features.hpp | 2
   branches/release/boost/log/sources/global_logger_storage.hpp | 12
   branches/release/boost/log/sources/logger.hpp | 2
   branches/release/boost/log/sources/record_ostream.hpp | 14
   branches/release/boost/log/sources/severity_channel_logger.hpp | 2
   branches/release/boost/log/sources/severity_feature.hpp | 4
   branches/release/boost/log/sources/severity_logger.hpp | 2
   branches/release/boost/log/sources/threading_models.hpp | 2
   branches/release/boost/log/support/date_time.hpp | 12
   branches/release/boost/log/support/exception.hpp | 2
   branches/release/boost/log/support/regex.hpp | 2
   branches/release/boost/log/support/spirit_classic.hpp | 2
   branches/release/boost/log/support/spirit_qi.hpp | 2
   branches/release/boost/log/support/xpressive.hpp | 2
   branches/release/boost/log/trivial.hpp | 21
   branches/release/boost/log/utility/empty_deleter.hpp | 2
   branches/release/boost/log/utility/exception_handler.hpp | 2
   branches/release/boost/log/utility/explicit_operator_bool.hpp | 8
   branches/release/boost/log/utility/formatting_ostream.hpp | 10
   branches/release/boost/log/utility/formatting_ostream_fwd.hpp | 2
   branches/release/boost/log/utility/functional.hpp | 2
   branches/release/boost/log/utility/functional/as_action.hpp | 6
   branches/release/boost/log/utility/functional/begins_with.hpp | 2
   branches/release/boost/log/utility/functional/bind.hpp | 14
   branches/release/boost/log/utility/functional/bind_assign.hpp | 4
   branches/release/boost/log/utility/functional/bind_output.hpp | 4
   branches/release/boost/log/utility/functional/bind_to_log.hpp | 6
   branches/release/boost/log/utility/functional/contains.hpp | 2
   branches/release/boost/log/utility/functional/ends_with.hpp | 2
   branches/release/boost/log/utility/functional/fun_ref.hpp | 4
   branches/release/boost/log/utility/functional/in_range.hpp | 2
   branches/release/boost/log/utility/functional/logical.hpp | 2
   branches/release/boost/log/utility/functional/matches.hpp | 2
   branches/release/boost/log/utility/functional/nop.hpp | 2
   branches/release/boost/log/utility/functional/save_result.hpp | 4
   branches/release/boost/log/utility/intrusive_ref_counter.hpp | 2
   branches/release/boost/log/utility/manipulators.hpp | 2
   branches/release/boost/log/utility/manipulators/add_value.hpp | 2
   branches/release/boost/log/utility/manipulators/dump.hpp | 10
   branches/release/boost/log/utility/manipulators/to_log.hpp | 2
   branches/release/boost/log/utility/once_block.hpp | 10
   branches/release/boost/log/utility/record_ordering.hpp | 2
   branches/release/boost/log/utility/setup.hpp | 2
   branches/release/boost/log/utility/setup/common_attributes.hpp | 2
   branches/release/boost/log/utility/setup/console.hpp | 2
   branches/release/boost/log/utility/setup/file.hpp | 2
   branches/release/boost/log/utility/setup/filter_parser.hpp | 8
   branches/release/boost/log/utility/setup/formatter_parser.hpp | 8
   branches/release/boost/log/utility/setup/from_settings.hpp | 8
   branches/release/boost/log/utility/setup/from_stream.hpp | 2
   branches/release/boost/log/utility/setup/settings.hpp | 10
   branches/release/boost/log/utility/setup/settings_parser.hpp | 2
   branches/release/boost/log/utility/strictest_lock.hpp | 2
   branches/release/boost/log/utility/string_literal.hpp | 2
   branches/release/boost/log/utility/string_literal_fwd.hpp | 2
   branches/release/boost/log/utility/type_dispatch/date_time_types.hpp | 2
   branches/release/boost/log/utility/type_dispatch/dynamic_type_dispatcher.hpp | 2
   branches/release/boost/log/utility/type_dispatch/standard_types.hpp | 2
   branches/release/boost/log/utility/type_dispatch/static_type_dispatcher.hpp | 20
   branches/release/boost/log/utility/type_dispatch/type_dispatcher.hpp | 8
   branches/release/boost/log/utility/type_info_wrapper.hpp | 4
   branches/release/boost/log/utility/unique_identifier_name.hpp | 2
   branches/release/boost/log/utility/unused_variable.hpp | 4
   branches/release/boost/log/utility/value_ref.hpp | 6
   branches/release/boost/log/utility/value_ref_fwd.hpp | 2
   branches/release/libs/log/build/Jamfile.v2 | 2
   branches/release/libs/log/doc/Jamfile.v2 | 8
   branches/release/libs/log/doc/changelog.qbk | 7
   branches/release/libs/log/doc/log.qbk | 2
   branches/release/libs/log/example/doc/tutorial_fmt_stream.cpp | 6
   branches/release/libs/log/src/alignment_gap_between.hpp | 2
   branches/release/libs/log/src/atomic_queue.hpp | 2
   branches/release/libs/log/src/attribute_name.cpp | 2
   branches/release/libs/log/src/attribute_set.cpp | 2
   branches/release/libs/log/src/attribute_set_impl.hpp | 2
   branches/release/libs/log/src/attribute_value_set.cpp | 6
   branches/release/libs/log/src/code_conversion.cpp | 2
   branches/release/libs/log/src/core.cpp | 8
   branches/release/libs/log/src/date_time_format_parser.cpp | 2
   branches/release/libs/log/src/default_attribute_names.cpp | 2
   branches/release/libs/log/src/default_filter_factory.cpp | 317 +++++++--------
   branches/release/libs/log/src/default_filter_factory.hpp | 47 +
   branches/release/libs/log/src/default_formatter_factory.cpp | 2
   branches/release/libs/log/src/default_formatter_factory.hpp | 2
   branches/release/libs/log/src/default_sink.cpp | 2
   branches/release/libs/log/src/default_sink.hpp | 4
   branches/release/libs/log/src/dump.cpp | 2
   branches/release/libs/log/src/dump_avx2.cpp | 13
   branches/release/libs/log/src/dump_ssse3.cpp | 9
   branches/release/libs/log/src/event.cpp | 27
   branches/release/libs/log/src/event_log_registry.hpp | 2
   branches/release/libs/log/src/exceptions.cpp | 2
   branches/release/libs/log/src/filter_parser.cpp | 356 ++++++++++-------
   branches/release/libs/log/src/format_parser.cpp | 2
   branches/release/libs/log/src/formatter_parser.cpp | 292 ++++++++------
   branches/release/libs/log/src/global_logger_storage.cpp | 2
   branches/release/libs/log/src/init_from_settings.cpp | 2
   branches/release/libs/log/src/init_from_stream.cpp | 2
   branches/release/libs/log/src/light_rw_mutex.cpp | 2
   branches/release/libs/log/src/matches_relation_factory.cpp | 157 +++++++
   branches/release/libs/log/src/named_scope.cpp | 8
   branches/release/libs/log/src/named_scope_format_parser.cpp | 4
   branches/release/libs/log/src/once_block.cpp | 2
   branches/release/libs/log/src/parser_utils.cpp | 205 +++++++++
   branches/release/libs/log/src/parser_utils.hpp | 32 +
   branches/release/libs/log/src/process_id.cpp | 2
   branches/release/libs/log/src/process_name.cpp | 2
   branches/release/libs/log/src/record_ostream.cpp | 2
   branches/release/libs/log/src/settings_parser.cpp | 221 +++++-----
   branches/release/libs/log/src/severity_level.cpp | 2
   branches/release/libs/log/src/spirit_encoding.cpp | 2
   branches/release/libs/log/src/spirit_encoding.hpp | 4
   branches/release/libs/log/src/stateless_allocator.hpp | 4
   branches/release/libs/log/src/syslog_backend.cpp | 2
   branches/release/libs/log/src/text_file_backend.cpp | 2
   branches/release/libs/log/src/text_ostream_backend.cpp | 2
   branches/release/libs/log/src/thread_id.cpp | 2
   branches/release/libs/log/src/thread_specific.cpp | 2
   branches/release/libs/log/src/threadsafe_queue.cpp | 9
   branches/release/libs/log/src/timer.cpp | 60 --
   branches/release/libs/log/src/timestamp.cpp | 26
   branches/release/libs/log/src/trivial.cpp | 2
   branches/release/libs/log/src/unhandled_exception_count.cpp | 2
   branches/release/libs/log/src/windows_version.hpp | 2
   branches/release/libs/log/test/Jamfile.v2 | 1
   branches/release/libs/log/test/run/setup_filter_parser.cpp | 794 ++++++++++++++++++++++++++++++++++++++++
   branches/release/libs/log/test/run/setup_formatter_parser.cpp | 257 ++++++++++++
   branches/release/libs/log/test/run/setup_settings_parser.cpp | 294 ++++++++++++++
   294 files changed, 3158 insertions(+), 1436 deletions(-)

Modified: branches/release/boost/log/attributes.hpp
==============================================================================
--- branches/release/boost/log/attributes.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/attributes.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -31,7 +31,7 @@
#include <boost/log/attributes/current_thread_id.hpp>
#endif

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/attributes/attribute.hpp
==============================================================================
--- branches/release/boost/log/attributes/attribute.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/attributes/attribute.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -23,7 +23,7 @@
#include <boost/log/utility/explicit_operator_bool.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -66,7 +66,7 @@
      *
      * All attributes must derive their implementation from this class.
      */
- struct BOOST_LOG_NO_VTABLE BOOST_LOG_VISIBLE impl :
+ struct BOOST_LOG_NO_VTABLE BOOST_SYMBOL_VISIBLE impl :
         public intrusive_ref_counter
     {
         /*!
@@ -88,7 +88,7 @@
      * Default constructor. Creates an empty attribute value factory, which is not usable until
      * \c set_impl is called.
      */
- BOOST_LOG_DEFAULTED_FUNCTION(attribute(), {})
+ BOOST_DEFAULTED_FUNCTION(attribute(), {})

     /*!
      * Copy constructor

Modified: branches/release/boost/log/attributes/attribute_cast.hpp
==============================================================================
--- branches/release/boost/log/attributes/attribute_cast.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/attributes/attribute_cast.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -19,7 +19,7 @@
#include <boost/log/attributes/attribute.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/attributes/attribute_name.hpp
==============================================================================
--- branches/release/boost/log/attributes/attribute_name.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/attributes/attribute_name.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -23,7 +23,7 @@
#include <boost/log/utility/explicit_operator_bool.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/attributes/attribute_set.hpp
==============================================================================
--- branches/release/boost/log/attributes/attribute_set.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/attributes/attribute_set.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -25,7 +25,7 @@
#include <boost/log/attributes/attribute.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -120,8 +120,8 @@

         node_base();

- BOOST_LOG_DELETED_FUNCTION(node_base(node_base const&))
- BOOST_LOG_DELETED_FUNCTION(node_base& operator= (node_base const&))
+ BOOST_DELETED_FUNCTION(node_base(node_base const&))
+ BOOST_DELETED_FUNCTION(node_base& operator= (node_base const&))
     };

     //! Container elements

Modified: branches/release/boost/log/attributes/attribute_value.hpp
==============================================================================
--- branches/release/boost/log/attributes/attribute_value.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/attributes/attribute_value.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -27,7 +27,7 @@
#include <boost/log/attributes/value_visitation_fwd.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -115,7 +115,7 @@
     /*!
      * Default constructor. Creates an empty (absent) attribute value.
      */
- BOOST_LOG_DEFAULTED_FUNCTION(attribute_value(), {})
+ BOOST_DEFAULTED_FUNCTION(attribute_value(), {})

     /*!
      * Copy constructor

Modified: branches/release/boost/log/attributes/attribute_value_impl.hpp
==============================================================================
--- branches/release/boost/log/attributes/attribute_value_impl.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/attributes/attribute_value_impl.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -26,7 +26,7 @@
#endif
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/attributes/attribute_value_set.hpp
==============================================================================
--- branches/release/boost/log/attributes/attribute_value_set.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/attributes/attribute_value_set.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -29,7 +29,7 @@
#include <boost/log/expressions/keyword_fwd.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -104,8 +104,8 @@

         node_base();

- BOOST_LOG_DELETED_FUNCTION(node_base(node_base const&))
- BOOST_LOG_DELETED_FUNCTION(node_base& operator= (node_base const&))
+ BOOST_DELETED_FUNCTION(node_base(node_base const&))
+ BOOST_DELETED_FUNCTION(node_base& operator= (node_base const&))
     };

     //! Container elements

Modified: branches/release/boost/log/attributes/clock.hpp
==============================================================================
--- branches/release/boost/log/attributes/clock.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/attributes/clock.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -23,7 +23,7 @@
#include <boost/log/attributes/time_traits.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -54,7 +54,7 @@

protected:
     //! Attribute factory implementation
- struct BOOST_LOG_VISIBLE impl :
+ struct BOOST_SYMBOL_VISIBLE impl :
         public attribute::impl
     {
         attribute_value get_value()

Modified: branches/release/boost/log/attributes/constant.hpp
==============================================================================
--- branches/release/boost/log/attributes/constant.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/attributes/constant.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -25,7 +25,7 @@
#include <boost/log/attributes/attribute_value_impl.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -52,7 +52,7 @@

protected:
     //! Factory implementation
- class BOOST_LOG_VISIBLE impl :
+ class BOOST_SYMBOL_VISIBLE impl :
         public attribute_value_impl< value_type >
     {
         //! Base type

Modified: branches/release/boost/log/attributes/counter.hpp
==============================================================================
--- branches/release/boost/log/attributes/counter.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/attributes/counter.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -26,7 +26,7 @@
#endif // BOOST_LOG_NO_THREADS
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -57,7 +57,7 @@

protected:
     //! Base class for factory implementation
- class BOOST_LOG_NO_VTABLE BOOST_LOG_VISIBLE impl :
+ class BOOST_LOG_NO_VTABLE BOOST_SYMBOL_VISIBLE impl :
         public attribute::impl
     {
     };

Modified: branches/release/boost/log/attributes/current_process_id.hpp
==============================================================================
--- branches/release/boost/log/attributes/current_process_id.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/attributes/current_process_id.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -21,7 +21,7 @@
#include <boost/log/attributes/attribute_cast.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/attributes/current_process_name.hpp
==============================================================================
--- branches/release/boost/log/attributes/current_process_name.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/attributes/current_process_name.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -21,7 +21,7 @@
#include <boost/log/attributes/attribute_cast.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/attributes/current_thread_id.hpp
==============================================================================
--- branches/release/boost/log/attributes/current_thread_id.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/attributes/current_thread_id.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -17,7 +17,7 @@

#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -56,7 +56,7 @@

protected:
     //! Factory implementation
- class BOOST_LOG_VISIBLE impl :
+ class BOOST_SYMBOL_VISIBLE impl :
         public attribute_value::impl
     {
     public:

Modified: branches/release/boost/log/attributes/fallback_policy.hpp
==============================================================================
--- branches/release/boost/log/attributes/fallback_policy.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/attributes/fallback_policy.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -23,7 +23,7 @@
#include <boost/log/attributes/fallback_policy_fwd.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/attributes/fallback_policy_fwd.hpp
==============================================================================
--- branches/release/boost/log/attributes/fallback_policy_fwd.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/attributes/fallback_policy_fwd.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -17,7 +17,7 @@

#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/attributes/function.hpp
==============================================================================
--- branches/release/boost/log/attributes/function.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/attributes/function.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -26,7 +26,7 @@
#include <boost/log/attributes/attribute_value_impl.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -57,7 +57,7 @@

protected:
     //! Base class for factory implementation
- class BOOST_LOG_NO_VTABLE BOOST_LOG_VISIBLE impl :
+ class BOOST_LOG_NO_VTABLE BOOST_SYMBOL_VISIBLE impl :
         public attribute::impl
     {
     };

Modified: branches/release/boost/log/attributes/mutable_constant.hpp
==============================================================================
--- branches/release/boost/log/attributes/mutable_constant.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/attributes/mutable_constant.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -29,7 +29,7 @@
#include <boost/log/attributes/attribute_value_impl.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -90,7 +90,7 @@

protected:
     //! Factory implementation
- class BOOST_LOG_VISIBLE impl :
+ class BOOST_SYMBOL_VISIBLE impl :
         public attribute::impl
     {
     private:
@@ -223,7 +223,7 @@

protected:
     //! Factory implementation
- class BOOST_LOG_VISIBLE impl :
+ class BOOST_SYMBOL_VISIBLE impl :
         public attribute::impl
     {
     private:

Modified: branches/release/boost/log/attributes/named_scope.hpp
==============================================================================
--- branches/release/boost/log/attributes/named_scope.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/attributes/named_scope.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -30,7 +30,7 @@
#include <boost/log/attributes/attribute_cast.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -368,8 +368,8 @@
             named_scope::pop_scope();
         }

- BOOST_LOG_DELETED_FUNCTION(sentry(sentry const&))
- BOOST_LOG_DELETED_FUNCTION(sentry& operator= (sentry const&))
+ BOOST_DELETED_FUNCTION(sentry(sentry const&))
+ BOOST_DELETED_FUNCTION(sentry& operator= (sentry const&))

     private:
         scope_entry m_Entry;
@@ -377,7 +377,7 @@

private:
     //! Attribute implementation class
- struct BOOST_LOG_VISIBLE impl;
+ struct BOOST_SYMBOL_VISIBLE impl;

public:
     /*!

Modified: branches/release/boost/log/attributes/scoped_attribute.hpp
==============================================================================
--- branches/release/boost/log/attributes/scoped_attribute.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/attributes/scoped_attribute.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -30,7 +30,7 @@
#include <boost/log/utility/unique_identifier_name.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -99,7 +99,7 @@
     }

#ifndef BOOST_LOG_BROKEN_REFERENCE_FROM_RVALUE_INIT
- BOOST_LOG_DELETED_FUNCTION(scoped_logger_attribute(scoped_logger_attribute const&))
+ BOOST_DELETED_FUNCTION(scoped_logger_attribute(scoped_logger_attribute const&))
#else // BOOST_LOG_BROKEN_REFERENCE_FROM_RVALUE_INIT
     scoped_logger_attribute(scoped_logger_attribute const& that) : m_pLogger(that.m_pLogger), m_itAttribute(that.m_itAttribute)
     {
@@ -107,7 +107,7 @@
     }
#endif // BOOST_LOG_BROKEN_REFERENCE_FROM_RVALUE_INIT

- BOOST_LOG_DELETED_FUNCTION(scoped_logger_attribute& operator= (scoped_logger_attribute const&))
+ BOOST_DELETED_FUNCTION(scoped_logger_attribute& operator= (scoped_logger_attribute const&))
};

} // namespace aux
@@ -122,7 +122,7 @@
  * \return An unspecified guard object which may be used to initialize a \c scoped_attribute variable.
  */
template< typename LoggerT >
-BOOST_LOG_FORCEINLINE aux::scoped_logger_attribute< LoggerT > add_scoped_logger_attribute(LoggerT& l, attribute_name const& name, attribute const& attr)
+BOOST_FORCEINLINE aux::scoped_logger_attribute< LoggerT > add_scoped_logger_attribute(LoggerT& l, attribute_name const& name, attribute const& attr)
{
#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
     return aux::scoped_logger_attribute< LoggerT >(l, name, attr);
@@ -194,7 +194,7 @@
     }

#ifndef BOOST_LOG_BROKEN_REFERENCE_FROM_RVALUE_INIT
- BOOST_LOG_DELETED_FUNCTION(scoped_thread_attribute(scoped_thread_attribute const&))
+ BOOST_DELETED_FUNCTION(scoped_thread_attribute(scoped_thread_attribute const&))
#else // BOOST_LOG_BROKEN_REFERENCE_FROM_RVALUE_INIT
     scoped_thread_attribute(scoped_thread_attribute const& that) : m_itAttribute(that.m_itAttribute)
     {
@@ -202,7 +202,7 @@
     }
#endif // BOOST_LOG_BROKEN_REFERENCE_FROM_RVALUE_INIT

- BOOST_LOG_DELETED_FUNCTION(scoped_thread_attribute& operator= (scoped_thread_attribute const&))
+ BOOST_DELETED_FUNCTION(scoped_thread_attribute& operator= (scoped_thread_attribute const&))
};

} // namespace aux
@@ -215,7 +215,7 @@
  * \param attr The attribute. Must not be NULL.
  * \return An unspecified guard object which may be used to initialize a \c scoped_attribute variable.
  */
-BOOST_LOG_FORCEINLINE aux::scoped_thread_attribute add_scoped_thread_attribute(attribute_name const& name, attribute const& attr)
+BOOST_FORCEINLINE aux::scoped_thread_attribute add_scoped_thread_attribute(attribute_name const& name, attribute const& attr)
{
#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
     return aux::scoped_thread_attribute(name, attr);

Modified: branches/release/boost/log/attributes/time_traits.hpp
==============================================================================
--- branches/release/boost/log/attributes/time_traits.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/attributes/time_traits.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -20,7 +20,7 @@
#include <boost/log/detail/config.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/attributes/timer.hpp
==============================================================================
--- branches/release/boost/log/attributes/timer.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/attributes/timer.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -21,7 +21,7 @@
#include <boost/log/attributes/time_traits.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -59,7 +59,7 @@

private:
//! Factory implementation
- class BOOST_LOG_VISIBLE impl;
+ class BOOST_SYMBOL_VISIBLE impl;

public:
/*!

Modified: branches/release/boost/log/attributes/value_extraction.hpp
==============================================================================
--- branches/release/boost/log/attributes/value_extraction.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/attributes/value_extraction.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -40,7 +40,7 @@
#include <boost/log/utility/type_dispatch/static_type_dispatcher.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -137,14 +137,14 @@

//! The function unwraps \c value_ref, if possible
template< typename T, typename TagT >
-BOOST_LOG_FORCEINLINE typename enable_if< mpl::is_sequence< T >, value_ref< T, TagT > >::type
+BOOST_FORCEINLINE typename enable_if< mpl::is_sequence< T >, value_ref< T, TagT > >::type
unwrap_value_ref(value_ref< T, TagT > const& r)
{
     return r;
}

template< typename T, typename TagT >
-BOOST_LOG_FORCEINLINE typename disable_if< mpl::is_sequence< T >, T const& >::type
+BOOST_FORCEINLINE typename disable_if< mpl::is_sequence< T >, T const& >::type
unwrap_value_ref(value_ref< T, TagT > const& r)
{
     return r.get();
@@ -175,7 +175,7 @@
     /*!
      * Default constructor
      */
- BOOST_LOG_DEFAULTED_FUNCTION(value_extractor(), {})
+ BOOST_DEFAULTED_FUNCTION(value_extractor(), {})

     /*!
      * Copy constructor

Modified: branches/release/boost/log/attributes/value_extraction_fwd.hpp
==============================================================================
--- branches/release/boost/log/attributes/value_extraction_fwd.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/attributes/value_extraction_fwd.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -19,7 +19,7 @@
#include <boost/log/detail/config.hpp>
#include <boost/log/attributes/fallback_policy_fwd.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/attributes/value_visitation.hpp
==============================================================================
--- branches/release/boost/log/attributes/value_visitation.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/attributes/value_visitation.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -30,7 +30,7 @@
#include <boost/log/utility/type_dispatch/static_type_dispatcher.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -115,7 +115,7 @@
     /*!
      * Default constructor
      */
- BOOST_LOG_DEFAULTED_FUNCTION(value_visitor_invoker(), {})
+ BOOST_DEFAULTED_FUNCTION(value_visitor_invoker(), {})

     /*!
      * Copy constructor

Modified: branches/release/boost/log/attributes/value_visitation_fwd.hpp
==============================================================================
--- branches/release/boost/log/attributes/value_visitation_fwd.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/attributes/value_visitation_fwd.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -19,7 +19,7 @@
#include <boost/log/detail/config.hpp>
#include <boost/log/attributes/fallback_policy_fwd.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/common.hpp
==============================================================================
--- branches/release/boost/log/common.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/common.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -34,7 +34,7 @@
#include <boost/log/attributes/named_scope.hpp>
#include <boost/log/attributes/scoped_attribute.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/core.hpp
==============================================================================
--- branches/release/boost/log/core.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/core.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -21,7 +21,7 @@
#include <boost/log/core/record.hpp>
#include <boost/log/core/record_view.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/core/core.hpp
==============================================================================
--- branches/release/boost/log/core/core.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/core/core.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -28,7 +28,7 @@
#include <boost/log/expressions/filter.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -288,7 +288,7 @@
      * \b Throws: If an exception handler is installed, only throws if the handler throws. Otherwise may
      * throw if one of the sinks throws, or some system resource limitation is reached.
      */
- BOOST_LOG_FORCEINLINE record open_record(BOOST_RV_REF(attribute_value_set) source_attributes)
+ BOOST_FORCEINLINE record open_record(BOOST_RV_REF(attribute_value_set) source_attributes)
     {
         return open_record_move(static_cast< attribute_value_set& >(source_attributes));
     }
@@ -303,13 +303,13 @@
      * \b Throws: If an exception handler is installed, only throws if the handler throws. Otherwise may
      * throw if one of the sinks throws.
      */
- BOOST_LOG_FORCEINLINE void push_record(BOOST_RV_REF(record) rec)
+ BOOST_FORCEINLINE void push_record(BOOST_RV_REF(record) rec)
     {
         push_record_move(static_cast< record& >(rec));
     }

- BOOST_LOG_DELETED_FUNCTION(core(core const&))
- BOOST_LOG_DELETED_FUNCTION(core& operator= (core const&))
+ BOOST_DELETED_FUNCTION(core(core const&))
+ BOOST_DELETED_FUNCTION(core& operator= (core const&))

#ifndef BOOST_LOG_DOXYGEN_PASS
private:

Modified: branches/release/boost/log/core/record.hpp
==============================================================================
--- branches/release/boost/log/core/record.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/core/record.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -23,7 +23,7 @@
#include <boost/log/core/record_view.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/core/record_view.hpp
==============================================================================
--- branches/release/boost/log/core/record_view.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/core/record_view.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -26,7 +26,7 @@
#endif // BOOST_LOG_NO_THREADS
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -85,8 +85,8 @@
     protected:
         ~public_data() {}

- BOOST_LOG_DELETED_FUNCTION(public_data(public_data const&))
- BOOST_LOG_DELETED_FUNCTION(public_data& operator= (public_data const&))
+ BOOST_DELETED_FUNCTION(public_data(public_data const&))
+ BOOST_DELETED_FUNCTION(public_data& operator= (public_data const&))

         friend void intrusive_ptr_add_ref(const public_data* p) { ++p->m_ref_counter; }
         friend void intrusive_ptr_release(const public_data* p) { if (--p->m_ref_counter == 0) public_data::destroy(p); }
@@ -108,7 +108,7 @@
      *
      * \post <tt>!*this == true</tt>
      */
- BOOST_LOG_DEFAULTED_FUNCTION(record_view(), {})
+ BOOST_DEFAULTED_FUNCTION(record_view(), {})

     /*!
      * Copy constructor

Deleted: branches/release/boost/log/detail/alignas.hpp
==============================================================================
--- branches/release/boost/log/detail/alignas.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85460)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,45 +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 alignas.hpp
- * \author Andrey Semashev
- * \date 06.07.2012
- *
- * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
- */
-
-#ifndef BOOST_LOG_DETAIL_ALIGNAS_HPP_INCLUDED_
-#define BOOST_LOG_DETAIL_ALIGNAS_HPP_INCLUDED_
-
-#include <boost/log/detail/config.hpp>
-
-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
-#pragma once
-#endif
-
-// The macro allows to specify type or variable alignment
-#if defined(_MSC_VER)
-#define BOOST_LOG_ALIGNAS(x) __declspec(align(x))
-#elif defined(BOOST_CLANG)
-#if __has_feature(cxx_alignas) || __has_extension(cxx_alignas)
-#define BOOST_LOG_ALIGNAS(x) alignas(x)
-#endif
-#elif defined(__GNUC__)
-#if defined(__GXX_EXPERIMENTAL_CXX0X__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8))
-#define BOOST_LOG_ALIGNAS(x) alignas(x)
-#else
-#define BOOST_LOG_ALIGNAS(x) __attribute__((__aligned__(x)))
-#endif
-#endif
-
-#if !defined(BOOST_LOG_ALIGNAS)
-#define BOOST_LOG_NO_ALIGNAS 1
-#define BOOST_LOG_ALIGNAS(x)
-#endif
-
-#endif // BOOST_LOG_DETAIL_ALIGNAS_HPP_INCLUDED_

Modified: branches/release/boost/log/detail/asio_fwd.hpp
==============================================================================
--- branches/release/boost/log/detail/asio_fwd.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/asio_fwd.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 20.04.2008
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  *
  * The header provides forward declarations of Boost.ASIO that are required for the user's
  * code to compile with Boost.Log. The forward declarations allow to avoid including the major
@@ -22,7 +22,7 @@

#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/detail/attachable_sstream_buf.hpp
==============================================================================
--- branches/release/boost/log/detail/attachable_sstream_buf.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/attachable_sstream_buf.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 29.07.2007
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_ATTACHABLE_SSTREAM_BUF_HPP_INCLUDED_
@@ -24,7 +24,7 @@
#include <boost/log/detail/config.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -156,9 +156,9 @@
     }

     //! Copy constructor (closed)
- BOOST_LOG_DELETED_FUNCTION(basic_ostringstreambuf(basic_ostringstreambuf const& that))
+ BOOST_DELETED_FUNCTION(basic_ostringstreambuf(basic_ostringstreambuf const& that))
     //! Assignment (closed)
- BOOST_LOG_DELETED_FUNCTION(basic_ostringstreambuf& operator= (basic_ostringstreambuf const& that))
+ BOOST_DELETED_FUNCTION(basic_ostringstreambuf& operator= (basic_ostringstreambuf const& that))
};

} // namespace aux

Modified: branches/release/boost/log/detail/attr_output_impl.hpp
==============================================================================
--- branches/release/boost/log/detail/attr_output_impl.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/attr_output_impl.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 12.08.2012
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_DETAIL_ATTR_OUTPUT_IMPL_HPP_INCLUDED_
@@ -24,7 +24,7 @@
#include <boost/log/detail/attr_output_terminal.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -44,7 +44,7 @@

     //! Creates the output expression
     template< typename RightT >
- static BOOST_LOG_FORCEINLINE type make(LeftT const& left, RightT const& right)
+ static BOOST_FORCEINLINE type make(LeftT const& left, RightT const& right)
     {
         return type(left, right.get_name(), to_log_fun< TagT >(), right.get_fallback_policy());
     }
@@ -65,7 +65,7 @@

     typedef ActorT< typename make_expression::type > type;

- static BOOST_LOG_FORCEINLINE type make(ActorT< LeftExprT > const& left, RightT const& right)
+ static BOOST_FORCEINLINE type make(ActorT< LeftExprT > const& left, RightT const& right)
     {
         type res = {{ make_expression::make(left, right) }};
         return res;
@@ -79,7 +79,7 @@

     typedef ActorT< expression_type > type;

- static BOOST_LOG_FORCEINLINE type make(ActorT< LeftExprT > const& left, RightT const& right)
+ static BOOST_FORCEINLINE type make(ActorT< LeftExprT > const& left, RightT const& right)
     {
         type res = {{ expression_type(left, right.get_name(), to_log_fun< typename RightT::tag_type >(), right.get_fallback_policy()) }};
         return res;
@@ -90,7 +90,7 @@

#define BOOST_LOG_AUX_OVERLOAD(left_ref, right_ref)\
     template< typename LeftExprT, typename T, typename FallbackPolicyT, typename TagT >\
- BOOST_LOG_FORCEINLINE typename aux::make_output_actor< phoenix::actor< LeftExprT >, attribute_actor< T, FallbackPolicyT, TagT, phoenix::actor > >::type\
+ BOOST_FORCEINLINE typename aux::make_output_actor< phoenix::actor< LeftExprT >, attribute_actor< T, FallbackPolicyT, TagT, phoenix::actor > >::type\
     operator<< (phoenix::actor< LeftExprT > left_ref left, attribute_actor< T, FallbackPolicyT, TagT, phoenix::actor > right_ref right)\
     {\
         return aux::make_output_actor< phoenix::actor< LeftExprT >, attribute_actor< T, FallbackPolicyT, TagT, phoenix::actor > >::make(left, right);\

Modified: branches/release/boost/log/detail/attr_output_terminal.hpp
==============================================================================
--- branches/release/boost/log/detail/attr_output_terminal.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/attr_output_terminal.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -31,7 +31,7 @@
#include <boost/log/utility/functional/bind.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -139,7 +139,7 @@
return strm;
}

- BOOST_LOG_DELETED_FUNCTION(attribute_output_terminal())
+ BOOST_DELETED_FUNCTION(attribute_output_terminal())
};

} // namespace aux

Modified: branches/release/boost/log/detail/attribute_get_value_impl.hpp
==============================================================================
--- branches/release/boost/log/detail/attribute_get_value_impl.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/attribute_get_value_impl.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 04.08.2012
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_DETAIL_ATTRIBUTE_GET_VALUE_IMPL_HPP_INCLUDED_
@@ -21,7 +21,7 @@
#include <boost/log/attributes/attribute_value.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/detail/attribute_predicate.hpp
==============================================================================
--- branches/release/boost/log/detail/attribute_predicate.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/attribute_predicate.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -25,7 +25,7 @@
#include <boost/log/utility/functional/save_result.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/detail/cleanup_scope_guard.hpp
==============================================================================
--- branches/release/boost/log/detail/cleanup_scope_guard.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/cleanup_scope_guard.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 11.03.2008
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_DETAIL_CLEANUP_SCOPE_GUARD_HPP_INCLUDED_
@@ -19,7 +19,7 @@
#include <boost/log/detail/config.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -37,8 +37,8 @@
     ~cleanup_guard() { m_Obj.clear(); }

     // Copying prohibited
- BOOST_LOG_DELETED_FUNCTION(cleanup_guard(cleanup_guard const&))
- BOOST_LOG_DELETED_FUNCTION(cleanup_guard& operator= (cleanup_guard const&))
+ BOOST_DELETED_FUNCTION(cleanup_guard(cleanup_guard const&))
+ BOOST_DELETED_FUNCTION(cleanup_guard& operator= (cleanup_guard const&))

private:
     T& m_Obj;

Modified: branches/release/boost/log/detail/code_conversion.hpp
==============================================================================
--- branches/release/boost/log/detail/code_conversion.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/code_conversion.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 08.11.2008
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_DETAIL_CODE_CONVERSION_HPP_INCLUDED_
@@ -21,7 +21,7 @@
#include <boost/log/detail/config.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/detail/config.hpp
==============================================================================
--- branches/release/boost/log/detail/config.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/config.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 08.03.2007
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html. In this file
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html. In this file
  * internal configuration macros are defined.
  */

@@ -39,11 +39,7 @@
# endif
#endif

-#if (defined(_MSC_VER) && (_MSC_VER >= 1020)) || defined(__GNUC__) || defined(BOOST_CLANG) || defined(BOOST_INTEL) || defined(__COMO__) || defined(__DMC__)
-# define BOOST_LOG_HAS_PRAGMA_ONCE
-#endif
-
-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -120,39 +116,11 @@
# define BOOST_LOG_ANONYMOUS_NAMESPACE namespace
#endif

-#define BOOST_LOG_NO_TRAILING_RESULT_TYPE
-#define BOOST_LOG_NO_INLINE_NAMESPACES
-
-#if defined(BOOST_CLANG)
-# if __has_feature(cxx_trailing_return)
-# undef BOOST_LOG_NO_TRAILING_RESULT_TYPE
-# endif
-# if __has_feature(cxx_inline_namespaces)
-# undef BOOST_LOG_NO_INLINE_NAMESPACES
-# endif
-#elif defined(__GNUC__) && defined(__GXX_EXPERIMENTAL_CXX0X__)
-# if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4))
-# undef BOOST_LOG_NO_TRAILING_RESULT_TYPE
-# undef BOOST_LOG_NO_INLINE_NAMESPACES
-# endif
-#endif
-
#if defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || (defined(__GNUC__) && (__GNUC__ == 4 && __GNUC_MINOR__ <= 6))
// GCC up to 4.6 (inclusively) did not support expanding template argument packs into non-variadic template arguments
#define BOOST_LOG_NO_CXX11_ARG_PACKS_TO_NON_VARIADIC_ARGS_EXPANSION
#endif

-// Extended declaration macros. Used to implement compiler-specific optimizations.
-#if defined(BOOST_FORCEINLINE)
-# define BOOST_LOG_FORCEINLINE BOOST_FORCEINLINE
-#elif defined(_MSC_VER)
-# define BOOST_LOG_FORCEINLINE __forceinline
-#elif defined(__GNUC__) && (__GNUC__ > 3)
-# define BOOST_LOG_FORCEINLINE inline __attribute__((always_inline))
-#else
-# define BOOST_LOG_FORCEINLINE inline
-#endif
-
#if defined(_MSC_VER)
# define BOOST_LOG_NO_VTABLE __declspec(novtable)
#elif defined(__GNUC__)
@@ -206,14 +174,6 @@
# define BOOST_LOG_HAS_CXXABI_H
#endif

-#if defined(BOOST_SYMBOL_VISIBLE)
-# define BOOST_LOG_VISIBLE BOOST_SYMBOL_VISIBLE
-#elif defined(__GNUC__) && (__GNUC__ >= 4)
-# define BOOST_LOG_VISIBLE __attribute__((visibility("default")))
-#else
-# define BOOST_LOG_VISIBLE
-#endif
-
#if !defined(BOOST_LOG_BUILDING_THE_LIB)

// Detect if we're dealing with dll
@@ -269,7 +229,7 @@
# endif
# endif
# ifndef BOOST_LOG_API
-# define BOOST_LOG_API BOOST_LOG_VISIBLE
+# define BOOST_LOG_API BOOST_SYMBOL_VISIBLE
# endif

#endif // !defined(BOOST_LOG_BUILDING_THE_LIB)
@@ -312,23 +272,6 @@
# endif
#endif // defined(BOOST_LOG_USE_COMPILER_TLS)

-#if defined(__GNUC__) && (__GNUC__ == 4 && __GNUC_MINOR__ <= 5)
- // GCC 4.5 forbids declaration of defaulted functions in private or protected sections
-# define BOOST_LOG_NO_CXX11_NON_PUBLIC_DEFAULTED_FUNCTIONS
-#endif
-
-#if defined(BOOST_LOG_DOXYGEN_PASS) || !(defined(BOOST_NO_CXX11_DEFAULTED_FUNCTIONS) || defined(BOOST_LOG_NO_CXX11_NON_PUBLIC_DEFAULTED_FUNCTIONS))
-# define BOOST_LOG_DEFAULTED_FUNCTION(fun, body) fun = default;
-#else
-# define BOOST_LOG_DEFAULTED_FUNCTION(fun, body) fun body
-#endif
-
-#if defined(BOOST_LOG_DOXYGEN_PASS) || !defined(BOOST_NO_CXX11_DELETED_FUNCTIONS)
-# define BOOST_LOG_DELETED_FUNCTION(fun) fun = delete;
-#else
-# define BOOST_LOG_DELETED_FUNCTION(fun) private: fun;
-#endif
-
namespace boost {

// Setup namespace name
@@ -370,7 +313,7 @@

namespace log {

-# if !defined(BOOST_LOG_NO_INLINE_NAMESPACES)
+# if !defined(BOOST_NO_CXX11_INLINE_NAMESPACES)

inline namespace BOOST_LOG_VERSION_NAMESPACE {}
}

Modified: branches/release/boost/log/detail/custom_terminal_spec.hpp
==============================================================================
--- branches/release/boost/log/detail/custom_terminal_spec.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/custom_terminal_spec.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -25,7 +25,7 @@
#include <boost/log/detail/config.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/detail/date_time_fmt_gen_traits_fwd.hpp
==============================================================================
--- branches/release/boost/log/detail/date_time_fmt_gen_traits_fwd.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/date_time_fmt_gen_traits_fwd.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 07.11.2012
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_DETAIL_DATE_TIME_FMT_GEN_TRAITS_FWD_HPP_INCLUDED_
@@ -18,7 +18,7 @@

#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/detail/date_time_format_parser.hpp
==============================================================================
--- branches/release/boost/log/detail/date_time_format_parser.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/date_time_format_parser.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -21,7 +21,7 @@
#include <boost/log/detail/config.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/detail/decomposed_time.hpp
==============================================================================
--- branches/release/boost/log/detail/decomposed_time.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/decomposed_time.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 07.11.2012
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_DETAIL_DECOMPOSED_TIME_HPP_INCLUDED_
@@ -28,7 +28,7 @@
#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

@@ -100,7 +100,7 @@
     typedef T value_type;
     value_type m_time;

- BOOST_LOG_DEFAULTED_FUNCTION(decomposed_time_wrapper(), {})
+ BOOST_DEFAULTED_FUNCTION(decomposed_time_wrapper(), {})

     explicit decomposed_time_wrapper(value_type const& time) : m_time(time)
     {
@@ -144,8 +144,8 @@
         {
         }

- BOOST_LOG_DELETED_FUNCTION(context(context const&))
- BOOST_LOG_DELETED_FUNCTION(context& operator=(context const&))
+ BOOST_DELETED_FUNCTION(context(context const&))
+ BOOST_DELETED_FUNCTION(context& operator=(context const&))
     };

private:
@@ -159,7 +159,7 @@
     string_type m_literal_chars;

public:
- BOOST_LOG_DEFAULTED_FUNCTION(date_time_formatter(), {})
+ BOOST_DEFAULTED_FUNCTION(date_time_formatter(), {})
     date_time_formatter(date_time_formatter const& that) :
         m_formatters(that.m_formatters),
         m_literal_lens(that.m_literal_lens),

Modified: branches/release/boost/log/detail/deduce_char_type.hpp
==============================================================================
--- branches/release/boost/log/detail/deduce_char_type.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/deduce_char_type.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 17.11.2012
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_DETAIL_DEDUCE_CHAR_TYPE_HPP_INCLUDED_
@@ -19,7 +19,7 @@
#include <boost/log/detail/config.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/detail/default_attribute_names.hpp
==============================================================================
--- branches/release/boost/log/detail/default_attribute_names.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/default_attribute_names.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 15.01.2012
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_DETAIL_DEFAULT_ATTRIBUTE_NAMES_HPP_INCLUDED_
@@ -20,7 +20,7 @@
#include <boost/log/attributes/attribute_name.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/detail/embedded_string_type.hpp
==============================================================================
--- branches/release/boost/log/detail/embedded_string_type.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/embedded_string_type.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 16.08.2009
  *
  * This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_DETAIL_EMBEDDED_STRING_TYPE_HPP_INCLUDED_
@@ -21,7 +21,7 @@
#include <boost/log/detail/config.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/detail/event.hpp
==============================================================================
--- branches/release/boost/log/detail/event.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/event.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -15,7 +15,7 @@

#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -67,10 +67,9 @@
     //! Sets the object to a signalled state
     BOOST_LOG_API void set_signalled();

-private:
     // Copying prohibited
- sem_based_event(sem_based_event const&);
- sem_based_event& operator= (sem_based_event const&);
+ BOOST_DELETED_FUNCTION(sem_based_event(sem_based_event const&))
+ BOOST_DELETED_FUNCTION(sem_based_event& operator= (sem_based_event const&))
};

typedef sem_based_event event;
@@ -94,10 +93,9 @@
     //! Sets the object to a signalled state
     BOOST_LOG_API void set_signalled();

-private:
     // Copying prohibited
- winapi_based_event(winapi_based_event const&);
- winapi_based_event& operator= (winapi_based_event const&);
+ BOOST_DELETED_FUNCTION(winapi_based_event(winapi_based_event const&))
+ BOOST_DELETED_FUNCTION(winapi_based_event& operator= (winapi_based_event const&))
};

typedef winapi_based_event event;
@@ -122,10 +120,9 @@
     //! Sets the object to a signalled state
     BOOST_LOG_API void set_signalled();

-private:
     // Copying prohibited
- generic_event(generic_event const&);
- generic_event& operator= (generic_event const&);
+ BOOST_DELETED_FUNCTION(generic_event(generic_event const&))
+ BOOST_DELETED_FUNCTION(generic_event& operator= (generic_event const&))
};

typedef generic_event event;

Modified: branches/release/boost/log/detail/fake_mutex.hpp
==============================================================================
--- branches/release/boost/log/detail/fake_mutex.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/fake_mutex.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 31.07.2011
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_DETAIL_FAKE_MUTEX_HPP_INCLUDED_
@@ -19,7 +19,7 @@
#include <boost/log/detail/config.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -33,7 +33,7 @@
class fake_mutex
{
public:
- BOOST_LOG_DEFAULTED_FUNCTION(fake_mutex(), {})
+ BOOST_DEFAULTED_FUNCTION(fake_mutex(), {})
     void lock() {}
     bool try_lock() { return true; }
     template< typename T >
@@ -41,8 +41,8 @@
     void unlock() {}

     // Copying prohibited
- BOOST_LOG_DELETED_FUNCTION(fake_mutex(fake_mutex const&))
- BOOST_LOG_DELETED_FUNCTION(fake_mutex& operator=(fake_mutex const&))
+ BOOST_DELETED_FUNCTION(fake_mutex(fake_mutex const&))
+ BOOST_DELETED_FUNCTION(fake_mutex& operator=(fake_mutex const&))
};

} // namespace aux

Modified: branches/release/boost/log/detail/footer.hpp
==============================================================================
--- branches/release/boost/log/detail/footer.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/footer.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -8,7 +8,13 @@
#if !defined(BOOST_LOG_ENABLE_WARNINGS)

#if defined(_MSC_VER)
+
#pragma warning(pop)
+
+#elif defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 406
+
+#pragma GCC diagnostic pop
+
#endif

#endif // !defined(BOOST_LOG_ENABLE_WARNINGS)

Modified: branches/release/boost/log/detail/format.hpp
==============================================================================
--- branches/release/boost/log/detail/format.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/format.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 15.11.2012
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_DETAIL_FORMAT_HPP_INCLUDED_
@@ -28,7 +28,7 @@
#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

@@ -87,7 +87,7 @@
     //! Format element descriptors
     format_element_list format_elements;

- BOOST_LOG_DEFAULTED_FUNCTION(format_description(), {})
+ BOOST_DEFAULTED_FUNCTION(format_description(), {})

     format_description(format_description const& that) : literal_chars(that.literal_chars), format_elements(that.format_elements)
     {
@@ -113,14 +113,14 @@

//! Parses format string
template< typename CharT >
-BOOST_LOG_FORCEINLINE format_description< CharT > parse_format(const CharT* begin)
+BOOST_FORCEINLINE format_description< CharT > parse_format(const CharT* begin)
{
     return parse_format(begin, begin + std::char_traits< CharT >::length(begin));
}

//! Parses format string
template< typename CharT, typename TraitsT, typename AllocatorT >
-BOOST_LOG_FORCEINLINE format_description< CharT > parse_format(std::basic_string< CharT, TraitsT, AllocatorT > const& fmt)
+BOOST_FORCEINLINE format_description< CharT > parse_format(std::basic_string< CharT, TraitsT, AllocatorT > const& fmt)
{
     const CharT* begin = fmt.c_str();
     return parse_format(begin, begin + fmt.size());

Modified: branches/release/boost/log/detail/function_traits.hpp
==============================================================================
--- branches/release/boost/log/detail/function_traits.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/function_traits.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 30.08.2009
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_DETAIL_FUNCTION_TRAITS_HPP_INCLUDED_
@@ -35,7 +35,7 @@
#include <boost/function_types/is_nonmember_callable_builtin.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/detail/header.hpp
==============================================================================
--- branches/release/boost/log/detail/header.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/header.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,6 +10,7 @@
#if !defined(BOOST_LOG_ENABLE_WARNINGS)

#if defined(_MSC_VER)
+
#pragma warning(push, 3)
// 'm_A' : class 'A' needs to have dll-interface to be used by clients of class 'B'
#pragma warning(disable: 4251)
@@ -35,6 +36,25 @@
#pragma warning(disable: 4610)
// function marked as __forceinline not inlined
#pragma warning(disable: 4714)
+// decorated name length exceeded, name was truncated
+#pragma warning(disable: 4503)
+
+#elif defined(__GNUC__) && !(defined(__INTEL_COMPILER) || defined(__ICL) || defined(__ICC) || defined(__ECC)) \
+ && (__GNUC__ * 100 + __GNUC_MINOR__) >= 406
+
+#pragma GCC diagnostic push
+// 'var' defined but not used
+#pragma GCC diagnostic ignored "-Wunused-variable"
+// unused parameter 'arg'
+#pragma GCC diagnostic ignored "-Wunused-parameter"
+// missing initializer for member var
+#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
+
+#if (__GNUC__ * 100 + __GNUC_MINOR__) >= 407
+// typedef â€˜fooâ€™ locally defined but not used
+#pragma GCC diagnostic ignored "-Wunused-local-typedefs"
+#endif
+
#endif

#endif // !defined(BOOST_LOG_ENABLE_WARNINGS)

Modified: branches/release/boost/log/detail/id.hpp
==============================================================================
--- branches/release/boost/log/detail/id.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/id.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 08.01.2012
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_DETAIL_ID_HPP_INCLUDED_
@@ -19,7 +19,7 @@
#include <boost/log/detail/config.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Deleted: branches/release/boost/log/detail/intptr_t.hpp
==============================================================================
--- branches/release/boost/log/detail/intptr_t.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85460)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,64 +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 intptr_t.hpp
- * \author Andrey Semashev
- * \date 06.05.2013
- *
- * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
- */
-
-#ifndef BOOST_LOG_DETAIL_INTPTR_T_HPP_INCLUDED_
-#define BOOST_LOG_DETAIL_INTPTR_T_HPP_INCLUDED_
-
-#include <boost/cstdint.hpp>
-#include <boost/log/detail/config.hpp>
-#include <boost/log/detail/header.hpp>
-
-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
-#pragma once
-#endif
-
-namespace boost {
-
-BOOST_LOG_OPEN_NAMESPACE
-
-namespace aux {
-
-// PGI seems to not support intptr_t/uintptr_t properly. BOOST_HAS_STDINT_H is not defined for this compiler by Boost.Config.
-#if !defined(__PGIC__)
-
-#if (defined(BOOST_WINDOWS) && !defined(_WIN32_WCE)) \
- || (defined(_XOPEN_UNIX) && (_XOPEN_UNIX+0 > 0) && !defined(__UCLIBC__)) \
- || defined(__CYGWIN__) \
- || defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__) \
- || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
-
-typedef ::intptr_t intptr_t;
-typedef ::uintptr_t uintptr_t;
-#define BOOST_LOG_HAS_INTPTR_T
-
-#elif (defined(__GNUC__) || defined(__clang__)) && defined(__INTPTR_TYPE__) && defined(__UINTPTR_TYPE__)
-
-typedef __INTPTR_TYPE__ intptr_t;
-typedef __UINTPTR_TYPE__ uintptr_t;
-#define BOOST_LOG_HAS_INTPTR_T
-
-#endif
-
-#endif
-
-} // namespace aux
-
-BOOST_LOG_CLOSE_NAMESPACE // namespace log
-
-} // namespace boost
-
-#include <boost/log/detail/footer.hpp>
-
-#endif // BOOST_LOG_DETAIL_INTPTR_T_HPP_INCLUDED_

Modified: branches/release/boost/log/detail/light_function.hpp
==============================================================================
--- branches/release/boost/log/detail/light_function.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/light_function.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 20.06.2010
  *
  * \brief This header is the Boost.Log library impl, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  *
  * The file contains a lightweight alternative of Boost.Function. It does not provide all
  * features of Boost.Function but doesn't introduce dependency on Boost.Bind.
@@ -44,7 +44,7 @@
#endif
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/detail/light_rw_mutex.hpp
==============================================================================
--- branches/release/boost/log/detail/light_rw_mutex.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/light_rw_mutex.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 24.03.2009
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_DETAIL_LIGHT_RW_MUTEX_HPP_INCLUDED_
@@ -18,7 +18,7 @@

#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -105,8 +105,8 @@
     }

     // Noncopyable
- BOOST_LOG_DELETED_FUNCTION(light_rw_mutex(light_rw_mutex const&))
- BOOST_LOG_DELETED_FUNCTION(light_rw_mutex& operator= (light_rw_mutex const&))
+ BOOST_DELETED_FUNCTION(light_rw_mutex(light_rw_mutex const&))
+ BOOST_DELETED_FUNCTION(light_rw_mutex& operator= (light_rw_mutex const&))
};

} // namespace aux
@@ -157,8 +157,8 @@
     }

     // Noncopyable
- BOOST_LOG_DELETED_FUNCTION(light_rw_mutex(light_rw_mutex const&))
- BOOST_LOG_DELETED_FUNCTION(light_rw_mutex& operator= (light_rw_mutex const&))
+ BOOST_DELETED_FUNCTION(light_rw_mutex(light_rw_mutex const&))
+ BOOST_DELETED_FUNCTION(light_rw_mutex& operator= (light_rw_mutex const&))
};

} // namespace aux
@@ -189,8 +189,8 @@
     BOOST_LOG_API void unlock();

     // Noncopyable
- BOOST_LOG_DELETED_FUNCTION(light_rw_mutex(light_rw_mutex const&))
- BOOST_LOG_DELETED_FUNCTION(light_rw_mutex& operator= (light_rw_mutex const&))
+ BOOST_DELETED_FUNCTION(light_rw_mutex(light_rw_mutex const&))
+ BOOST_DELETED_FUNCTION(light_rw_mutex& operator= (light_rw_mutex const&))
};

} // namespace aux

Modified: branches/release/boost/log/detail/locking_ptr.hpp
==============================================================================
--- branches/release/boost/log/detail/locking_ptr.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/locking_ptr.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 15.07.2009
  *
  * This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_DETAIL_LOCKING_PTR_HPP_INCLUDED_
@@ -21,7 +21,7 @@
#include <boost/log/utility/explicit_operator_bool.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/detail/locks.hpp
==============================================================================
--- branches/release/boost/log/detail/locks.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/locks.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 30.05.2010
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_DETAIL_LOCKS_HPP_INCLUDED_
@@ -19,7 +19,7 @@
#include <boost/log/detail/config.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/detail/malloc_aligned.hpp
==============================================================================
--- branches/release/boost/log/detail/malloc_aligned.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/malloc_aligned.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 12.07.2013
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_DETAIL_MALLOC_ALIGNED_HPP_INCLUDED_
@@ -53,7 +53,7 @@

#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/detail/named_scope_fmt_pp.hpp
==============================================================================
--- branches/release/boost/log/detail/named_scope_fmt_pp.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/named_scope_fmt_pp.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -6,7 +6,7 @@
  */

template< BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(), typename ArgT) >
-BOOST_LOG_FORCEINLINE format_named_scope_actor<
+BOOST_FORCEINLINE format_named_scope_actor<
     fallback_to_none,
     typename boost::log::aux::deduce_char_type<
         typename parameter::binding<
@@ -28,7 +28,7 @@
}

template< typename DescriptorT, template< typename > class ActorT, BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(), typename ArgT) >
-BOOST_LOG_FORCEINLINE format_named_scope_actor<
+BOOST_FORCEINLINE format_named_scope_actor<
     fallback_to_none,
     typename boost::log::aux::deduce_char_type<
         typename parameter::binding<
@@ -55,7 +55,7 @@
}

template< typename T, typename FallbackPolicyT, typename TagT, template< typename > class ActorT, BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(), typename ArgT) >
-BOOST_LOG_FORCEINLINE format_named_scope_actor<
+BOOST_FORCEINLINE format_named_scope_actor<
     FallbackPolicyT,
     typename boost::log::aux::deduce_char_type<
         typename parameter::binding<

Modified: branches/release/boost/log/detail/native_typeof.hpp
==============================================================================
--- branches/release/boost/log/detail/native_typeof.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/native_typeof.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 08.03.2009
  *
  * This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_DETAIL_NATIVE_TYPEOF_HPP_INCLUDED_
@@ -18,7 +18,7 @@

#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/detail/parameter_tools.hpp
==============================================================================
--- branches/release/boost/log/detail/parameter_tools.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/parameter_tools.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 28.06.2009
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_DETAIL_PARAMETER_TOOLS_HPP_INCLUDED_
@@ -26,7 +26,7 @@
#include <boost/log/detail/config.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/detail/pp_identity.hpp
==============================================================================
--- branches/release/boost/log/detail/pp_identity.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/pp_identity.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 12.02.2011
  *
  * This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_DETAIL_PP_IDENTITY_HPP_INCLUDED_
@@ -18,7 +18,7 @@

#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/detail/process_id.hpp
==============================================================================
--- branches/release/boost/log/detail/process_id.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/process_id.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 12.09.2009
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_DETAIL_PROCESS_ID_HPP_INCLUDED_
@@ -21,7 +21,7 @@
#include <boost/log/detail/id.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/detail/setup_config.hpp
==============================================================================
--- branches/release/boost/log/detail/setup_config.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/setup_config.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 14.09.2009
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html. In this file
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html. In this file
  * internal configuration macros are defined.
  */

@@ -19,7 +19,7 @@

#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/detail/singleton.hpp
==============================================================================
--- branches/release/boost/log/detail/singleton.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/singleton.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 20.04.2008
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_DETAIL_SINGLETON_HPP_INCLUDED_
@@ -20,7 +20,7 @@
#include <boost/log/utility/once_block.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -35,7 +35,7 @@
class lazy_singleton
{
public:
- BOOST_LOG_DEFAULTED_FUNCTION(lazy_singleton(), {})
+ BOOST_DEFAULTED_FUNCTION(lazy_singleton(), {})

     //! Returns the singleton instance
     static StorageT& get()
@@ -53,8 +53,8 @@
         get_instance();
     }

- BOOST_LOG_DELETED_FUNCTION(lazy_singleton(lazy_singleton const&))
- BOOST_LOG_DELETED_FUNCTION(lazy_singleton& operator= (lazy_singleton const&))
+ BOOST_DELETED_FUNCTION(lazy_singleton(lazy_singleton const&))
+ BOOST_DELETED_FUNCTION(lazy_singleton& operator= (lazy_singleton const&))

protected:
     //! Returns the singleton instance (not thread-safe)

Modified: branches/release/boost/log/detail/sink_init_helpers.hpp
==============================================================================
--- branches/release/boost/log/detail/sink_init_helpers.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/sink_init_helpers.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 14.03.2009
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_DETAIL_SINK_INIT_HELPERS_HPP_INCLUDED_
@@ -32,7 +32,7 @@
#include <boost/log/keywords/format.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/detail/snprintf.hpp
==============================================================================
--- branches/release/boost/log/detail/snprintf.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/snprintf.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 20.02.2009
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_DETAIL_SNPRINTF_HPP_INCLUDED_
@@ -24,7 +24,7 @@
#endif // BOOST_LOG_USE_WCHAR_T
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/detail/spin_mutex.hpp
==============================================================================
--- branches/release/boost/log/detail/spin_mutex.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/spin_mutex.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 01.08.2010
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_DETAIL_SPIN_MUTEX_HPP_INCLUDED_
@@ -18,12 +18,15 @@

#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

#ifndef BOOST_LOG_NO_THREADS

+#include <boost/throw_exception.hpp>
+#include <boost/thread/exceptions.hpp>
+
#if defined(BOOST_THREAD_POSIX) // This one can be defined by users, so it should go first
#define BOOST_LOG_SPIN_MUTEX_USE_PTHREAD
#elif defined(BOOST_WINDOWS)
@@ -154,8 +157,8 @@
     }

     // Non-copyable
- BOOST_LOG_DELETED_FUNCTION(spin_mutex(spin_mutex const&))
- BOOST_LOG_DELETED_FUNCTION(spin_mutex& operator= (spin_mutex const&))
+ BOOST_DELETED_FUNCTION(spin_mutex(spin_mutex const&))
+ BOOST_DELETED_FUNCTION(spin_mutex& operator= (spin_mutex const&))
};

#undef BOOST_LOG_PAUSE_OP
@@ -192,28 +195,52 @@
public:
     spin_mutex()
     {
- BOOST_VERIFY(pthread_spin_init(&m_State, PTHREAD_PROCESS_PRIVATE) == 0);
+ const int err = pthread_spin_init(&m_State, PTHREAD_PROCESS_PRIVATE);
+ if (err != 0)
+ throw_exception< thread_resource_error >(err, "failed to initialize a spin mutex", "spin_mutex::spin_mutex()", __FILE__, __LINE__);
     }
+
     ~spin_mutex()
     {
- pthread_spin_destroy(&m_State);
+ BOOST_VERIFY(pthread_spin_destroy(&m_State) == 0);
     }
+
     bool try_lock()
     {
- return (pthread_spin_trylock(&m_State) == 0);
+ const int err = pthread_spin_trylock(&m_State);
+ if (err == 0)
+ return true;
+ if (err != EBUSY)
+ throw_exception< lock_error >(err, "failed to lock a spin mutex", "spin_mutex::try_lock()", __FILE__, __LINE__);
+ return false;
     }
+
     void lock()
     {
- BOOST_VERIFY(pthread_spin_lock(&m_State) == 0);
+ const int err = pthread_spin_lock(&m_State);
+ if (err != 0)
+ throw_exception< lock_error >(err, "failed to lock a spin mutex", "spin_mutex::lock()", __FILE__, __LINE__);
     }
+
     void unlock()
     {
- pthread_spin_unlock(&m_State);
+ BOOST_VERIFY(pthread_spin_unlock(&m_State) == 0);
     }

     // Non-copyable
- BOOST_LOG_DELETED_FUNCTION(spin_mutex(spin_mutex const&))
- BOOST_LOG_DELETED_FUNCTION(spin_mutex& operator= (spin_mutex const&))
+ BOOST_DELETED_FUNCTION(spin_mutex(spin_mutex const&))
+ BOOST_DELETED_FUNCTION(spin_mutex& operator= (spin_mutex const&))
+
+private:
+ template< typename ExceptionT >
+ static BOOST_NOINLINE BOOST_LOG_NORETURN void throw_exception(int err, const char* descr, const char* func, const char* file, int line)
+ {
+#if !defined(BOOST_EXCEPTION_DISABLE)
+ boost::exception_detail::throw_exception_(ExceptionT(err, descr), func, file, line);
+#else
+ boost::throw_exception(ExceptionT(err, descr));
+#endif
+ }
};

#else // defined(_POSIX_SPIN_LOCKS)
@@ -227,28 +254,52 @@
public:
     spin_mutex()
     {
- BOOST_VERIFY(pthread_mutex_init(&m_State, NULL) == 0);
+ const int err = pthread_mutex_init(&m_State, NULL);
+ if (err != 0)
+ throw_exception< thread_resource_error >(err, "failed to initialize a spin mutex", "spin_mutex::spin_mutex()", __FILE__, __LINE__);
     }
+
     ~spin_mutex()
     {
- pthread_mutex_destroy(&m_State);
+ BOOST_VERIFY(pthread_mutex_destroy(&m_State) == 0);
     }
+
     bool try_lock()
     {
- return (pthread_mutex_trylock(&m_State) == 0);
+ const int err = pthread_mutex_trylock(&m_State);
+ if (err == 0)
+ return true;
+ if (err != EBUSY)
+ throw_exception< lock_error >(err, "failed to lock a spin mutex", "spin_mutex::try_lock()", __FILE__, __LINE__);
+ return false;
     }
+
     void lock()
     {
- BOOST_VERIFY(pthread_mutex_lock(&m_State) == 0);
+ const int err = pthread_mutex_lock(&m_State);
+ if (err != 0)
+ throw_exception< lock_error >(err, "failed to lock a spin mutex", "spin_mutex::lock()", __FILE__, __LINE__);
     }
+
     void unlock()
     {
- pthread_mutex_unlock(&m_State);
+ BOOST_VERIFY(pthread_mutex_unlock(&m_State) == 0);
     }

     // Non-copyable
- BOOST_LOG_DELETED_FUNCTION(spin_mutex(spin_mutex const&))
- BOOST_LOG_DELETED_FUNCTION(spin_mutex& operator= (spin_mutex const&))
+ BOOST_DELETED_FUNCTION(spin_mutex(spin_mutex const&))
+ BOOST_DELETED_FUNCTION(spin_mutex& operator= (spin_mutex const&))
+
+private:
+ template< typename ExceptionT >
+ static BOOST_NOINLINE BOOST_LOG_NORETURN void throw_exception(int err, const char* descr, const char* func, const char* file, int line)
+ {
+#if !defined(BOOST_EXCEPTION_DISABLE)
+ boost::exception_detail::throw_exception_(ExceptionT(err, descr), func, file, line);
+#else
+ boost::throw_exception(ExceptionT(err, descr));
+#endif
+ }
};

#endif // defined(_POSIX_SPIN_LOCKS)

Modified: branches/release/boost/log/detail/tagged_integer.hpp
==============================================================================
--- branches/release/boost/log/detail/tagged_integer.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/tagged_integer.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 11.01.2008
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_TAGGED_INTEGER_HPP_INCLUDED_
@@ -19,7 +19,7 @@
#include <boost/log/detail/config.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/detail/thread_id.hpp
==============================================================================
--- branches/release/boost/log/detail/thread_id.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/thread_id.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 08.01.2012
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_DETAIL_THREAD_ID_HPP_INCLUDED_
@@ -22,7 +22,7 @@
#include <boost/log/detail/id.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/detail/thread_specific.hpp
==============================================================================
--- branches/release/boost/log/detail/thread_specific.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/thread_specific.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 01.03.2008
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_DETAIL_THREAD_SPECIFIC_HPP_INCLUDED_
@@ -20,7 +20,7 @@
#include <boost/type_traits/is_pod.hpp>
#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -53,8 +53,8 @@
     BOOST_LOG_API void set_content(void* value) const;

     // Copying prohibited
- BOOST_LOG_DELETED_FUNCTION(thread_specific_base(thread_specific_base const&))
- BOOST_LOG_DELETED_FUNCTION(thread_specific_base& operator= (thread_specific_base const&))
+ BOOST_DELETED_FUNCTION(thread_specific_base(thread_specific_base const&))
+ BOOST_DELETED_FUNCTION(thread_specific_base& operator= (thread_specific_base const&))
};

//! A TLS wrapper for small POD types with least possible overhead
@@ -73,7 +73,7 @@

public:
     //! Default constructor
- BOOST_LOG_DEFAULTED_FUNCTION(thread_specific(), {})
+ BOOST_DEFAULTED_FUNCTION(thread_specific(), {})
     //! Initializing constructor
     thread_specific(T const& value)
     {

Modified: branches/release/boost/log/detail/threadsafe_queue.hpp
==============================================================================
--- branches/release/boost/log/detail/threadsafe_queue.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/threadsafe_queue.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 05.11.2010
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_DETAIL_THREADSAFE_QUEUE_HPP_INCLUDED_
@@ -18,7 +18,7 @@

#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -255,10 +255,9 @@
             return false;
     }

-private:
     // Copying and assignment is prohibited
- threadsafe_queue(threadsafe_queue const&);
- threadsafe_queue& operator= (threadsafe_queue const&);
+ BOOST_DELETED_FUNCTION(threadsafe_queue(threadsafe_queue const&))
+ BOOST_DELETED_FUNCTION(threadsafe_queue& operator= (threadsafe_queue const&))

private:
     //! Pointer to the implementation

Modified: branches/release/boost/log/detail/timestamp.hpp
==============================================================================
--- branches/release/boost/log/detail/timestamp.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/timestamp.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 31.07.2011
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_DETAIL_TIMESTAMP_HPP_INCLUDED_
@@ -20,7 +20,7 @@
#include <boost/log/detail/config.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/detail/trivial_keyword.hpp
==============================================================================
--- branches/release/boost/log/detail/trivial_keyword.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/trivial_keyword.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 02.12.2012
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_DETAIL_TRIVIAL_KEYWORD_HPP_INCLUDED_
@@ -19,7 +19,7 @@
#include <boost/log/detail/config.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/detail/unary_function_terminal.hpp
==============================================================================
--- branches/release/boost/log/detail/unary_function_terminal.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/unary_function_terminal.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -26,7 +26,7 @@
#include <boost/log/detail/custom_terminal_spec.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -90,7 +90,7 @@

public:
     //! Default constructor
- BOOST_LOG_DEFAULTED_FUNCTION(unary_function_terminal(), {})
+ BOOST_DEFAULTED_FUNCTION(unary_function_terminal(), {})
     //! Copy constructor
     unary_function_terminal(unary_function_terminal const& that) : m_fun(that.m_fun) {}
     //! Initializing constructor

Modified: branches/release/boost/log/detail/unhandled_exception_count.hpp
==============================================================================
--- branches/release/boost/log/detail/unhandled_exception_count.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/unhandled_exception_count.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 05.11.2012
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_DETAIL_UNHANDLED_EXCEPTION_COUNT_HPP_INCLUDED_
@@ -18,7 +18,7 @@

#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/detail/value_ref_visitation.hpp
==============================================================================
--- branches/release/boost/log/detail/value_ref_visitation.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/value_ref_visitation.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 28.07.2012
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html. In this file
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html. In this file
  * internal configuration macros are defined.
  */

@@ -44,7 +44,7 @@
{
     typedef typename VisitorT::result_type result_type;

- static BOOST_LOG_FORCEINLINE result_type call(const void* p, unsigned int type_index, VisitorT& visitor)
+ static BOOST_FORCEINLINE result_type call(const void* p, unsigned int type_index, VisitorT& visitor)
     {
         typedef typename mpl::begin< SequenceT >::type begin_type;
         typedef typename mpl::advance_c< begin_type, SizeV / 2u >::type middle_type;
@@ -91,7 +91,7 @@
{
     typedef typename VisitorT::result_type result_type;

- static BOOST_LOG_FORCEINLINE result_type call(const void* p, unsigned int type_index, VisitorT& visitor)
+ static BOOST_FORCEINLINE result_type call(const void* p, unsigned int type_index, VisitorT& visitor)
     {
         switch (type_index)
         {

Modified: branches/release/boost/log/detail/visible_type.hpp
==============================================================================
--- branches/release/boost/log/detail/visible_type.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/detail/visible_type.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 08.03.2007
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html. In this file
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html. In this file
  * internal configuration macros are defined.
  */

@@ -20,7 +20,7 @@
#include <boost/log/detail/config.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -32,7 +32,7 @@

//! The wrapper type whose type_info is always visible
template< typename T >
-struct BOOST_LOG_VISIBLE visible_type
+struct BOOST_SYMBOL_VISIBLE visible_type
{
     typedef T wrapped_type;
};

Modified: branches/release/boost/log/exceptions.hpp
==============================================================================
--- branches/release/boost/log/exceptions.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/exceptions.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -24,7 +24,7 @@
#include <boost/log/utility/type_info_wrapper.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -45,7 +45,7 @@
# endif
#else

-class BOOST_LOG_VISIBLE exception;
+class BOOST_SYMBOL_VISIBLE exception;

#endif

Modified: branches/release/boost/log/expressions.hpp
==============================================================================
--- branches/release/boost/log/expressions.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/expressions.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -31,7 +31,7 @@
// Boost.Phoenix operators are likely to be used with Boost.Log expression nodes anyway
#include <boost/phoenix/operator.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/expressions/attr.hpp
==============================================================================
--- branches/release/boost/log/expressions/attr.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/expressions/attr.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -32,7 +32,7 @@
#include <boost/log/expressions/attr_fwd.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -149,7 +149,7 @@
         return m_value_extractor(m_name, fusion::at_c< 0 >(phoenix::env(ctx).args()));
     }

- BOOST_LOG_DELETED_FUNCTION(attribute_terminal())
+ BOOST_DELETED_FUNCTION(attribute_terminal())
};

/*!
@@ -232,7 +232,7 @@
  * with the specified name and type.
  */
template< typename AttributeValueT >
-BOOST_LOG_FORCEINLINE attribute_actor< AttributeValueT > attr(attribute_name const& name)
+BOOST_FORCEINLINE attribute_actor< AttributeValueT > attr(attribute_name const& name)
{
     typedef attribute_actor< AttributeValueT > result_type;
     typedef typename result_type::terminal_type result_terminal;
@@ -245,7 +245,7 @@
  * with the specified name and type.
  */
template< typename AttributeValueT, typename TagT >
-BOOST_LOG_FORCEINLINE attribute_actor< AttributeValueT, fallback_to_none, TagT > attr(attribute_name const& name)
+BOOST_FORCEINLINE attribute_actor< AttributeValueT, fallback_to_none, TagT > attr(attribute_name const& name)
{
     typedef attribute_actor< AttributeValueT, fallback_to_none, TagT > result_type;
     typedef typename result_type::terminal_type result_terminal;

Modified: branches/release/boost/log/expressions/attr_fwd.hpp
==============================================================================
--- branches/release/boost/log/expressions/attr_fwd.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/expressions/attr_fwd.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@
#include <boost/log/detail/config.hpp>
#include <boost/log/attributes/fallback_policy_fwd.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/expressions/filter.hpp
==============================================================================
--- branches/release/boost/log/expressions/filter.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/expressions/filter.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -23,7 +23,7 @@
#include <boost/log/detail/light_function.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -71,7 +71,7 @@
     {
     }
     /*!
- * Move constructor
+ * Move constructor. The moved-from filter is left in an unspecified state.
      */
     filter(BOOST_RV_REF(filter) that) BOOST_NOEXCEPT : m_Filter(boost::move(that.m_Filter))
     {
@@ -92,7 +92,7 @@
     }

     /*!
- * Move assignment.
+ * Move assignment. The moved-from filter is left in an unspecified state.
      */
     filter& operator= (BOOST_RV_REF(filter) that) BOOST_NOEXCEPT
     {

Modified: branches/release/boost/log/expressions/formatter.hpp
==============================================================================
--- branches/release/boost/log/expressions/formatter.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/expressions/formatter.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -28,7 +28,7 @@
#include <boost/log/expressions/message.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -94,7 +94,7 @@
     {
     }
     /*!
- * Move constructor
+ * Move constructor. The moved-from formatter is left in an unspecified state.
      */
     basic_formatter(BOOST_RV_REF(this_type) that) BOOST_NOEXCEPT : m_Formatter(boost::move(that.m_Formatter))
     {
@@ -115,7 +115,7 @@
     }

     /*!
- * Move assignment.
+ * Move assignment. The moved-from formatter is left in an unspecified state.
      */
     basic_formatter& operator= (BOOST_RV_REF(this_type) that) BOOST_NOEXCEPT
     {

Modified: branches/release/boost/log/expressions/formatters.hpp
==============================================================================
--- branches/release/boost/log/expressions/formatters.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/expressions/formatters.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -31,7 +31,7 @@
#include <boost/log/expressions/formatters/if.hpp>
#include <boost/log/expressions/formatters/wrap_formatter.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/expressions/formatters/c_decorator.hpp
==============================================================================
--- branches/release/boost/log/expressions/formatters/c_decorator.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/expressions/formatters/c_decorator.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -22,7 +22,7 @@
#include <boost/log/expressions/formatters/char_decorator.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -118,7 +118,7 @@
     typedef CharT char_type;

     template< typename SubactorT >
- BOOST_LOG_FORCEINLINE char_decorator_actor< SubactorT, pattern_replacer< char_type > > operator[] (SubactorT const& subactor) const
+ BOOST_FORCEINLINE char_decorator_actor< SubactorT, pattern_replacer< char_type > > operator[] (SubactorT const& subactor) const
     {
         typedef c_decorator_traits< char_type > traits_type;
         typedef pattern_replacer< char_type > replacer_type;
@@ -153,7 +153,7 @@
  * The function creates a C-style decorator generator for arbitrary character type.
  */
template< typename CharT >
-BOOST_LOG_FORCEINLINE aux::c_decorator_gen< CharT > make_c_decor()
+BOOST_FORCEINLINE aux::c_decorator_gen< CharT > make_c_decor()
{
     return aux::c_decorator_gen< CharT >();
}
@@ -218,7 +218,7 @@
     typedef CharT char_type;

     template< typename SubactorT >
- BOOST_LOG_FORCEINLINE char_decorator_actor< SubactorT, c_ascii_pattern_replacer< char_type > > operator[] (SubactorT const& subactor) const
+ BOOST_FORCEINLINE char_decorator_actor< SubactorT, c_ascii_pattern_replacer< char_type > > operator[] (SubactorT const& subactor) const
     {
         typedef c_decorator_traits< char_type > traits_type;
         typedef c_ascii_pattern_replacer< char_type > replacer_type;
@@ -254,7 +254,7 @@
  * The function creates a C-style decorator generator for arbitrary character type.
  */
template< typename CharT >
-BOOST_LOG_FORCEINLINE aux::c_ascii_decorator_gen< CharT > make_c_ascii_decor()
+BOOST_FORCEINLINE aux::c_ascii_decorator_gen< CharT > make_c_ascii_decor()
{
     return aux::c_ascii_decorator_gen< CharT >();
}

Modified: branches/release/boost/log/expressions/formatters/char_decorator.hpp
==============================================================================
--- branches/release/boost/log/expressions/formatters/char_decorator.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/expressions/formatters/char_decorator.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -45,7 +45,7 @@
#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

@@ -342,7 +342,7 @@
         return strm;
     }

- BOOST_LOG_DELETED_FUNCTION(char_decorator_output_terminal())
+ BOOST_DELETED_FUNCTION(char_decorator_output_terminal())
};

} // namespace aux
@@ -483,7 +483,7 @@
         return boost::move(str);
     }

- BOOST_LOG_DELETED_FUNCTION(char_decorator_terminal())
+ BOOST_DELETED_FUNCTION(char_decorator_terminal())
};

/*!
@@ -519,7 +519,7 @@

#define BOOST_LOG_AUX_OVERLOAD(left_ref, right_ref)\
     template< typename LeftExprT, typename SubactorT, typename ImplT, template< typename > class ActorT >\
- BOOST_LOG_FORCEINLINE phoenix::actor< aux::char_decorator_output_terminal< phoenix::actor< LeftExprT >, SubactorT, ImplT > >\
+ BOOST_FORCEINLINE phoenix::actor< aux::char_decorator_output_terminal< phoenix::actor< LeftExprT >, SubactorT, ImplT > >\
     operator<< (phoenix::actor< LeftExprT > left_ref left, char_decorator_actor< SubactorT, ImplT, ActorT > right_ref right)\
     {\
         typedef aux::char_decorator_output_terminal< phoenix::actor< LeftExprT >, SubactorT, ImplT > terminal_type;\
@@ -548,7 +548,7 @@
     }

     template< typename SubactorT >
- BOOST_LOG_FORCEINLINE char_decorator_actor< SubactorT, pattern_replacer< char_type > > operator[] (SubactorT const& subactor) const
+ BOOST_FORCEINLINE char_decorator_actor< SubactorT, pattern_replacer< char_type > > operator[] (SubactorT const& subactor) const
     {
         typedef pattern_replacer< char_type > replacer_type;
         typedef char_decorator_actor< SubactorT, replacer_type > result_type;
@@ -574,7 +574,7 @@
     }

     template< typename SubactorT >
- BOOST_LOG_FORCEINLINE char_decorator_actor< SubactorT, pattern_replacer< from_char_type > > operator[] (SubactorT const& subactor) const
+ BOOST_FORCEINLINE char_decorator_actor< SubactorT, pattern_replacer< from_char_type > > operator[] (SubactorT const& subactor) const
     {
         typedef pattern_replacer< from_char_type > replacer_type;
         typedef char_decorator_actor< SubactorT, replacer_type > result_type;
@@ -594,7 +594,7 @@
  * substring occurrence in the output will be replaced with <tt>decorations[i].second</tt>.
  */
template< typename RangeT >
-BOOST_LOG_FORCEINLINE aux::char_decorator_gen1< RangeT > char_decor(RangeT const& decorations)
+BOOST_FORCEINLINE aux::char_decorator_gen1< RangeT > char_decor(RangeT const& decorations)
{
     return aux::char_decorator_gen1< RangeT >(decorations);
}
@@ -610,7 +610,7 @@
  * substring occurrence in the output will be replaced with <tt>to[i]</tt>.
  */
template< typename FromRangeT, typename ToRangeT >
-BOOST_LOG_FORCEINLINE aux::char_decorator_gen2< FromRangeT, ToRangeT > char_decor(FromRangeT const& from, ToRangeT const& to)
+BOOST_FORCEINLINE aux::char_decorator_gen2< FromRangeT, ToRangeT > char_decor(FromRangeT const& from, ToRangeT const& to)
{
     return aux::char_decorator_gen2< FromRangeT, ToRangeT >(from, to);
}

Modified: branches/release/boost/log/expressions/formatters/csv_decorator.hpp
==============================================================================
--- branches/release/boost/log/expressions/formatters/csv_decorator.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/expressions/formatters/csv_decorator.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -21,7 +21,7 @@
#include <boost/log/expressions/formatters/char_decorator.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -88,7 +88,7 @@
     typedef CharT char_type;

     template< typename SubactorT >
- BOOST_LOG_FORCEINLINE char_decorator_actor< SubactorT, pattern_replacer< char_type > > operator[] (SubactorT const& subactor) const
+ BOOST_FORCEINLINE char_decorator_actor< SubactorT, pattern_replacer< char_type > > operator[] (SubactorT const& subactor) const
     {
         typedef csv_decorator_traits< char_type > traits_type;
         typedef pattern_replacer< char_type > replacer_type;
@@ -124,7 +124,7 @@
  * The function creates an CSV-style decorator generator for arbitrary character type.
  */
template< typename CharT >
-BOOST_LOG_FORCEINLINE aux::csv_decorator_gen< CharT > make_csv_decor()
+BOOST_FORCEINLINE aux::csv_decorator_gen< CharT > make_csv_decor()
{
     return aux::csv_decorator_gen< CharT >();
}

Modified: branches/release/boost/log/expressions/formatters/date_time.hpp
==============================================================================
--- branches/release/boost/log/expressions/formatters/date_time.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/expressions/formatters/date_time.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -37,7 +37,7 @@
#include <boost/log/utility/functional/bind.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -140,7 +140,7 @@
         return boost::move(str);
     }

- BOOST_LOG_DELETED_FUNCTION(format_date_time_terminal())
+ BOOST_DELETED_FUNCTION(format_date_time_terminal())
};

/*!
@@ -200,7 +200,7 @@

#define BOOST_LOG_AUX_OVERLOAD(left_ref, right_ref)\
     template< typename LeftExprT, typename T, typename FallbackPolicyT, typename CharT >\
- BOOST_LOG_FORCEINLINE phoenix::actor< aux::attribute_output_terminal< phoenix::actor< LeftExprT >, T, FallbackPolicyT, typename format_date_time_actor< T, FallbackPolicyT, CharT >::formatter_function_type > >\
+ BOOST_FORCEINLINE phoenix::actor< aux::attribute_output_terminal< phoenix::actor< LeftExprT >, T, FallbackPolicyT, typename format_date_time_actor< T, FallbackPolicyT, CharT >::formatter_function_type > >\
     operator<< (phoenix::actor< LeftExprT > left_ref left, format_date_time_actor< T, FallbackPolicyT, CharT > right_ref right)\
     {\
         typedef aux::attribute_output_terminal< phoenix::actor< LeftExprT >, T, FallbackPolicyT, typename format_date_time_actor< T, FallbackPolicyT, CharT >::formatter_function_type > terminal_type;\
@@ -222,7 +222,7 @@
  * \param format Format string
  */
template< typename AttributeValueT, typename CharT >
-BOOST_LOG_FORCEINLINE format_date_time_actor< AttributeValueT, fallback_to_none, CharT > format_date_time(attribute_name const& name, const CharT* format)
+BOOST_FORCEINLINE format_date_time_actor< AttributeValueT, fallback_to_none, CharT > format_date_time(attribute_name const& name, const CharT* format)
{
     typedef format_date_time_actor< AttributeValueT, fallback_to_none, CharT > actor_type;
     typedef typename actor_type::terminal_type terminal_type;
@@ -238,7 +238,7 @@
  * \param format Format string
  */
template< typename AttributeValueT, typename CharT >
-BOOST_LOG_FORCEINLINE format_date_time_actor< AttributeValueT, fallback_to_none, CharT > format_date_time(attribute_name const& name, std::basic_string< CharT > const& format)
+BOOST_FORCEINLINE format_date_time_actor< AttributeValueT, fallback_to_none, CharT > format_date_time(attribute_name const& name, std::basic_string< CharT > const& format)
{
     typedef format_date_time_actor< AttributeValueT, fallback_to_none, CharT > actor_type;
     typedef typename actor_type::terminal_type terminal_type;
@@ -254,7 +254,7 @@
  * \param format Format string
  */
template< typename DescriptorT, template< typename > class ActorT, typename CharT >
-BOOST_LOG_FORCEINLINE format_date_time_actor< typename DescriptorT::value_type, fallback_to_none, CharT, ActorT >
+BOOST_FORCEINLINE format_date_time_actor< typename DescriptorT::value_type, fallback_to_none, CharT, ActorT >
format_date_time(attribute_keyword< DescriptorT, ActorT > const& keyword, const CharT* format)
{
     typedef format_date_time_actor< typename DescriptorT::value_type, fallback_to_none, CharT, ActorT > actor_type;
@@ -271,7 +271,7 @@
  * \param format Format string
  */
template< typename DescriptorT, template< typename > class ActorT, typename CharT >
-BOOST_LOG_FORCEINLINE format_date_time_actor< typename DescriptorT::value_type, fallback_to_none, CharT, ActorT >
+BOOST_FORCEINLINE format_date_time_actor< typename DescriptorT::value_type, fallback_to_none, CharT, ActorT >
format_date_time(attribute_keyword< DescriptorT, ActorT > const& keyword, std::basic_string< CharT > const& format)
{
     typedef format_date_time_actor< typename DescriptorT::value_type, fallback_to_none, CharT, ActorT > actor_type;
@@ -288,7 +288,7 @@
  * \param format Format string
  */
template< typename T, typename FallbackPolicyT, typename TagT, template< typename > class ActorT, typename CharT >
-BOOST_LOG_FORCEINLINE format_date_time_actor< T, FallbackPolicyT, CharT, ActorT >
+BOOST_FORCEINLINE format_date_time_actor< T, FallbackPolicyT, CharT, ActorT >
format_date_time(attribute_actor< T, FallbackPolicyT, TagT, ActorT > const& placeholder, const CharT* format)
{
     typedef format_date_time_actor< T, FallbackPolicyT, CharT, ActorT > actor_type;
@@ -305,7 +305,7 @@
  * \param format Format string
  */
template< typename T, typename FallbackPolicyT, typename TagT, template< typename > class ActorT, typename CharT >
-BOOST_LOG_FORCEINLINE format_date_time_actor< T, FallbackPolicyT, CharT, ActorT >
+BOOST_FORCEINLINE format_date_time_actor< T, FallbackPolicyT, CharT, ActorT >
format_date_time(attribute_actor< T, FallbackPolicyT, TagT, ActorT > const& placeholder, std::basic_string< CharT > const& format)
{
     typedef format_date_time_actor< T, FallbackPolicyT, CharT, ActorT > actor_type;

Modified: branches/release/boost/log/expressions/formatters/format.hpp
==============================================================================
--- branches/release/boost/log/expressions/formatters/format.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/expressions/formatters/format.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -27,7 +27,7 @@
#include <boost/log/detail/custom_terminal_spec.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -72,7 +72,7 @@
         return m_format.make_pump(fusion::at_c< 1 >(phoenix::env(ctx).args()));
     }

- BOOST_LOG_DELETED_FUNCTION(format_terminal())
+ BOOST_DELETED_FUNCTION(format_terminal())
};

/*!
@@ -80,7 +80,7 @@
  * according to the provided format string.
  */
template< typename CharT >
-BOOST_LOG_FORCEINLINE phoenix::actor< format_terminal< CharT > > format(const CharT* fmt)
+BOOST_FORCEINLINE phoenix::actor< format_terminal< CharT > > format(const CharT* fmt)
{
     typedef format_terminal< CharT > terminal_type;
     phoenix::actor< terminal_type > act = {{ terminal_type(fmt) }};
@@ -92,7 +92,7 @@
  * according to the provided format string.
  */
template< typename CharT, typename TraitsT, typename AllocatorT >
-BOOST_LOG_FORCEINLINE phoenix::actor< format_terminal< CharT > > format(std::basic_string< CharT, TraitsT, AllocatorT > const& fmt)
+BOOST_FORCEINLINE phoenix::actor< format_terminal< CharT > > format(std::basic_string< CharT, TraitsT, AllocatorT > const& fmt)
{
     typedef format_terminal< CharT > terminal_type;
     phoenix::actor< terminal_type > act = {{ terminal_type(fmt.c_str()) }};

Modified: branches/release/boost/log/expressions/formatters/if.hpp
==============================================================================
--- branches/release/boost/log/expressions/formatters/if.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/expressions/formatters/if.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -28,7 +28,7 @@
#include <boost/log/detail/custom_terminal_spec.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -113,7 +113,7 @@
         return strm;
     }

- BOOST_LOG_DELETED_FUNCTION(if_output_terminal())
+ BOOST_DELETED_FUNCTION(if_output_terminal())
};

template< typename LeftT, typename CondT, typename ThenT, typename ElseT >
@@ -195,7 +195,7 @@
         return strm;
     }

- BOOST_LOG_DELETED_FUNCTION(if_else_output_terminal())
+ BOOST_DELETED_FUNCTION(if_else_output_terminal())
};

@@ -215,7 +215,7 @@

#define BOOST_LOG_AUX_OVERLOAD(left_ref, right_ref)\
     template< typename LeftExprT, typename CondT, typename ThenT, typename ElseT >\
- BOOST_LOG_FORCEINLINE phoenix::actor< if_else_output_terminal< phoenix::actor< LeftExprT >, CondT, ThenT, ElseT > >\
+ BOOST_FORCEINLINE phoenix::actor< if_else_output_terminal< phoenix::actor< LeftExprT >, CondT, ThenT, ElseT > >\
     operator<< (phoenix::actor< LeftExprT > left_ref left, if_then_else_gen< CondT, ThenT, ElseT > right_ref right)\
     {\
         typedef if_else_output_terminal< phoenix::actor< LeftExprT >, CondT, ThenT, ElseT > terminal_type;\
@@ -242,7 +242,7 @@
         }

         template< typename ElseT >
- BOOST_LOG_FORCEINLINE if_then_else_gen< CondT, ThenT, ElseT > operator[] (ElseT const& el)
+ BOOST_FORCEINLINE if_then_else_gen< CondT, ThenT, ElseT > operator[] (ElseT const& el)
         {
             return if_then_else_gen< CondT, ThenT, ElseT >(m_cond, m_then, el);
         }
@@ -256,7 +256,7 @@

#define BOOST_LOG_AUX_OVERLOAD(left_ref, right_ref)\
     template< typename LeftExprT, typename CondT, typename ThenT >\
- BOOST_LOG_FORCEINLINE phoenix::actor< if_output_terminal< phoenix::actor< LeftExprT >, CondT, ThenT > >\
+ BOOST_FORCEINLINE phoenix::actor< if_output_terminal< phoenix::actor< LeftExprT >, CondT, ThenT > >\
     operator<< (phoenix::actor< LeftExprT > left_ref left, if_then_gen< CondT, ThenT > right_ref right)\
     {\
         typedef if_output_terminal< phoenix::actor< LeftExprT >, CondT, ThenT > terminal_type;\
@@ -282,7 +282,7 @@
     }

     template< typename ThenT >
- BOOST_LOG_FORCEINLINE if_then_gen< CondT, ThenT > operator[] (ThenT const& then_) const
+ BOOST_FORCEINLINE if_then_gen< CondT, ThenT > operator[] (ThenT const& then_) const
     {
         return if_then_gen< CondT, ThenT >(m_cond, then_);
     }
@@ -297,7 +297,7 @@
  * \param cond A filter expression that will be used as the condition
  */
template< typename CondT >
-BOOST_LOG_FORCEINLINE aux::if_gen< CondT > if_(CondT const& cond)
+BOOST_FORCEINLINE aux::if_gen< CondT > if_(CondT const& cond)
{
     return aux::if_gen< CondT >(cond);
}

Modified: branches/release/boost/log/expressions/formatters/named_scope.hpp
==============================================================================
--- branches/release/boost/log/expressions/formatters/named_scope.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/expressions/formatters/named_scope.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -52,7 +52,7 @@
#include <boost/log/keywords/iteration.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -309,7 +309,7 @@
         return boost::move(str);
     }

- BOOST_LOG_DELETED_FUNCTION(format_named_scope_terminal())
+ BOOST_DELETED_FUNCTION(format_named_scope_terminal())
};

/*!
@@ -369,7 +369,7 @@

#define BOOST_LOG_AUX_OVERLOAD(left_ref, right_ref)\
     template< typename LeftExprT, typename FallbackPolicyT, typename CharT >\
- BOOST_LOG_FORCEINLINE phoenix::actor< aux::attribute_output_terminal< phoenix::actor< LeftExprT >, attributes::named_scope::value_type, FallbackPolicyT, typename format_named_scope_actor< FallbackPolicyT, CharT >::formatter_function_type > >\
+ BOOST_FORCEINLINE phoenix::actor< aux::attribute_output_terminal< phoenix::actor< LeftExprT >, attributes::named_scope::value_type, FallbackPolicyT, typename format_named_scope_actor< FallbackPolicyT, CharT >::formatter_function_type > >\
     operator<< (phoenix::actor< LeftExprT > left_ref left, format_named_scope_actor< FallbackPolicyT, CharT > right_ref right)\
     {\
         typedef aux::attribute_output_terminal< phoenix::actor< LeftExprT >, attributes::named_scope::value_type, FallbackPolicyT, typename format_named_scope_actor< FallbackPolicyT, CharT >::formatter_function_type > terminal_type;\
@@ -407,7 +407,7 @@
#endif

template< typename CharT, template< typename > class ActorT, typename FallbackPolicyT, typename ArgsT >
-BOOST_LOG_FORCEINLINE format_named_scope_actor< FallbackPolicyT, CharT, ActorT > format_named_scope(attribute_name const& name, FallbackPolicyT const& fallback, ArgsT const& args)
+BOOST_FORCEINLINE format_named_scope_actor< FallbackPolicyT, CharT, ActorT > format_named_scope(attribute_name const& name, FallbackPolicyT const& fallback, ArgsT const& args)
{
     typedef format_named_scope_actor< FallbackPolicyT, CharT, ActorT > actor_type;
     typedef typename actor_type::terminal_type terminal_type;
@@ -438,7 +438,7 @@
  * \param element_format Format string for a single named scope
  */
template< typename CharT >
-BOOST_LOG_FORCEINLINE format_named_scope_actor< fallback_to_none, CharT > format_named_scope(attribute_name const& name, const CharT* element_format)
+BOOST_FORCEINLINE format_named_scope_actor< fallback_to_none, CharT > format_named_scope(attribute_name const& name, const CharT* element_format)
{
     typedef format_named_scope_actor< fallback_to_none, CharT > actor_type;
     typedef typename actor_type::terminal_type terminal_type;
@@ -454,7 +454,7 @@
  * \param element_format Format string for a single named scope
  */
template< typename CharT >
-BOOST_LOG_FORCEINLINE format_named_scope_actor< fallback_to_none, CharT > format_named_scope(attribute_name const& name, std::basic_string< CharT > const& element_format)
+BOOST_FORCEINLINE format_named_scope_actor< fallback_to_none, CharT > format_named_scope(attribute_name const& name, std::basic_string< CharT > const& element_format)
{
     typedef format_named_scope_actor< fallback_to_none, CharT > actor_type;
     typedef typename actor_type::terminal_type terminal_type;
@@ -470,7 +470,7 @@
  * \param element_format Format string for a single named scope
  */
template< typename DescriptorT, template< typename > class ActorT, typename CharT >
-BOOST_LOG_FORCEINLINE format_named_scope_actor< fallback_to_none, CharT, ActorT >
+BOOST_FORCEINLINE format_named_scope_actor< fallback_to_none, CharT, ActorT >
format_named_scope(attribute_keyword< DescriptorT, ActorT > const& keyword, const CharT* element_format)
{
     BOOST_STATIC_ASSERT_MSG((is_same< typename DescriptorT::value_type, attributes::named_scope::value_type >::value),\
@@ -490,7 +490,7 @@
  * \param element_format Format string for a single named scope
  */
template< typename DescriptorT, template< typename > class ActorT, typename CharT >
-BOOST_LOG_FORCEINLINE format_named_scope_actor< fallback_to_none, CharT, ActorT >
+BOOST_FORCEINLINE format_named_scope_actor< fallback_to_none, CharT, ActorT >
format_named_scope(attribute_keyword< DescriptorT, ActorT > const& keyword, std::basic_string< CharT > const& element_format)
{
     BOOST_STATIC_ASSERT_MSG((is_same< typename DescriptorT::value_type, attributes::named_scope::value_type >::value),\
@@ -510,7 +510,7 @@
  * \param element_format Format string for a single named scope
  */
template< typename T, typename FallbackPolicyT, typename TagT, template< typename > class ActorT, typename CharT >
-BOOST_LOG_FORCEINLINE format_named_scope_actor< FallbackPolicyT, CharT, ActorT >
+BOOST_FORCEINLINE format_named_scope_actor< FallbackPolicyT, CharT, ActorT >
format_named_scope(attribute_actor< T, FallbackPolicyT, TagT, ActorT > const& placeholder, const CharT* element_format)
{
     BOOST_STATIC_ASSERT_MSG((is_same< T, attributes::named_scope::value_type >::value),\
@@ -530,7 +530,7 @@
  * \param element_format Format string for a single named scope
  */
template< typename T, typename FallbackPolicyT, typename TagT, template< typename > class ActorT, typename CharT >
-BOOST_LOG_FORCEINLINE format_named_scope_actor< FallbackPolicyT, CharT, ActorT >
+BOOST_FORCEINLINE format_named_scope_actor< FallbackPolicyT, CharT, ActorT >
format_named_scope(attribute_actor< T, FallbackPolicyT, TagT, ActorT > const& placeholder, std::basic_string< CharT > const& element_format)
{
     BOOST_STATIC_ASSERT_MSG((is_same< T, attributes::named_scope::value_type >::value),\

Modified: branches/release/boost/log/expressions/formatters/stream.hpp
==============================================================================
--- branches/release/boost/log/expressions/formatters/stream.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/expressions/formatters/stream.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -19,7 +19,7 @@
#include <boost/log/detail/config.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/expressions/formatters/wrap_formatter.hpp
==============================================================================
--- branches/release/boost/log/expressions/formatters/wrap_formatter.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/expressions/formatters/wrap_formatter.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -32,7 +32,7 @@
#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

@@ -121,7 +121,7 @@
         return strm;
     }

- BOOST_LOG_DELETED_FUNCTION(wrapped_formatter_output_terminal())
+ BOOST_DELETED_FUNCTION(wrapped_formatter_output_terminal())
};

BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(has_char_type, char_type, false)
@@ -262,7 +262,7 @@

#define BOOST_LOG_AUX_OVERLOAD(left_ref, right_ref)\
     template< typename LeftExprT, typename FunT, typename CharT >\
- BOOST_LOG_FORCEINLINE phoenix::actor< aux::wrapped_formatter_output_terminal< phoenix::actor< LeftExprT >, FunT > >\
+ BOOST_FORCEINLINE phoenix::actor< aux::wrapped_formatter_output_terminal< phoenix::actor< LeftExprT >, FunT > >\
     operator<< (phoenix::actor< LeftExprT > left_ref left, wrapped_formatter_actor< FunT, CharT > right_ref right)\
     {\
         typedef aux::wrapped_formatter_output_terminal< phoenix::actor< LeftExprT >, FunT > terminal_type;\
@@ -287,7 +287,7 @@
  * where \c CharT is the character type of the formatting expression.
  */
template< typename FunT >
-BOOST_LOG_FORCEINLINE wrapped_formatter_actor< FunT, typename aux::default_char_type< FunT >::type > wrap_formatter(FunT const& fun)
+BOOST_FORCEINLINE wrapped_formatter_actor< FunT, typename aux::default_char_type< FunT >::type > wrap_formatter(FunT const& fun)
{
     typedef wrapped_formatter_actor< FunT, typename aux::default_char_type< FunT >::type > actor_type;
     typedef typename actor_type::terminal_type terminal_type;
@@ -306,7 +306,7 @@
  * where \c CharT is the character type of the formatting expression.
  */
template< typename CharT, typename FunT >
-BOOST_LOG_FORCEINLINE wrapped_formatter_actor< FunT, CharT > wrap_formatter(FunT const& fun)
+BOOST_FORCEINLINE wrapped_formatter_actor< FunT, CharT > wrap_formatter(FunT const& fun)
{
     typedef wrapped_formatter_actor< FunT, CharT > actor_type;
     typedef typename actor_type::terminal_type terminal_type;

Modified: branches/release/boost/log/expressions/formatters/xml_decorator.hpp
==============================================================================
--- branches/release/boost/log/expressions/formatters/xml_decorator.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/expressions/formatters/xml_decorator.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -20,7 +20,7 @@
#include <boost/log/expressions/formatters/char_decorator.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -87,7 +87,7 @@
     typedef CharT char_type;

     template< typename SubactorT >
- BOOST_LOG_FORCEINLINE char_decorator_actor< SubactorT, pattern_replacer< char_type > > operator[] (SubactorT const& subactor) const
+ BOOST_FORCEINLINE char_decorator_actor< SubactorT, pattern_replacer< char_type > > operator[] (SubactorT const& subactor) const
     {
         typedef xml_decorator_traits< char_type > traits_type;
         typedef pattern_replacer< char_type > replacer_type;
@@ -122,7 +122,7 @@
  * The function creates an XML-style decorator generator for arbitrary character type.
  */
template< typename CharT >
-BOOST_LOG_FORCEINLINE aux::xml_decorator_gen< CharT > make_xml_decor()
+BOOST_FORCEINLINE aux::xml_decorator_gen< CharT > make_xml_decor()
{
     return aux::xml_decorator_gen< CharT >();
}

Modified: branches/release/boost/log/expressions/is_keyword_descriptor.hpp
==============================================================================
--- branches/release/boost/log/expressions/is_keyword_descriptor.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/expressions/is_keyword_descriptor.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -19,7 +19,7 @@
#include <boost/log/detail/config.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/expressions/keyword.hpp
==============================================================================
--- branches/release/boost/log/expressions/keyword.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/expressions/keyword.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -33,7 +33,7 @@
#include <boost/log/attributes/fallback_policy.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/expressions/keyword_fwd.hpp
==============================================================================
--- branches/release/boost/log/expressions/keyword_fwd.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/expressions/keyword_fwd.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -17,7 +17,7 @@

#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/expressions/message.hpp
==============================================================================
--- branches/release/boost/log/expressions/message.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/expressions/message.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -24,7 +24,7 @@
#include <boost/log/attributes/attribute_name.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/expressions/predicates.hpp
==============================================================================
--- branches/release/boost/log/expressions/predicates.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/expressions/predicates.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -27,7 +27,7 @@
#include <boost/log/expressions/predicates/is_debugger_present.hpp>
#include <boost/log/expressions/predicates/channel_severity_filter.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/expressions/predicates/begins_with.hpp
==============================================================================
--- branches/release/boost/log/expressions/predicates/begins_with.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/expressions/predicates/begins_with.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -27,7 +27,7 @@
#include <boost/log/utility/functional/begins_with.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -84,7 +84,7 @@
  * which is assumed to be a string, begins with the specified substring.
  */
template< typename T, typename FallbackPolicyT, typename TagT, template< typename > class ActorT, typename SubstringT >
-BOOST_LOG_FORCEINLINE ActorT< aux::unary_function_terminal< attribute_begins_with< T, typename boost::log::aux::make_embedded_string_type< SubstringT >::type, FallbackPolicyT > > >
+BOOST_FORCEINLINE ActorT< aux::unary_function_terminal< attribute_begins_with< T, typename boost::log::aux::make_embedded_string_type< SubstringT >::type, FallbackPolicyT > > >
begins_with(attribute_actor< T, FallbackPolicyT, TagT, ActorT > const& attr, SubstringT const& substring)
{
     typedef aux::unary_function_terminal< attribute_begins_with< T, typename boost::log::aux::make_embedded_string_type< SubstringT >::type, FallbackPolicyT > > terminal_type;
@@ -97,7 +97,7 @@
  * which is assumed to be a string, begins with the specified substring.
  */
template< typename DescriptorT, template< typename > class ActorT, typename SubstringT >
-BOOST_LOG_FORCEINLINE ActorT< aux::unary_function_terminal< attribute_begins_with< typename DescriptorT::value_type, typename boost::log::aux::make_embedded_string_type< SubstringT >::type > > >
+BOOST_FORCEINLINE ActorT< aux::unary_function_terminal< attribute_begins_with< typename DescriptorT::value_type, typename boost::log::aux::make_embedded_string_type< SubstringT >::type > > >
begins_with(attribute_keyword< DescriptorT, ActorT > const&, SubstringT const& substring)
{
     typedef aux::unary_function_terminal< attribute_begins_with< typename DescriptorT::value_type, typename boost::log::aux::make_embedded_string_type< SubstringT >::type > > terminal_type;
@@ -110,7 +110,7 @@
  * which is assumed to be a string, begins with the specified substring.
  */
template< typename T, typename SubstringT >
-BOOST_LOG_FORCEINLINE phoenix::actor< aux::unary_function_terminal< attribute_begins_with< T, typename boost::log::aux::make_embedded_string_type< SubstringT >::type > > >
+BOOST_FORCEINLINE phoenix::actor< aux::unary_function_terminal< attribute_begins_with< T, typename boost::log::aux::make_embedded_string_type< SubstringT >::type > > >
begins_with(attribute_name const& name, SubstringT const& substring)
{
     typedef aux::unary_function_terminal< attribute_begins_with< T, typename boost::log::aux::make_embedded_string_type< SubstringT >::type > > terminal_type;

Modified: branches/release/boost/log/expressions/predicates/channel_severity_filter.hpp
==============================================================================
--- branches/release/boost/log/expressions/predicates/channel_severity_filter.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/expressions/predicates/channel_severity_filter.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -35,7 +35,7 @@
#include <boost/log/expressions/keyword_fwd.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -304,7 +304,7 @@
  * if the record severity level is not less than the threshold for the channel the record belongs to.
  */
template< typename ChannelT, typename SeverityT >
-BOOST_LOG_FORCEINLINE channel_severity_filter_actor< ChannelT, SeverityT >
+BOOST_FORCEINLINE channel_severity_filter_actor< ChannelT, SeverityT >
channel_severity_filter(attribute_name const& channel_name, attribute_name const& severity_name)
{
     typedef channel_severity_filter_actor< ChannelT, SeverityT > result_type;
@@ -315,7 +315,7 @@

//! \overload
template< typename SeverityT, typename ChannelDescriptorT, template< typename > class ActorT >
-BOOST_LOG_FORCEINLINE channel_severity_filter_actor< typename ChannelDescriptorT::value_type, SeverityT, fallback_to_none, fallback_to_none, less, greater_equal, std::allocator< void >, ActorT >
+BOOST_FORCEINLINE channel_severity_filter_actor< typename ChannelDescriptorT::value_type, SeverityT, fallback_to_none, fallback_to_none, less, greater_equal, std::allocator< void >, ActorT >
channel_severity_filter(attribute_keyword< ChannelDescriptorT, ActorT > const& channel_keyword, attribute_name const& severity_name)
{
     typedef channel_severity_filter_actor< typename ChannelDescriptorT::value_type, SeverityT, fallback_to_none, fallback_to_none, less, greater_equal, std::allocator< void >, ActorT > result_type;
@@ -326,7 +326,7 @@

//! \overload
template< typename ChannelT, typename SeverityDescriptorT, template< typename > class ActorT >
-BOOST_LOG_FORCEINLINE channel_severity_filter_actor< ChannelT, typename SeverityDescriptorT::value_type, fallback_to_none, fallback_to_none, less, greater_equal, std::allocator< void >, ActorT >
+BOOST_FORCEINLINE channel_severity_filter_actor< ChannelT, typename SeverityDescriptorT::value_type, fallback_to_none, fallback_to_none, less, greater_equal, std::allocator< void >, ActorT >
channel_severity_filter(attribute_name const& channel_name, attribute_keyword< SeverityDescriptorT, ActorT > const& severity_keyword)
{
     typedef channel_severity_filter_actor< ChannelT, typename SeverityDescriptorT::value_type, fallback_to_none, fallback_to_none, less, greater_equal, std::allocator< void >, ActorT > result_type;
@@ -337,7 +337,7 @@

//! \overload
template< typename ChannelDescriptorT, typename SeverityDescriptorT, template< typename > class ActorT >
-BOOST_LOG_FORCEINLINE channel_severity_filter_actor< typename ChannelDescriptorT::value_type, typename SeverityDescriptorT::value_type, fallback_to_none, fallback_to_none, less, greater_equal, std::allocator< void >, ActorT >
+BOOST_FORCEINLINE channel_severity_filter_actor< typename ChannelDescriptorT::value_type, typename SeverityDescriptorT::value_type, fallback_to_none, fallback_to_none, less, greater_equal, std::allocator< void >, ActorT >
channel_severity_filter(attribute_keyword< ChannelDescriptorT, ActorT > const& channel_keyword, attribute_keyword< SeverityDescriptorT, ActorT > const& severity_keyword)
{
     typedef channel_severity_filter_actor< typename ChannelDescriptorT::value_type, typename SeverityDescriptorT::value_type, fallback_to_none, fallback_to_none, less, greater_equal, std::allocator< void >, ActorT > result_type;
@@ -348,7 +348,7 @@

//! \overload
template< typename SeverityT, typename ChannelT, typename ChannelFallbackT, typename ChannelTagT, template< typename > class ActorT >
-BOOST_LOG_FORCEINLINE channel_severity_filter_actor< ChannelT, SeverityT, ChannelFallbackT, fallback_to_none, less, greater_equal, std::allocator< void >, ActorT >
+BOOST_FORCEINLINE channel_severity_filter_actor< ChannelT, SeverityT, ChannelFallbackT, fallback_to_none, less, greater_equal, std::allocator< void >, ActorT >
channel_severity_filter(attribute_actor< ChannelT, ChannelFallbackT, ChannelTagT, ActorT > const& channel_placeholder, attribute_name const& severity_name)
{
     typedef channel_severity_filter_actor< ChannelT, SeverityT, ChannelFallbackT, fallback_to_none, less, greater_equal, std::allocator< void >, ActorT > result_type;
@@ -359,7 +359,7 @@

//! \overload
template< typename ChannelT, typename SeverityT, typename SeverityFallbackT, typename SeverityTagT, template< typename > class ActorT >
-BOOST_LOG_FORCEINLINE channel_severity_filter_actor< ChannelT, SeverityT, fallback_to_none, SeverityFallbackT, less, greater_equal, std::allocator< void >, ActorT >
+BOOST_FORCEINLINE channel_severity_filter_actor< ChannelT, SeverityT, fallback_to_none, SeverityFallbackT, less, greater_equal, std::allocator< void >, ActorT >
channel_severity_filter(attribute_name const& channel_name, attribute_actor< SeverityT, SeverityFallbackT, SeverityTagT, ActorT > const& severity_placeholder)
{
     typedef channel_severity_filter_actor< ChannelT, SeverityT, fallback_to_none, SeverityFallbackT, less, greater_equal, std::allocator< void >, ActorT > result_type;
@@ -370,7 +370,7 @@

//! \overload
template< typename ChannelT, typename ChannelFallbackT, typename ChannelTagT, typename SeverityT, typename SeverityFallbackT, typename SeverityTagT, template< typename > class ActorT >
-BOOST_LOG_FORCEINLINE channel_severity_filter_actor< ChannelT, SeverityT, ChannelFallbackT, SeverityFallbackT, less, greater_equal, std::allocator< void >, ActorT >
+BOOST_FORCEINLINE channel_severity_filter_actor< ChannelT, SeverityT, ChannelFallbackT, SeverityFallbackT, less, greater_equal, std::allocator< void >, ActorT >
channel_severity_filter(attribute_actor< ChannelT, ChannelFallbackT, ChannelTagT, ActorT > const& channel_placeholder, attribute_actor< SeverityT, SeverityFallbackT, SeverityTagT, ActorT > const& severity_placeholder)
{
     typedef channel_severity_filter_actor< ChannelT, SeverityT, ChannelFallbackT, SeverityFallbackT, less, greater_equal, std::allocator< void >, ActorT > result_type;
@@ -382,7 +382,7 @@

//! \overload
template< typename ChannelT, typename SeverityT, typename SeverityCompareT >
-BOOST_LOG_FORCEINLINE channel_severity_filter_actor< ChannelT, SeverityT, fallback_to_none, fallback_to_none, less, SeverityCompareT >
+BOOST_FORCEINLINE channel_severity_filter_actor< ChannelT, SeverityT, fallback_to_none, fallback_to_none, less, SeverityCompareT >
channel_severity_filter(attribute_name const& channel_name, attribute_name const& severity_name, SeverityCompareT const& severity_compare)
{
     typedef channel_severity_filter_actor< ChannelT, SeverityT, fallback_to_none, fallback_to_none, less, SeverityCompareT > result_type;
@@ -393,7 +393,7 @@

//! \overload
template< typename SeverityT, typename ChannelDescriptorT, template< typename > class ActorT, typename SeverityCompareT >
-BOOST_LOG_FORCEINLINE channel_severity_filter_actor< typename ChannelDescriptorT::value_type, SeverityT, fallback_to_none, fallback_to_none, less, SeverityCompareT, std::allocator< void >, ActorT >
+BOOST_FORCEINLINE channel_severity_filter_actor< typename ChannelDescriptorT::value_type, SeverityT, fallback_to_none, fallback_to_none, less, SeverityCompareT, std::allocator< void >, ActorT >
channel_severity_filter(attribute_keyword< ChannelDescriptorT, ActorT > const& channel_keyword, attribute_name const& severity_name, SeverityCompareT const& severity_compare)
{
     typedef channel_severity_filter_actor< typename ChannelDescriptorT::value_type, SeverityT, fallback_to_none, fallback_to_none, less, SeverityCompareT, std::allocator< void >, ActorT > result_type;
@@ -404,7 +404,7 @@

//! \overload
template< typename ChannelT, typename SeverityDescriptorT, template< typename > class ActorT, typename SeverityCompareT >
-BOOST_LOG_FORCEINLINE channel_severity_filter_actor< ChannelT, typename SeverityDescriptorT::value_type, fallback_to_none, fallback_to_none, less, SeverityCompareT, std::allocator< void >, ActorT >
+BOOST_FORCEINLINE channel_severity_filter_actor< ChannelT, typename SeverityDescriptorT::value_type, fallback_to_none, fallback_to_none, less, SeverityCompareT, std::allocator< void >, ActorT >
channel_severity_filter(attribute_name const& channel_name, attribute_keyword< SeverityDescriptorT, ActorT > const& severity_keyword, SeverityCompareT const& severity_compare)
{
     typedef channel_severity_filter_actor< ChannelT, typename SeverityDescriptorT::value_type, fallback_to_none, fallback_to_none, less, SeverityCompareT, std::allocator< void >, ActorT > result_type;
@@ -415,7 +415,7 @@

//! \overload
template< typename ChannelDescriptorT, typename SeverityDescriptorT, template< typename > class ActorT, typename SeverityCompareT >
-BOOST_LOG_FORCEINLINE channel_severity_filter_actor< typename ChannelDescriptorT::value_type, typename SeverityDescriptorT::value_type, fallback_to_none, fallback_to_none, less, SeverityCompareT, std::allocator< void >, ActorT >
+BOOST_FORCEINLINE channel_severity_filter_actor< typename ChannelDescriptorT::value_type, typename SeverityDescriptorT::value_type, fallback_to_none, fallback_to_none, less, SeverityCompareT, std::allocator< void >, ActorT >
channel_severity_filter(attribute_keyword< ChannelDescriptorT, ActorT > const& channel_keyword, attribute_keyword< SeverityDescriptorT, ActorT > const& severity_keyword, SeverityCompareT const& severity_compare)
{
     typedef channel_severity_filter_actor< typename ChannelDescriptorT::value_type, typename SeverityDescriptorT::value_type, fallback_to_none, fallback_to_none, less, SeverityCompareT, std::allocator< void >, ActorT > result_type;
@@ -426,7 +426,7 @@

//! \overload
template< typename SeverityT, typename ChannelT, typename ChannelFallbackT, typename ChannelTagT, template< typename > class ActorT, typename SeverityCompareT >
-BOOST_LOG_FORCEINLINE channel_severity_filter_actor< ChannelT, SeverityT, ChannelFallbackT, fallback_to_none, less, SeverityCompareT, std::allocator< void >, ActorT >
+BOOST_FORCEINLINE channel_severity_filter_actor< ChannelT, SeverityT, ChannelFallbackT, fallback_to_none, less, SeverityCompareT, std::allocator< void >, ActorT >
channel_severity_filter(attribute_actor< ChannelT, ChannelFallbackT, ChannelTagT, ActorT > const& channel_placeholder, attribute_name const& severity_name, SeverityCompareT const& severity_compare)
{
     typedef channel_severity_filter_actor< ChannelT, SeverityT, ChannelFallbackT, fallback_to_none, less, SeverityCompareT, std::allocator< void >, ActorT > result_type;
@@ -437,7 +437,7 @@

//! \overload
template< typename ChannelT, typename SeverityT, typename SeverityFallbackT, typename SeverityTagT, template< typename > class ActorT, typename SeverityCompareT >
-BOOST_LOG_FORCEINLINE channel_severity_filter_actor< ChannelT, SeverityT, fallback_to_none, SeverityFallbackT, less, SeverityCompareT, std::allocator< void >, ActorT >
+BOOST_FORCEINLINE channel_severity_filter_actor< ChannelT, SeverityT, fallback_to_none, SeverityFallbackT, less, SeverityCompareT, std::allocator< void >, ActorT >
channel_severity_filter(attribute_name const& channel_name, attribute_actor< SeverityT, SeverityFallbackT, SeverityTagT, ActorT > const& severity_placeholder, SeverityCompareT const& severity_compare)
{
     typedef channel_severity_filter_actor< ChannelT, SeverityT, fallback_to_none, SeverityFallbackT, less, SeverityCompareT, std::allocator< void >, ActorT > result_type;
@@ -448,7 +448,7 @@

//! \overload
template< typename ChannelT, typename ChannelFallbackT, typename ChannelTagT, typename SeverityT, typename SeverityFallbackT, typename SeverityTagT, template< typename > class ActorT, typename SeverityCompareT >
-BOOST_LOG_FORCEINLINE channel_severity_filter_actor< ChannelT, SeverityT, ChannelFallbackT, SeverityFallbackT, less, SeverityCompareT, std::allocator< void >, ActorT >
+BOOST_FORCEINLINE channel_severity_filter_actor< ChannelT, SeverityT, ChannelFallbackT, SeverityFallbackT, less, SeverityCompareT, std::allocator< void >, ActorT >
channel_severity_filter(attribute_actor< ChannelT, ChannelFallbackT, ChannelTagT, ActorT > const& channel_placeholder, attribute_actor< SeverityT, SeverityFallbackT, SeverityTagT, ActorT > const& severity_placeholder, SeverityCompareT const& severity_compare)
{
     typedef channel_severity_filter_actor< ChannelT, SeverityT, ChannelFallbackT, SeverityFallbackT, less, SeverityCompareT, std::allocator< void >, ActorT > result_type;
@@ -460,7 +460,7 @@

//! \overload
template< typename ChannelT, typename SeverityT, typename SeverityCompareT, typename ChannelOrderT >
-BOOST_LOG_FORCEINLINE channel_severity_filter_actor< ChannelT, SeverityT, fallback_to_none, fallback_to_none, ChannelOrderT, SeverityCompareT >
+BOOST_FORCEINLINE channel_severity_filter_actor< ChannelT, SeverityT, fallback_to_none, fallback_to_none, ChannelOrderT, SeverityCompareT >
channel_severity_filter(attribute_name const& channel_name, attribute_name const& severity_name, SeverityCompareT const& severity_compare, ChannelOrderT const& channel_order)
{
     typedef channel_severity_filter_actor< ChannelT, SeverityT, fallback_to_none, fallback_to_none, ChannelOrderT, SeverityCompareT > result_type;
@@ -471,7 +471,7 @@

//! \overload
template< typename SeverityT, typename ChannelDescriptorT, template< typename > class ActorT, typename SeverityCompareT, typename ChannelOrderT >
-BOOST_LOG_FORCEINLINE channel_severity_filter_actor< typename ChannelDescriptorT::value_type, SeverityT, fallback_to_none, fallback_to_none, ChannelOrderT, SeverityCompareT, std::allocator< void >, ActorT >
+BOOST_FORCEINLINE channel_severity_filter_actor< typename ChannelDescriptorT::value_type, SeverityT, fallback_to_none, fallback_to_none, ChannelOrderT, SeverityCompareT, std::allocator< void >, ActorT >
channel_severity_filter(attribute_keyword< ChannelDescriptorT, ActorT > const& channel_keyword, attribute_name const& severity_name, SeverityCompareT const& severity_compare, ChannelOrderT const& channel_order)
{
     typedef channel_severity_filter_actor< typename ChannelDescriptorT::value_type, SeverityT, fallback_to_none, fallback_to_none, ChannelOrderT, SeverityCompareT, std::allocator< void >, ActorT > result_type;
@@ -482,7 +482,7 @@

//! \overload
template< typename ChannelT, typename SeverityDescriptorT, template< typename > class ActorT, typename SeverityCompareT, typename ChannelOrderT >
-BOOST_LOG_FORCEINLINE channel_severity_filter_actor< ChannelT, typename SeverityDescriptorT::value_type, fallback_to_none, fallback_to_none, ChannelOrderT, SeverityCompareT, std::allocator< void >, ActorT >
+BOOST_FORCEINLINE channel_severity_filter_actor< ChannelT, typename SeverityDescriptorT::value_type, fallback_to_none, fallback_to_none, ChannelOrderT, SeverityCompareT, std::allocator< void >, ActorT >
channel_severity_filter(attribute_name const& channel_name, attribute_keyword< SeverityDescriptorT, ActorT > const& severity_keyword, SeverityCompareT const& severity_compare, ChannelOrderT const& channel_order)
{
     typedef channel_severity_filter_actor< ChannelT, typename SeverityDescriptorT::value_type, fallback_to_none, fallback_to_none, ChannelOrderT, SeverityCompareT, std::allocator< void >, ActorT > result_type;
@@ -493,7 +493,7 @@

//! \overload
template< typename ChannelDescriptorT, typename SeverityDescriptorT, template< typename > class ActorT, typename SeverityCompareT, typename ChannelOrderT >
-BOOST_LOG_FORCEINLINE channel_severity_filter_actor< typename ChannelDescriptorT::value_type, typename SeverityDescriptorT::value_type, fallback_to_none, fallback_to_none, ChannelOrderT, SeverityCompareT, std::allocator< void >, ActorT >
+BOOST_FORCEINLINE channel_severity_filter_actor< typename ChannelDescriptorT::value_type, typename SeverityDescriptorT::value_type, fallback_to_none, fallback_to_none, ChannelOrderT, SeverityCompareT, std::allocator< void >, ActorT >
channel_severity_filter(attribute_keyword< ChannelDescriptorT, ActorT > const& channel_keyword, attribute_keyword< SeverityDescriptorT, ActorT > const& severity_keyword, SeverityCompareT const& severity_compare, ChannelOrderT const& channel_order)
{
     typedef channel_severity_filter_actor< typename ChannelDescriptorT::value_type, typename SeverityDescriptorT::value_type, fallback_to_none, fallback_to_none, ChannelOrderT, SeverityCompareT, std::allocator< void >, ActorT > result_type;
@@ -504,7 +504,7 @@

//! \overload
template< typename SeverityT, typename ChannelT, typename ChannelFallbackT, typename ChannelTagT, template< typename > class ActorT, typename SeverityCompareT, typename ChannelOrderT >
-BOOST_LOG_FORCEINLINE channel_severity_filter_actor< ChannelT, SeverityT, ChannelFallbackT, fallback_to_none, ChannelOrderT, SeverityCompareT, std::allocator< void >, ActorT >
+BOOST_FORCEINLINE channel_severity_filter_actor< ChannelT, SeverityT, ChannelFallbackT, fallback_to_none, ChannelOrderT, SeverityCompareT, std::allocator< void >, ActorT >
channel_severity_filter(attribute_actor< ChannelT, ChannelFallbackT, ChannelTagT, ActorT > const& channel_placeholder, attribute_name const& severity_name, SeverityCompareT const& severity_compare, ChannelOrderT const& channel_order)
{
     typedef channel_severity_filter_actor< ChannelT, SeverityT, ChannelFallbackT, fallback_to_none, ChannelOrderT, SeverityCompareT, std::allocator< void >, ActorT > result_type;
@@ -515,7 +515,7 @@

//! \overload
template< typename ChannelT, typename SeverityT, typename SeverityFallbackT, typename SeverityTagT, template< typename > class ActorT, typename SeverityCompareT, typename ChannelOrderT >
-BOOST_LOG_FORCEINLINE channel_severity_filter_actor< ChannelT, SeverityT, fallback_to_none, SeverityFallbackT, ChannelOrderT, SeverityCompareT, std::allocator< void >, ActorT >
+BOOST_FORCEINLINE channel_severity_filter_actor< ChannelT, SeverityT, fallback_to_none, SeverityFallbackT, ChannelOrderT, SeverityCompareT, std::allocator< void >, ActorT >
channel_severity_filter(attribute_name const& channel_name, attribute_actor< SeverityT, SeverityFallbackT, SeverityTagT, ActorT > const& severity_placeholder, SeverityCompareT const& severity_compare, ChannelOrderT const& channel_order)
{
     typedef channel_severity_filter_actor< ChannelT, SeverityT, fallback_to_none, SeverityFallbackT, ChannelOrderT, SeverityCompareT, std::allocator< void >, ActorT > result_type;
@@ -526,7 +526,7 @@

//! \overload
template< typename ChannelT, typename ChannelFallbackT, typename ChannelTagT, typename SeverityT, typename SeverityFallbackT, typename SeverityTagT, template< typename > class ActorT, typename SeverityCompareT, typename ChannelOrderT >
-BOOST_LOG_FORCEINLINE channel_severity_filter_actor< ChannelT, SeverityT, ChannelFallbackT, SeverityFallbackT, ChannelOrderT, SeverityCompareT, std::allocator< void >, ActorT >
+BOOST_FORCEINLINE channel_severity_filter_actor< ChannelT, SeverityT, ChannelFallbackT, SeverityFallbackT, ChannelOrderT, SeverityCompareT, std::allocator< void >, ActorT >
channel_severity_filter(attribute_actor< ChannelT, ChannelFallbackT, ChannelTagT, ActorT > const& channel_placeholder, attribute_actor< SeverityT, SeverityFallbackT, SeverityTagT, ActorT > const& severity_placeholder, SeverityCompareT const& severity_compare, ChannelOrderT const& channel_order)
{
     typedef channel_severity_filter_actor< ChannelT, SeverityT, ChannelFallbackT, SeverityFallbackT, ChannelOrderT, SeverityCompareT, std::allocator< void >, ActorT > result_type;

Modified: branches/release/boost/log/expressions/predicates/contains.hpp
==============================================================================
--- branches/release/boost/log/expressions/predicates/contains.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/expressions/predicates/contains.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -27,7 +27,7 @@
#include <boost/log/utility/functional/contains.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -84,7 +84,7 @@
  * which is assumed to be a string, contains the specified substring.
  */
template< typename T, typename FallbackPolicyT, typename TagT, template< typename > class ActorT, typename SubstringT >
-BOOST_LOG_FORCEINLINE ActorT< aux::unary_function_terminal< attribute_contains< T, typename boost::log::aux::make_embedded_string_type< SubstringT >::type, FallbackPolicyT > > >
+BOOST_FORCEINLINE ActorT< aux::unary_function_terminal< attribute_contains< T, typename boost::log::aux::make_embedded_string_type< SubstringT >::type, FallbackPolicyT > > >
contains(attribute_actor< T, FallbackPolicyT, TagT, ActorT > const& attr, SubstringT const& substring)
{
     typedef aux::unary_function_terminal< attribute_contains< T, typename boost::log::aux::make_embedded_string_type< SubstringT >::type, FallbackPolicyT > > terminal_type;
@@ -97,7 +97,7 @@
  * which is assumed to be a string, contains the specified substring.
  */
template< typename DescriptorT, template< typename > class ActorT, typename SubstringT >
-BOOST_LOG_FORCEINLINE ActorT< aux::unary_function_terminal< attribute_contains< typename DescriptorT::value_type, typename boost::log::aux::make_embedded_string_type< SubstringT >::type > > >
+BOOST_FORCEINLINE ActorT< aux::unary_function_terminal< attribute_contains< typename DescriptorT::value_type, typename boost::log::aux::make_embedded_string_type< SubstringT >::type > > >
contains(attribute_keyword< DescriptorT, ActorT > const&, SubstringT const& substring)
{
     typedef aux::unary_function_terminal< attribute_contains< typename DescriptorT::value_type, typename boost::log::aux::make_embedded_string_type< SubstringT >::type > > terminal_type;
@@ -110,7 +110,7 @@
  * which is assumed to be a string, contains the specified substring.
  */
template< typename T, typename SubstringT >
-BOOST_LOG_FORCEINLINE phoenix::actor< aux::unary_function_terminal< attribute_contains< T, typename boost::log::aux::make_embedded_string_type< SubstringT >::type > > >
+BOOST_FORCEINLINE phoenix::actor< aux::unary_function_terminal< attribute_contains< T, typename boost::log::aux::make_embedded_string_type< SubstringT >::type > > >
contains(attribute_name const& name, SubstringT const& substring)
{
     typedef aux::unary_function_terminal< attribute_contains< T, typename boost::log::aux::make_embedded_string_type< SubstringT >::type > > terminal_type;

Modified: branches/release/boost/log/expressions/predicates/ends_with.hpp
==============================================================================
--- branches/release/boost/log/expressions/predicates/ends_with.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/expressions/predicates/ends_with.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -27,7 +27,7 @@
#include <boost/log/utility/functional/ends_with.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -84,7 +84,7 @@
  * which is assumed to be a string, ends with the specified substring.
  */
template< typename T, typename FallbackPolicyT, typename TagT, template< typename > class ActorT, typename SubstringT >
-BOOST_LOG_FORCEINLINE ActorT< aux::unary_function_terminal< attribute_ends_with< T, typename boost::log::aux::make_embedded_string_type< SubstringT >::type, FallbackPolicyT > > >
+BOOST_FORCEINLINE ActorT< aux::unary_function_terminal< attribute_ends_with< T, typename boost::log::aux::make_embedded_string_type< SubstringT >::type, FallbackPolicyT > > >
ends_with(attribute_actor< T, FallbackPolicyT, TagT, ActorT > const& attr, SubstringT const& substring)
{
     typedef aux::unary_function_terminal< attribute_ends_with< T, typename boost::log::aux::make_embedded_string_type< SubstringT >::type, FallbackPolicyT > > terminal_type;
@@ -97,7 +97,7 @@
  * which is assumed to be a string, ends with the specified substring.
  */
template< typename DescriptorT, template< typename > class ActorT, typename SubstringT >
-BOOST_LOG_FORCEINLINE ActorT< aux::unary_function_terminal< attribute_ends_with< typename DescriptorT::value_type, typename boost::log::aux::make_embedded_string_type< SubstringT >::type > > >
+BOOST_FORCEINLINE ActorT< aux::unary_function_terminal< attribute_ends_with< typename DescriptorT::value_type, typename boost::log::aux::make_embedded_string_type< SubstringT >::type > > >
ends_with(attribute_keyword< DescriptorT, ActorT > const&, SubstringT const& substring)
{
     typedef aux::unary_function_terminal< attribute_ends_with< typename DescriptorT::value_type, typename boost::log::aux::make_embedded_string_type< SubstringT >::type > > terminal_type;
@@ -110,7 +110,7 @@
  * which is assumed to be a string, ends with the specified substring.
  */
template< typename T, typename SubstringT >
-BOOST_LOG_FORCEINLINE phoenix::actor< aux::unary_function_terminal< attribute_ends_with< T, typename boost::log::aux::make_embedded_string_type< SubstringT >::type > > >
+BOOST_FORCEINLINE phoenix::actor< aux::unary_function_terminal< attribute_ends_with< T, typename boost::log::aux::make_embedded_string_type< SubstringT >::type > > >
ends_with(attribute_name const& name, SubstringT const& substring)
{
     typedef aux::unary_function_terminal< attribute_ends_with< T, typename boost::log::aux::make_embedded_string_type< SubstringT >::type > > terminal_type;

Modified: branches/release/boost/log/expressions/predicates/has_attr.hpp
==============================================================================
--- branches/release/boost/log/expressions/predicates/has_attr.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/expressions/predicates/has_attr.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -26,7 +26,7 @@
#include <boost/log/utility/functional/nop.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -131,7 +131,7 @@
  * presence in a log record. The node will also check that the attribute value has the specified type, if present.
  */
template< typename AttributeValueT >
-BOOST_LOG_FORCEINLINE phoenix::actor< aux::unary_function_terminal< has_attribute< AttributeValueT > > > has_attr(attribute_name const& name)
+BOOST_FORCEINLINE phoenix::actor< aux::unary_function_terminal< has_attribute< AttributeValueT > > > has_attr(attribute_name const& name)
{
     typedef aux::unary_function_terminal< has_attribute< AttributeValueT > > terminal_type;
     phoenix::actor< terminal_type > act = {{ terminal_type(name) }};
@@ -142,7 +142,7 @@
  * The function generates a terminal node in a template expression. The node will check for the attribute value
  * presence in a log record.
  */
-BOOST_LOG_FORCEINLINE phoenix::actor< aux::unary_function_terminal< has_attribute< void > > > has_attr(attribute_name const& name)
+BOOST_FORCEINLINE phoenix::actor< aux::unary_function_terminal< has_attribute< void > > > has_attr(attribute_name const& name)
{
     typedef aux::unary_function_terminal< has_attribute< void > > terminal_type;
     phoenix::actor< terminal_type > act = {{ terminal_type(name) }};
@@ -154,7 +154,7 @@
  * presence in a log record. The node will also check that the attribute value has the specified type, if present.
  */
template< typename DescriptorT, template< typename > class ActorT >
-BOOST_LOG_FORCEINLINE ActorT< aux::unary_function_terminal< has_attribute< typename DescriptorT::value_type > > > has_attr(attribute_keyword< DescriptorT, ActorT > const&)
+BOOST_FORCEINLINE ActorT< aux::unary_function_terminal< has_attribute< typename DescriptorT::value_type > > > has_attr(attribute_keyword< DescriptorT, ActorT > const&)
{
     typedef aux::unary_function_terminal< has_attribute< typename DescriptorT::value_type > > terminal_type;
     ActorT< terminal_type > act = {{ terminal_type(DescriptorT::get_name()) }};

Modified: branches/release/boost/log/expressions/predicates/is_debugger_present.hpp
==============================================================================
--- branches/release/boost/log/expressions/predicates/is_debugger_present.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/expressions/predicates/is_debugger_present.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -17,7 +17,7 @@

#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/expressions/predicates/is_in_range.hpp
==============================================================================
--- branches/release/boost/log/expressions/predicates/is_in_range.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/expressions/predicates/is_in_range.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -28,7 +28,7 @@
#include <boost/log/utility/functional/in_range.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -85,7 +85,7 @@
  * is in the specified range. The range must be half-open, that is the predicate will be equivalent to <tt>least <= attr < most</tt>.
  */
template< typename T, typename FallbackPolicyT, typename TagT, template< typename > class ActorT, typename BoundaryT >
-BOOST_LOG_FORCEINLINE ActorT< aux::unary_function_terminal< attribute_is_in_range< T, typename boost::log::aux::make_embedded_string_type< BoundaryT >::type, FallbackPolicyT > > >
+BOOST_FORCEINLINE ActorT< aux::unary_function_terminal< attribute_is_in_range< T, typename boost::log::aux::make_embedded_string_type< BoundaryT >::type, FallbackPolicyT > > >
is_in_range(attribute_actor< T, FallbackPolicyT, TagT, ActorT > const& attr, BoundaryT const& least, BoundaryT const& most)
{
     typedef typename boost::log::aux::make_embedded_string_type< BoundaryT >::type boundary_type;
@@ -99,7 +99,7 @@
  * is in the specified range. The range must be half-open, that is the predicate will be equivalent to <tt>least <= attr < most</tt>.
  */
template< typename DescriptorT, template< typename > class ActorT, typename BoundaryT >
-BOOST_LOG_FORCEINLINE ActorT< aux::unary_function_terminal< attribute_is_in_range< typename DescriptorT::value_type, typename boost::log::aux::make_embedded_string_type< BoundaryT >::type > > >
+BOOST_FORCEINLINE ActorT< aux::unary_function_terminal< attribute_is_in_range< typename DescriptorT::value_type, typename boost::log::aux::make_embedded_string_type< BoundaryT >::type > > >
is_in_range(attribute_keyword< DescriptorT, ActorT > const&, BoundaryT const& least, BoundaryT const& most)
{
     typedef typename boost::log::aux::make_embedded_string_type< BoundaryT >::type boundary_type;
@@ -113,7 +113,7 @@
  * is in the specified range. The range must be half-open, that is the predicate will be equivalent to <tt>least <= attr < most</tt>.
  */
template< typename T, typename BoundaryT >
-BOOST_LOG_FORCEINLINE phoenix::actor< aux::unary_function_terminal< attribute_is_in_range< T, typename boost::log::aux::make_embedded_string_type< BoundaryT >::type > > >
+BOOST_FORCEINLINE phoenix::actor< aux::unary_function_terminal< attribute_is_in_range< T, typename boost::log::aux::make_embedded_string_type< BoundaryT >::type > > >
is_in_range(attribute_name const& name, BoundaryT const& least, BoundaryT const& most)
{
     typedef typename boost::log::aux::make_embedded_string_type< BoundaryT >::type boundary_type;

Modified: branches/release/boost/log/expressions/predicates/matches.hpp
==============================================================================
--- branches/release/boost/log/expressions/predicates/matches.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/expressions/predicates/matches.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -26,7 +26,7 @@
#include <boost/log/utility/functional/matches.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -83,7 +83,7 @@
  * which is assumed to be a string, matches the specified regular expression.
  */
template< typename T, typename FallbackPolicyT, typename TagT, template< typename > class ActorT, typename RegexT >
-BOOST_LOG_FORCEINLINE ActorT< aux::unary_function_terminal< attribute_matches< T, RegexT, FallbackPolicyT > > >
+BOOST_FORCEINLINE ActorT< aux::unary_function_terminal< attribute_matches< T, RegexT, FallbackPolicyT > > >
matches(attribute_actor< T, FallbackPolicyT, TagT, ActorT > const& attr, RegexT const& rex)
{
     typedef aux::unary_function_terminal< attribute_matches< T, RegexT, FallbackPolicyT > > terminal_type;
@@ -96,7 +96,7 @@
  * which is assumed to be a string, matches the specified regular expression.
  */
template< typename DescriptorT, template< typename > class ActorT, typename RegexT >
-BOOST_LOG_FORCEINLINE ActorT< aux::unary_function_terminal< attribute_matches< typename DescriptorT::value_type, RegexT > > >
+BOOST_FORCEINLINE ActorT< aux::unary_function_terminal< attribute_matches< typename DescriptorT::value_type, RegexT > > >
matches(attribute_keyword< DescriptorT, ActorT > const&, RegexT const& rex)
{
     typedef aux::unary_function_terminal< attribute_matches< typename DescriptorT::value_type, RegexT > > terminal_type;
@@ -109,7 +109,7 @@
  * which is assumed to be a string, matches the specified regular expression.
  */
template< typename T, typename RegexT >
-BOOST_LOG_FORCEINLINE phoenix::actor< aux::unary_function_terminal< attribute_matches< T, RegexT > > >
+BOOST_FORCEINLINE phoenix::actor< aux::unary_function_terminal< attribute_matches< T, RegexT > > >
matches(attribute_name const& name, RegexT const& rex)
{
     typedef aux::unary_function_terminal< attribute_matches< T, RegexT > > terminal_type;

Modified: branches/release/boost/log/expressions/record.hpp
==============================================================================
--- branches/release/boost/log/expressions/record.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/expressions/record.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -19,7 +19,7 @@
#include <boost/log/detail/config.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/keywords/auto_flush.hpp
==============================================================================
--- branches/release/boost/log/keywords/auto_flush.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/keywords/auto_flush.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@
#include <boost/parameter/keyword.hpp>
#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/keywords/channel.hpp
==============================================================================
--- branches/release/boost/log/keywords/channel.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/keywords/channel.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@
#include <boost/parameter/keyword.hpp>
#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/keywords/delimiter.hpp
==============================================================================
--- branches/release/boost/log/keywords/delimiter.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/keywords/delimiter.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@
#include <boost/parameter/keyword.hpp>
#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/keywords/depth.hpp
==============================================================================
--- branches/release/boost/log/keywords/depth.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/keywords/depth.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@
#include <boost/parameter/keyword.hpp>
#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/keywords/facility.hpp
==============================================================================
--- branches/release/boost/log/keywords/facility.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/keywords/facility.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@
#include <boost/parameter/keyword.hpp>
#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/keywords/file_name.hpp
==============================================================================
--- branches/release/boost/log/keywords/file_name.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/keywords/file_name.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@
#include <boost/parameter/keyword.hpp>
#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/keywords/filter.hpp
==============================================================================
--- branches/release/boost/log/keywords/filter.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/keywords/filter.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@
#include <boost/parameter/keyword.hpp>
#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/keywords/format.hpp
==============================================================================
--- branches/release/boost/log/keywords/format.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/keywords/format.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@
#include <boost/parameter/keyword.hpp>
#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/keywords/ident.hpp
==============================================================================
--- branches/release/boost/log/keywords/ident.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/keywords/ident.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@
#include <boost/parameter/keyword.hpp>
#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/keywords/ip_version.hpp
==============================================================================
--- branches/release/boost/log/keywords/ip_version.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/keywords/ip_version.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@
#include <boost/parameter/keyword.hpp>
#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/keywords/iteration.hpp
==============================================================================
--- branches/release/boost/log/keywords/iteration.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/keywords/iteration.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@
#include <boost/parameter/keyword.hpp>
#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/keywords/log_name.hpp
==============================================================================
--- branches/release/boost/log/keywords/log_name.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/keywords/log_name.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@
#include <boost/parameter/keyword.hpp>
#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/keywords/log_source.hpp
==============================================================================
--- branches/release/boost/log/keywords/log_source.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/keywords/log_source.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@
#include <boost/parameter/keyword.hpp>
#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/keywords/max_size.hpp
==============================================================================
--- branches/release/boost/log/keywords/max_size.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/keywords/max_size.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@
#include <boost/parameter/keyword.hpp>
#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/keywords/message_file.hpp
==============================================================================
--- branches/release/boost/log/keywords/message_file.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/keywords/message_file.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@
#include <boost/parameter/keyword.hpp>
#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/keywords/min_free_space.hpp
==============================================================================
--- branches/release/boost/log/keywords/min_free_space.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/keywords/min_free_space.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@
#include <boost/parameter/keyword.hpp>
#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/keywords/open_mode.hpp
==============================================================================
--- branches/release/boost/log/keywords/open_mode.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/keywords/open_mode.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@
#include <boost/parameter/keyword.hpp>
#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/keywords/order.hpp
==============================================================================
--- branches/release/boost/log/keywords/order.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/keywords/order.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@
#include <boost/parameter/keyword.hpp>
#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/keywords/ordering_window.hpp
==============================================================================
--- branches/release/boost/log/keywords/ordering_window.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/keywords/ordering_window.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@
#include <boost/parameter/keyword.hpp>
#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/keywords/registration.hpp
==============================================================================
--- branches/release/boost/log/keywords/registration.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/keywords/registration.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@
#include <boost/parameter/keyword.hpp>
#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/keywords/rotation_size.hpp
==============================================================================
--- branches/release/boost/log/keywords/rotation_size.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/keywords/rotation_size.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@
#include <boost/parameter/keyword.hpp>
#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/keywords/scan_method.hpp
==============================================================================
--- branches/release/boost/log/keywords/scan_method.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/keywords/scan_method.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@
#include <boost/parameter/keyword.hpp>
#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/keywords/severity.hpp
==============================================================================
--- branches/release/boost/log/keywords/severity.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/keywords/severity.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@
#include <boost/parameter/keyword.hpp>
#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/keywords/start_thread.hpp
==============================================================================
--- branches/release/boost/log/keywords/start_thread.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/keywords/start_thread.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@
#include <boost/parameter/keyword.hpp>
#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/keywords/target.hpp
==============================================================================
--- branches/release/boost/log/keywords/target.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/keywords/target.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@
#include <boost/parameter/keyword.hpp>
#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/keywords/time_based_rotation.hpp
==============================================================================
--- branches/release/boost/log/keywords/time_based_rotation.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/keywords/time_based_rotation.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@
#include <boost/parameter/keyword.hpp>
#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/keywords/use_impl.hpp
==============================================================================
--- branches/release/boost/log/keywords/use_impl.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/keywords/use_impl.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@
#include <boost/parameter/keyword.hpp>
#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/sinks.hpp
==============================================================================
--- branches/release/boost/log/sinks.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/sinks.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -40,7 +40,7 @@
#include <boost/log/sinks/event_log_backend.hpp>
#endif // BOOST_WINDOWS

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/sinks/async_frontend.hpp
==============================================================================
--- branches/release/boost/log/sinks/async_frontend.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/sinks/async_frontend.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -20,7 +20,7 @@
#include <boost/static_assert.hpp>
#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/sinks/attribute_mapping.hpp
==============================================================================
--- branches/release/boost/log/sinks/attribute_mapping.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/sinks/attribute_mapping.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -27,7 +27,7 @@
#include <boost/log/attributes/value_visitation.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/sinks/basic_sink_backend.hpp
==============================================================================
--- branches/release/boost/log/sinks/basic_sink_backend.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/sinks/basic_sink_backend.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -23,7 +23,7 @@
#include <boost/log/attributes/attribute_value_set.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -45,10 +45,10 @@
//! Frontend requirements tag
typedef FrontendRequirementsT frontend_requirements;

- BOOST_LOG_DEFAULTED_FUNCTION(basic_sink_backend(), {})
+ BOOST_DEFAULTED_FUNCTION(basic_sink_backend(), {})

- BOOST_LOG_DELETED_FUNCTION(basic_sink_backend(basic_sink_backend const&))
- BOOST_LOG_DELETED_FUNCTION(basic_sink_backend& operator= (basic_sink_backend const&))
+ BOOST_DELETED_FUNCTION(basic_sink_backend(basic_sink_backend const&))
+ BOOST_DELETED_FUNCTION(basic_sink_backend& operator= (basic_sink_backend const&))
};

/*!

Modified: branches/release/boost/log/sinks/basic_sink_frontend.hpp
==============================================================================
--- branches/release/boost/log/sinks/basic_sink_frontend.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/sinks/basic_sink_frontend.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -36,7 +36,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

Modified: branches/release/boost/log/sinks/block_on_overflow.hpp
==============================================================================
--- branches/release/boost/log/sinks/block_on_overflow.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/sinks/block_on_overflow.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@

#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/sinks/bounded_fifo_queue.hpp
==============================================================================
--- branches/release/boost/log/sinks/bounded_fifo_queue.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/sinks/bounded_fifo_queue.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@

#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/sinks/bounded_ordering_queue.hpp
==============================================================================
--- branches/release/boost/log/sinks/bounded_ordering_queue.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/sinks/bounded_ordering_queue.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@

#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/sinks/debug_output_backend.hpp
==============================================================================
--- branches/release/boost/log/sinks/debug_output_backend.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/sinks/debug_output_backend.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@
#include <string>
#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/sinks/drop_on_overflow.hpp
==============================================================================
--- branches/release/boost/log/sinks/drop_on_overflow.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/sinks/drop_on_overflow.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -20,7 +20,7 @@
#include <boost/log/core/record_view.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/sinks/event_log_backend.hpp
==============================================================================
--- branches/release/boost/log/sinks/event_log_backend.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/sinks/event_log_backend.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@

#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/sinks/event_log_constants.hpp
==============================================================================
--- branches/release/boost/log/sinks/event_log_constants.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/sinks/event_log_constants.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@

#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/sinks/frontend_requirements.hpp
==============================================================================
--- branches/release/boost/log/sinks/frontend_requirements.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/sinks/frontend_requirements.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -28,7 +28,7 @@
#include <boost/log/detail/config.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/sinks/sink.hpp
==============================================================================
--- branches/release/boost/log/sinks/sink.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/sinks/sink.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -23,7 +23,7 @@
#include <boost/log/attributes/attribute_value_set.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -100,8 +100,8 @@
*/
bool is_cross_thread() const BOOST_NOEXCEPT { return m_cross_thread; }

- BOOST_LOG_DELETED_FUNCTION(sink(sink const&))
- BOOST_LOG_DELETED_FUNCTION(sink& operator= (sink const&))
+ BOOST_DELETED_FUNCTION(sink(sink const&))
+ BOOST_DELETED_FUNCTION(sink& operator= (sink const&))
};

} // namespace sinks

Modified: branches/release/boost/log/sinks/sync_frontend.hpp
==============================================================================
--- branches/release/boost/log/sinks/sync_frontend.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/sinks/sync_frontend.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -17,7 +17,7 @@

#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/sinks/syslog_backend.hpp
==============================================================================
--- branches/release/boost/log/sinks/syslog_backend.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/sinks/syslog_backend.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -17,7 +17,7 @@

#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/sinks/syslog_constants.hpp
==============================================================================
--- branches/release/boost/log/sinks/syslog_constants.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/sinks/syslog_constants.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@

#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/sinks/text_file_backend.hpp
==============================================================================
--- branches/release/boost/log/sinks/text_file_backend.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/sinks/text_file_backend.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -41,7 +41,7 @@
#include <boost/log/sinks/frontend_requirements.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -71,7 +71,7 @@
     /*!
      * Default constructor
      */
- BOOST_LOG_DEFAULTED_FUNCTION(collector(), {})
+ BOOST_DEFAULTED_FUNCTION(collector(), {})

     /*!
      * Virtual destructor
@@ -119,8 +119,8 @@
     virtual uintmax_t scan_for_files(
         scan_method method, filesystem::path const& pattern = filesystem::path(), unsigned int* counter = 0) = 0;

- BOOST_LOG_DELETED_FUNCTION(collector(collector const&))
- BOOST_LOG_DELETED_FUNCTION(collector& operator= (collector const&))
+ BOOST_DELETED_FUNCTION(collector(collector const&))
+ BOOST_DELETED_FUNCTION(collector& operator= (collector const&))
};

namespace aux {

Modified: branches/release/boost/log/sinks/text_multifile_backend.hpp
==============================================================================
--- branches/release/boost/log/sinks/text_multifile_backend.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/sinks/text_multifile_backend.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -30,7 +30,7 @@
#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

Modified: branches/release/boost/log/sinks/text_ostream_backend.hpp
==============================================================================
--- branches/release/boost/log/sinks/text_ostream_backend.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/sinks/text_ostream_backend.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -22,7 +22,7 @@
#include <boost/log/sinks/frontend_requirements.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/sinks/unbounded_fifo_queue.hpp
==============================================================================
--- branches/release/boost/log/sinks/unbounded_fifo_queue.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/sinks/unbounded_fifo_queue.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@

#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/sinks/unbounded_ordering_queue.hpp
==============================================================================
--- branches/release/boost/log/sinks/unbounded_ordering_queue.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/sinks/unbounded_ordering_queue.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@

#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/sinks/unlocked_frontend.hpp
==============================================================================
--- branches/release/boost/log/sinks/unlocked_frontend.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/sinks/unlocked_frontend.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -25,7 +25,7 @@
#include <boost/log/sinks/frontend_requirements.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/sources/basic_logger.hpp
==============================================================================
--- branches/release/boost/log/sources/basic_logger.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/sources/basic_logger.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -41,7 +41,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

@@ -285,7 +285,7 @@
     }

     //! 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 +599,7 @@

#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(\

Modified: branches/release/boost/log/sources/channel_feature.hpp
==============================================================================
--- branches/release/boost/log/sources/channel_feature.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/sources/channel_feature.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -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

Modified: branches/release/boost/log/sources/channel_logger.hpp
==============================================================================
--- branches/release/boost/log/sources/channel_logger.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/sources/channel_logger.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -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

Modified: branches/release/boost/log/sources/exception_handler_feature.hpp
==============================================================================
--- branches/release/boost/log/sources/exception_handler_feature.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/sources/exception_handler_feature.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -29,7 +29,7 @@
#endif
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/sources/features.hpp
==============================================================================
--- branches/release/boost/log/sources/features.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/sources/features.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@
#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

Modified: branches/release/boost/log/sources/global_logger_storage.hpp
==============================================================================
--- branches/release/boost/log/sources/global_logger_storage.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/sources/global_logger_storage.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -25,7 +25,7 @@
#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 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 @@

//! 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 @@
     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

Modified: branches/release/boost/log/sources/logger.hpp
==============================================================================
--- branches/release/boost/log/sources/logger.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/sources/logger.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -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

Modified: branches/release/boost/log/sources/record_ostream.hpp
==============================================================================
--- branches/release/boost/log/sources/record_ostream.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/sources/record_ostream.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -31,7 +31,7 @@
#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

@@ -162,8 +162,8 @@
     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 @@
     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 @@
};

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);
}

Modified: branches/release/boost/log/sources/severity_channel_logger.hpp
==============================================================================
--- branches/release/boost/log/sources/severity_channel_logger.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/sources/severity_channel_logger.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -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

Modified: branches/release/boost/log/sources/severity_feature.hpp
==============================================================================
--- branches/release/boost/log/sources/severity_feature.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/sources/severity_feature.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -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 @@

     protected:
         //! Factory implementation
- class BOOST_LOG_VISIBLE impl :
+ class BOOST_SYMBOL_VISIBLE impl :
             public attribute_value::impl
         {
         public:

Modified: branches/release/boost/log/sources/severity_logger.hpp
==============================================================================
--- branches/release/boost/log/sources/severity_logger.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/sources/severity_logger.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -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

Modified: branches/release/boost/log/sources/threading_models.hpp
==============================================================================
--- branches/release/boost/log/sources/threading_models.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/sources/threading_models.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -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

Modified: branches/release/boost/log/support/date_time.hpp
==============================================================================
--- branches/release/boost/log/support/date_time.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/support/date_time.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -36,7 +36,7 @@
#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

@@ -142,7 +142,7 @@
         typedef typename date_time_formatter_generator_traits_impl< TimeT, CharT >::value_type value_type;

     public:
- BOOST_LOG_DEFAULTED_FUNCTION(formatter(), {})
+ BOOST_DEFAULTED_FUNCTION(formatter(), {})
         formatter(formatter const& that) : base_type(static_cast< base_type const& >(that)) {}
         formatter(BOOST_RV_REF(formatter) that) { this->swap(that); }

@@ -217,7 +217,7 @@
         typedef typename date_time_formatter_generator_traits< local_time::local_date_time_base< TimeT, TimeZoneT >, CharT, VoidT >::value_type value_type;

     public:
- BOOST_LOG_DEFAULTED_FUNCTION(formatter(), {})
+ BOOST_DEFAULTED_FUNCTION(formatter(), {})
         formatter(formatter const& that) : base_type(static_cast< base_type const& >(that)) {}
         formatter(BOOST_RV_REF(formatter) that) { this->swap(that); }

@@ -320,7 +320,7 @@
         typedef typename date_formatter_generator_traits_impl< DateT, CharT >::value_type value_type;

     public:
- BOOST_LOG_DEFAULTED_FUNCTION(formatter(), {})
+ BOOST_DEFAULTED_FUNCTION(formatter(), {})
         formatter(formatter const& that) : base_type(static_cast< base_type const& >(that)) {}
         formatter(BOOST_RV_REF(formatter) that) { this->swap(that); }

@@ -394,7 +394,7 @@
         typedef typename time_duration_formatter_generator_traits_impl< TimeDurationT, CharT >::value_type value_type;

     public:
- BOOST_LOG_DEFAULTED_FUNCTION(formatter(), {})
+ BOOST_DEFAULTED_FUNCTION(formatter(), {})
         formatter(formatter const& that) : base_type(static_cast< base_type const& >(that)) {}
         formatter(BOOST_RV_REF(formatter) that) { this->swap(that); }

@@ -492,7 +492,7 @@
         typedef typename date_duration_formatter_generator_traits_impl< DateDurationT, CharT >::value_type value_type;

     public:
- BOOST_LOG_DEFAULTED_FUNCTION(formatter(), {})
+ BOOST_DEFAULTED_FUNCTION(formatter(), {})
         formatter(formatter const& that) : base_type(static_cast< base_type const& >(that)) {}
         formatter(BOOST_RV_REF(formatter) that) { this->swap(that); }

Modified: branches/release/boost/log/support/exception.hpp
==============================================================================
--- branches/release/boost/log/support/exception.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/support/exception.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -22,7 +22,7 @@
#include <boost/log/utility/type_info_wrapper.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/support/regex.hpp
==============================================================================
--- branches/release/boost/log/support/regex.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/support/regex.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -21,7 +21,7 @@
#include <boost/log/utility/functional/matches.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/support/spirit_classic.hpp
==============================================================================
--- branches/release/boost/log/support/spirit_classic.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/support/spirit_classic.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -19,7 +19,7 @@
#include <boost/log/detail/config.hpp>
#include <boost/log/utility/functional/matches.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/support/spirit_qi.hpp
==============================================================================
--- branches/release/boost/log/support/spirit_qi.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/support/spirit_qi.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -22,7 +22,7 @@
#include <boost/spirit/include/support_component.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/support/xpressive.hpp
==============================================================================
--- branches/release/boost/log/support/xpressive.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/support/xpressive.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -23,7 +23,7 @@
#include <boost/log/utility/functional/matches.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/trivial.hpp
==============================================================================
--- branches/release/boost/log/trivial.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/trivial.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -23,7 +23,7 @@
#include <boost/log/sources/record_ostream.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -51,6 +51,7 @@
//! Returns stringized enumeration value or \c NULL, if the value is not valid
BOOST_LOG_API const char* to_string(severity_level lvl);

+//! Outputs stringized representation of the severity level to the stream
template< typename CharT, typename TraitsT >
inline std::basic_ostream< CharT, TraitsT >& operator<< (
     std::basic_ostream< CharT, TraitsT >& strm, severity_level lvl)
@@ -63,6 +64,7 @@
     return strm;
}

+//! Reads stringized representation of the severity level from the stream
template< typename CharT, typename TraitsT >
BOOST_LOG_API std::basic_istream< CharT, TraitsT >& operator>> (
     std::basic_istream< CharT, TraitsT >& strm, severity_level& lvl);
@@ -74,7 +76,12 @@
typedef sources::severity_logger< severity_level > logger_type;
#endif

-//! Trivial logger tag
+/*!
+ * \brief Trivial logger tag
+ *
+ * This tag can be used to acquire the logger that is used with lrivial logging macros.
+ * This may be useful when the logger is used with other macros which require a logger.
+ */
struct logger
{
     //! Logger type
@@ -93,7 +100,15 @@
#endif
};

-//! The macro is used to initiate logging
+/*!
+ * The macro is used to initiate logging. The \c lvl argument of the macro specifies one of the following
+ * severity levels: \c trace, \c debug, \c info, \c warning, \c error or \c fatal (see \c severity_level enum).
+ * Following the macro, there may be a streaming expression that composes the record message string. For example:
+ *
+ * \code
+ * BOOST_LOG_TRIVIAL(info) << "Hello, world!";
+ * \endcode
+ */
#define BOOST_LOG_TRIVIAL(lvl)\
     BOOST_LOG_STREAM_WITH_PARAMS(::boost::log::trivial::logger::get(),\
         (::boost::log::keywords::severity = ::boost::log::trivial::lvl))

Modified: branches/release/boost/log/utility/empty_deleter.hpp
==============================================================================
--- branches/release/boost/log/utility/empty_deleter.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/empty_deleter.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -21,7 +21,7 @@

#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/utility/exception_handler.hpp
==============================================================================
--- branches/release/boost/log/utility/exception_handler.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/exception_handler.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -30,7 +30,7 @@
#include <boost/log/utility/functional/nop.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/utility/explicit_operator_bool.hpp
==============================================================================
--- branches/release/boost/log/utility/explicit_operator_bool.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/explicit_operator_bool.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -20,7 +20,7 @@
#include <boost/log/detail/config.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -34,7 +34,7 @@
  * in terms of which the conversion operator will be implemented.
  */
#define BOOST_LOG_EXPLICIT_OPERATOR_BOOL()\
- BOOST_LOG_FORCEINLINE explicit operator bool () const\
+ BOOST_FORCEINLINE explicit operator bool () const\
     {\
         return !this->operator! ();\
     }
@@ -81,7 +81,7 @@
} // namespace boost

#define BOOST_LOG_EXPLICIT_OPERATOR_BOOL()\
- BOOST_LOG_FORCEINLINE operator boost::log::aux::unspecified_bool_type () const\
+ BOOST_FORCEINLINE operator boost::log::aux::unspecified_bool_type () const\
     {\
         if (!this->operator!())\
             return &boost::log::aux::unspecified_bool::true_value;\
@@ -92,7 +92,7 @@
#else

#define BOOST_LOG_EXPLICIT_OPERATOR_BOOL()\
- BOOST_LOG_FORCEINLINE operator bool () const\
+ BOOST_FORCEINLINE operator bool () const\
     {\
         return !this->operator! ();\
     }

Modified: branches/release/boost/log/utility/formatting_ostream.hpp
==============================================================================
--- branches/release/boost/log/utility/formatting_ostream.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/formatting_ostream.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -29,7 +29,7 @@
#include <boost/log/utility/explicit_operator_bool.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -121,8 +121,8 @@
         {
         }

- BOOST_LOG_DELETED_FUNCTION(sentry(sentry const&))
- BOOST_LOG_DELETED_FUNCTION(sentry& operator= (sentry const&))
+ BOOST_DELETED_FUNCTION(sentry(sentry const&))
+ BOOST_DELETED_FUNCTION(sentry& operator= (sentry const&))
     };

private:
@@ -580,9 +580,9 @@
     }

     //! Copy constructor (closed)
- BOOST_LOG_DELETED_FUNCTION(basic_formatting_ostream(basic_formatting_ostream const& that))
+ BOOST_DELETED_FUNCTION(basic_formatting_ostream(basic_formatting_ostream const& that))
     //! Assignment (closed)
- BOOST_LOG_DELETED_FUNCTION(basic_formatting_ostream& operator= (basic_formatting_ostream const& that))
+ BOOST_DELETED_FUNCTION(basic_formatting_ostream& operator= (basic_formatting_ostream const& that))
};

template< typename CharT, typename TraitsT, typename AllocatorT >

Modified: branches/release/boost/log/utility/formatting_ostream_fwd.hpp
==============================================================================
--- branches/release/boost/log/utility/formatting_ostream_fwd.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/formatting_ostream_fwd.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -19,7 +19,7 @@
#include <memory>
#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/utility/functional.hpp
==============================================================================
--- branches/release/boost/log/utility/functional.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/functional.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -33,7 +33,7 @@
#include <boost/log/utility/functional/as_action.hpp>
#include <boost/log/utility/functional/save_result.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/utility/functional/as_action.hpp
==============================================================================
--- branches/release/boost/log/utility/functional/as_action.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/functional/as_action.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@
#include <boost/log/detail/config.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -32,7 +32,7 @@
{
     typedef typename FunT::result_type result_type;

- BOOST_LOG_DEFAULTED_FUNCTION(as_action_adapter(), {})
+ BOOST_DEFAULTED_FUNCTION(as_action_adapter(), {})
     explicit as_action_adapter(FunT const& fun) : m_fun(fun) {}

     template< typename AttributeT, typename ContextT >
@@ -46,7 +46,7 @@
};

template< typename FunT >
-BOOST_LOG_FORCEINLINE as_action_adapter< FunT > as_action(FunT const& fun)
+BOOST_FORCEINLINE as_action_adapter< FunT > as_action(FunT const& fun)
{
     return as_action_adapter< FunT >(fun);
}

Modified: branches/release/boost/log/utility/functional/begins_with.hpp
==============================================================================
--- branches/release/boost/log/utility/functional/begins_with.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/functional/begins_with.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@
#include <boost/log/detail/config.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/utility/functional/bind.hpp
==============================================================================
--- branches/release/boost/log/utility/functional/bind.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/functional/bind.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -20,7 +20,7 @@
#include <boost/log/detail/config.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -105,13 +105,13 @@
};

template< typename FunT, typename FirstArgT >
-BOOST_LOG_FORCEINLINE binder1st< FunT, FirstArgT > bind1st(FunT fun, FirstArgT const& arg)
+BOOST_FORCEINLINE binder1st< FunT, FirstArgT > bind1st(FunT fun, FirstArgT const& arg)
{
     return binder1st< FunT, FirstArgT >(fun, arg);
}

template< typename FunT, typename FirstArgT >
-BOOST_LOG_FORCEINLINE binder1st< FunT, FirstArgT > bind1st(FunT fun, FirstArgT& arg)
+BOOST_FORCEINLINE binder1st< FunT, FirstArgT > bind1st(FunT fun, FirstArgT& arg)
{
     return binder1st< FunT, FirstArgT >(fun, arg);
}
@@ -167,13 +167,13 @@
};

template< typename FunT, typename SecondArgT >
-BOOST_LOG_FORCEINLINE binder2nd< FunT, SecondArgT > bind2nd(FunT fun, SecondArgT const& arg)
+BOOST_FORCEINLINE binder2nd< FunT, SecondArgT > bind2nd(FunT fun, SecondArgT const& arg)
{
     return binder2nd< FunT, SecondArgT >(fun, arg);
}

template< typename FunT, typename SecondArgT >
-BOOST_LOG_FORCEINLINE binder2nd< FunT, SecondArgT > bind2nd(FunT fun, SecondArgT& arg)
+BOOST_FORCEINLINE binder2nd< FunT, SecondArgT > bind2nd(FunT fun, SecondArgT& arg)
{
     return binder2nd< FunT, SecondArgT >(fun, arg);
}
@@ -217,13 +217,13 @@
};

template< typename FunT, typename ThirdArgT >
-BOOST_LOG_FORCEINLINE binder3rd< FunT, ThirdArgT > bind3rd(FunT fun, ThirdArgT const& arg)
+BOOST_FORCEINLINE binder3rd< FunT, ThirdArgT > bind3rd(FunT fun, ThirdArgT const& arg)
{
     return binder3rd< FunT, ThirdArgT >(fun, arg);
}

template< typename FunT, typename ThirdArgT >
-BOOST_LOG_FORCEINLINE binder3rd< FunT, ThirdArgT > bind3rd(FunT fun, ThirdArgT& arg)
+BOOST_FORCEINLINE binder3rd< FunT, ThirdArgT > bind3rd(FunT fun, ThirdArgT& arg)
{
     return binder3rd< FunT, ThirdArgT >(fun, arg);
}

Modified: branches/release/boost/log/utility/functional/bind_assign.hpp
==============================================================================
--- branches/release/boost/log/utility/functional/bind_assign.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/functional/bind_assign.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -20,7 +20,7 @@
#include <boost/log/utility/functional/bind.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -41,7 +41,7 @@
};

template< typename AssigneeT >
-BOOST_LOG_FORCEINLINE binder1st< assign_fun, AssigneeT& > bind_assign(AssigneeT& assignee)
+BOOST_FORCEINLINE binder1st< assign_fun, AssigneeT& > bind_assign(AssigneeT& assignee)
{
return binder1st< assign_fun, AssigneeT& >(assign_fun(), assignee);
}

Modified: branches/release/boost/log/utility/functional/bind_output.hpp
==============================================================================
--- branches/release/boost/log/utility/functional/bind_output.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/functional/bind_output.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -20,7 +20,7 @@
#include <boost/log/utility/functional/bind.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -41,7 +41,7 @@
};

template< typename StreamT >
-BOOST_LOG_FORCEINLINE binder1st< output_fun, StreamT& > bind_output(StreamT& strm)
+BOOST_FORCEINLINE binder1st< output_fun, StreamT& > bind_output(StreamT& strm)
{
return binder1st< output_fun, StreamT& >(output_fun(), strm);
}

Modified: branches/release/boost/log/utility/functional/bind_to_log.hpp
==============================================================================
--- branches/release/boost/log/utility/functional/bind_to_log.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/functional/bind_to_log.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -21,7 +21,7 @@
#include <boost/log/utility/manipulators/to_log.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -56,13 +56,13 @@
};

template< typename StreamT >
-BOOST_LOG_FORCEINLINE binder1st< to_log_fun< >, StreamT& > bind_to_log(StreamT& strm)
+BOOST_FORCEINLINE binder1st< to_log_fun< >, StreamT& > bind_to_log(StreamT& strm)
{
return binder1st< to_log_fun< >, StreamT& >(to_log_fun< >(), strm);
}

template< typename TagT, typename StreamT >
-BOOST_LOG_FORCEINLINE binder1st< to_log_fun< TagT >, StreamT& > bind_to_log(StreamT& strm)
+BOOST_FORCEINLINE binder1st< to_log_fun< TagT >, StreamT& > bind_to_log(StreamT& strm)
{
return binder1st< to_log_fun< TagT >, StreamT& >(to_log_fun< TagT >(), strm);
}

Modified: branches/release/boost/log/utility/functional/contains.hpp
==============================================================================
--- branches/release/boost/log/utility/functional/contains.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/functional/contains.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@
#include <boost/log/detail/config.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/utility/functional/ends_with.hpp
==============================================================================
--- branches/release/boost/log/utility/functional/ends_with.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/functional/ends_with.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@
#include <boost/log/detail/config.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/utility/functional/fun_ref.hpp
==============================================================================
--- branches/release/boost/log/utility/functional/fun_ref.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/functional/fun_ref.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -19,7 +19,7 @@
#include <boost/log/detail/config.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -65,7 +65,7 @@
};

template< typename FunT >
-BOOST_LOG_FORCEINLINE function_reference_wrapper< FunT > fun_ref(FunT& fun)
+BOOST_FORCEINLINE function_reference_wrapper< FunT > fun_ref(FunT& fun)
{
return function_reference_wrapper< FunT >(fun);
}

Modified: branches/release/boost/log/utility/functional/in_range.hpp
==============================================================================
--- branches/release/boost/log/utility/functional/in_range.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/functional/in_range.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -20,7 +20,7 @@
#include <boost/log/utility/functional/logical.hpp> // make_common_integral_type
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/utility/functional/logical.hpp
==============================================================================
--- branches/release/boost/log/utility/functional/logical.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/functional/logical.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -29,7 +29,7 @@
#include <boost/log/detail/config.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/utility/functional/matches.hpp
==============================================================================
--- branches/release/boost/log/utility/functional/matches.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/functional/matches.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -22,7 +22,7 @@
#include <boost/log/detail/config.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/utility/functional/nop.hpp
==============================================================================
--- branches/release/boost/log/utility/functional/nop.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/functional/nop.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@
#include <boost/log/detail/config.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/utility/functional/save_result.hpp
==============================================================================
--- branches/release/boost/log/utility/functional/save_result.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/functional/save_result.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@
#include <boost/log/detail/config.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -46,7 +46,7 @@
};

template< typename FunT, typename AssigneeT >
-BOOST_LOG_FORCEINLINE save_result_wrapper< FunT, AssigneeT > save_result(FunT const& fun, AssigneeT& assignee)
+BOOST_FORCEINLINE save_result_wrapper< FunT, AssigneeT > save_result(FunT const& fun, AssigneeT& assignee)
{
return save_result_wrapper< FunT, AssigneeT >(fun, assignee);
}

Modified: branches/release/boost/log/utility/intrusive_ref_counter.hpp
==============================================================================
--- branches/release/boost/log/utility/intrusive_ref_counter.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/intrusive_ref_counter.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -22,7 +22,7 @@
#endif // BOOST_LOG_NO_THREADS
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/utility/manipulators.hpp
==============================================================================
--- branches/release/boost/log/utility/manipulators.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/manipulators.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -21,7 +21,7 @@
#include <boost/log/utility/manipulators/to_log.hpp>
#include <boost/log/utility/manipulators/dump.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/utility/manipulators/add_value.hpp
==============================================================================
--- branches/release/boost/log/utility/manipulators/add_value.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/manipulators/add_value.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -25,7 +25,7 @@
#include <boost/log/sources/record_ostream.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/utility/manipulators/dump.hpp
==============================================================================
--- branches/release/boost/log/utility/manipulators/dump.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/manipulators/dump.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -20,7 +20,7 @@
#include <boost/log/detail/config.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -32,14 +32,14 @@

typedef void dump_data_char_t(const void* data, std::size_t size, std::basic_ostream< char >& strm);
extern BOOST_LOG_API dump_data_char_t* dump_data_char;
-BOOST_LOG_FORCEINLINE void dump_data(const void* data, std::size_t size, std::basic_ostream< char >& strm)
+BOOST_FORCEINLINE void dump_data(const void* data, std::size_t size, std::basic_ostream< char >& strm)
{
     (dump_data_char)(data, size, strm);
}

typedef void dump_data_wchar_t(const void* data, std::size_t size, std::basic_ostream< wchar_t >& strm);
extern BOOST_LOG_API dump_data_wchar_t* dump_data_wchar;
-BOOST_LOG_FORCEINLINE void dump_data(const void* data, std::size_t size, std::basic_ostream< wchar_t >& strm)
+BOOST_FORCEINLINE void dump_data(const void* data, std::size_t size, std::basic_ostream< wchar_t >& strm)
{
     (dump_data_wchar)(data, size, strm);
}
@@ -47,7 +47,7 @@
#if !defined(BOOST_NO_CXX11_CHAR16_T)
typedef void dump_data_char16_t(const void* data, std::size_t size, std::basic_ostream< char16_t >& strm);
extern BOOST_LOG_API dump_data_char16_t* dump_data_char16;
-BOOST_LOG_FORCEINLINE void dump_data(const void* data, std::size_t size, std::basic_ostream< char16_t >& strm)
+BOOST_FORCEINLINE void dump_data(const void* data, std::size_t size, std::basic_ostream< char16_t >& strm)
{
     (dump_data_char16)(data, size, strm);
}
@@ -56,7 +56,7 @@
#if !defined(BOOST_NO_CXX11_CHAR32_T)
typedef void dump_data_char32_t(const void* data, std::size_t size, std::basic_ostream< char32_t >& strm);
extern BOOST_LOG_API dump_data_char32_t* dump_data_char32;
-BOOST_LOG_FORCEINLINE void dump_data(const void* data, std::size_t size, std::basic_ostream< char32_t >& strm)
+BOOST_FORCEINLINE void dump_data(const void* data, std::size_t size, std::basic_ostream< char32_t >& strm)
{
     (dump_data_char32)(data, size, strm);
}

Modified: branches/release/boost/log/utility/manipulators/to_log.hpp
==============================================================================
--- branches/release/boost/log/utility/manipulators/to_log.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/manipulators/to_log.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -21,7 +21,7 @@
#include <boost/log/utility/formatting_ostream_fwd.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/utility/once_block.hpp
==============================================================================
--- branches/release/boost/log/utility/once_block.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/once_block.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -19,7 +19,7 @@
#include <boost/log/utility/unique_identifier_name.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -98,8 +98,8 @@
     BOOST_LOG_API void rollback() BOOST_NOEXCEPT;

     // Non-copyable, non-assignable
- BOOST_LOG_DELETED_FUNCTION(once_block_sentry(once_block_sentry const&))
- BOOST_LOG_DELETED_FUNCTION(once_block_sentry& operator= (once_block_sentry const&))
+ BOOST_DELETED_FUNCTION(once_block_sentry(once_block_sentry const&))
+ BOOST_DELETED_FUNCTION(once_block_sentry& operator= (once_block_sentry const&))
};

} // namespace aux
@@ -144,8 +144,8 @@
     }

     // Non-copyable, non-assignable
- BOOST_LOG_DELETED_FUNCTION(once_block_sentry(once_block_sentry const&))
- BOOST_LOG_DELETED_FUNCTION(once_block_sentry& operator= (once_block_sentry const&))
+ BOOST_DELETED_FUNCTION(once_block_sentry(once_block_sentry const&))
+ BOOST_DELETED_FUNCTION(once_block_sentry& operator= (once_block_sentry const&))
};

} // namespace aux

Modified: branches/release/boost/log/utility/record_ordering.hpp
==============================================================================
--- branches/release/boost/log/utility/record_ordering.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/record_ordering.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -27,7 +27,7 @@
#include <boost/log/utility/functional/nop.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/utility/setup.hpp
==============================================================================
--- branches/release/boost/log/utility/setup.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/setup.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -30,7 +30,7 @@
#include <boost/log/utility/setup/filter_parser.hpp>
#include <boost/log/utility/setup/formatter_parser.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/utility/setup/common_attributes.hpp
==============================================================================
--- branches/release/boost/log/utility/setup/common_attributes.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/setup/common_attributes.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -27,7 +27,7 @@
#include <boost/log/detail/default_attribute_names.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/utility/setup/console.hpp
==============================================================================
--- branches/release/boost/log/utility/setup/console.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/setup/console.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -32,7 +32,7 @@
#include <boost/log/keywords/auto_flush.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/utility/setup/file.hpp
==============================================================================
--- branches/release/boost/log/utility/setup/file.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/setup/file.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -37,7 +37,7 @@
#include <boost/log/keywords/scan_method.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/utility/setup/filter_parser.hpp
==============================================================================
--- branches/release/boost/log/utility/setup/filter_parser.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/setup/filter_parser.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -34,7 +34,7 @@
#include <boost/log/core/core.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -56,7 +56,7 @@
     /*!
      * Default constructor
      */
- BOOST_LOG_DEFAULTED_FUNCTION(filter_factory(), {})
+ BOOST_DEFAULTED_FUNCTION(filter_factory(), {})

     /*!
      * Virtual destructor
@@ -129,8 +129,8 @@
         BOOST_LOG_UNREACHABLE();
     }

- BOOST_LOG_DELETED_FUNCTION(filter_factory(filter_factory const&))
- BOOST_LOG_DELETED_FUNCTION(filter_factory& operator= (filter_factory const&))
+ BOOST_DELETED_FUNCTION(filter_factory(filter_factory const&))
+ BOOST_DELETED_FUNCTION(filter_factory& operator= (filter_factory const&))
};

/*!

Modified: branches/release/boost/log/utility/setup/formatter_parser.hpp
==============================================================================
--- branches/release/boost/log/utility/setup/formatter_parser.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/setup/formatter_parser.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -31,7 +31,7 @@
#include <boost/log/expressions/formatters/stream.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -60,7 +60,7 @@
     /*!
      * Default constructor
      */
- BOOST_LOG_DEFAULTED_FUNCTION(formatter_factory(), {})
+ BOOST_DEFAULTED_FUNCTION(formatter_factory(), {})

     /*!
      * Virtual destructor
@@ -75,8 +75,8 @@
      */
     virtual formatter_type create_formatter(attribute_name const& name, args_map const& args) = 0;

- BOOST_LOG_DELETED_FUNCTION(formatter_factory(formatter_factory const&))
- BOOST_LOG_DELETED_FUNCTION(formatter_factory& operator= (formatter_factory const&))
+ BOOST_DELETED_FUNCTION(formatter_factory(formatter_factory const&))
+ BOOST_DELETED_FUNCTION(formatter_factory& operator= (formatter_factory const&))
};

/*!

Modified: branches/release/boost/log/utility/setup/from_settings.hpp
==============================================================================
--- branches/release/boost/log/utility/setup/from_settings.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/setup/from_settings.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -25,7 +25,7 @@
#include <boost/log/utility/setup/settings.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -60,7 +60,7 @@
     /*!
      * Default constructor
      */
- BOOST_LOG_DEFAULTED_FUNCTION(sink_factory(), {})
+ BOOST_DEFAULTED_FUNCTION(sink_factory(), {})

     /*!
      * Virtual destructor
@@ -74,8 +74,8 @@
      */
     virtual shared_ptr< sinks::sink > create_sink(settings_section const& settings) = 0;

- BOOST_LOG_DELETED_FUNCTION(sink_factory(sink_factory const&))
- BOOST_LOG_DELETED_FUNCTION(sink_factory& operator= (sink_factory const&))
+ BOOST_DELETED_FUNCTION(sink_factory(sink_factory const&))
+ BOOST_DELETED_FUNCTION(sink_factory& operator= (sink_factory const&))
};

/*!

Modified: branches/release/boost/log/utility/setup/from_stream.hpp
==============================================================================
--- branches/release/boost/log/utility/setup/from_stream.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/setup/from_stream.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -20,7 +20,7 @@
#include <boost/log/detail/setup_config.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/utility/setup/settings.hpp
==============================================================================
--- branches/release/boost/log/utility/setup/settings.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/setup/settings.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -30,12 +30,12 @@
#if !defined(BOOST_LOG_TYPEOF)
#include <boost/utility/enable_if.hpp>
#endif
-#if defined(BOOST_LOG_TYPEOF) && defined(BOOST_LOG_NO_TRAILING_RESULT_TYPE)
+#if defined(BOOST_LOG_TYPEOF) && defined(BOOST_NO_CXX11_TRAILING_RESULT_TYPES)
#include <boost/utility/declval.hpp>
#endif
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -223,7 +223,7 @@
         }

#if defined(BOOST_LOG_TYPEOF) && !(defined(__GNUC__) && !defined(__INTEL_COMPILER) && !defined(__clang__) && !defined(__PATHSCALE__) && !defined(__GXX_EXPERIMENTAL_CXX0X__) && (__GNUC__ == 4 && __GNUC_MINOR__ <= 5))
-#if !defined(BOOST_LOG_NO_TRAILING_RESULT_TYPE)
+#if !defined(BOOST_NO_CXX11_TRAILING_RESULT_TYPES)
         template< typename T >
         auto or_default(T const& def_value) const -> BOOST_LOG_TYPEOF(property_tree_type().get(typename property_tree_type::path_type(), def_value))
         {
@@ -297,7 +297,7 @@
         typedef typename iterator_adaptor_::reference reference;

     public:
- BOOST_LOG_DEFAULTED_FUNCTION(iter(), {})
+ BOOST_DEFAULTED_FUNCTION(iter(), {})
         template< bool OtherIsConstV >
         iter(iter< OtherIsConstV > const& that) : iterator_adaptor_(that.base()) {}
         explicit iter(base_iterator_type const& it) : iterator_adaptor_(it) {}
@@ -506,7 +506,7 @@
     {
         if (m_ptree)
         {
- optional< property_tree_type const& > section = m_ptree->get_child_optional(section_name);
+ optional< property_tree_type& > section = m_ptree->get_child_optional(section_name);
             if (!!section)
                 return (section->find(param_name) != section->not_found());
         }

Modified: branches/release/boost/log/utility/setup/settings_parser.hpp
==============================================================================
--- branches/release/boost/log/utility/setup/settings_parser.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/setup/settings_parser.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -20,7 +20,7 @@
#include <boost/log/utility/setup/settings.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/utility/strictest_lock.hpp
==============================================================================
--- branches/release/boost/log/utility/strictest_lock.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/strictest_lock.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -33,7 +33,7 @@
#endif
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/utility/string_literal.hpp
==============================================================================
--- branches/release/boost/log/utility/string_literal.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/string_literal.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -28,7 +28,7 @@
#include <boost/log/utility/string_literal_fwd.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/utility/string_literal_fwd.hpp
==============================================================================
--- branches/release/boost/log/utility/string_literal_fwd.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/string_literal_fwd.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -18,7 +18,7 @@
#include <string>
#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/utility/type_dispatch/date_time_types.hpp
==============================================================================
--- branches/release/boost/log/utility/type_dispatch/date_time_types.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/type_dispatch/date_time_types.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -26,7 +26,7 @@
#include <boost/log/detail/config.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/utility/type_dispatch/dynamic_type_dispatcher.hpp
==============================================================================
--- branches/release/boost/log/utility/type_dispatch/dynamic_type_dispatcher.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/type_dispatch/dynamic_type_dispatcher.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -27,7 +27,7 @@
#include <boost/log/utility/type_dispatch/type_dispatcher.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/utility/type_dispatch/standard_types.hpp
==============================================================================
--- branches/release/boost/log/utility/type_dispatch/standard_types.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/type_dispatch/standard_types.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -23,7 +23,7 @@
#include <boost/log/utility/string_literal_fwd.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/utility/type_dispatch/static_type_dispatcher.hpp
==============================================================================
--- branches/release/boost/log/utility/type_dispatch/static_type_dispatcher.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/type_dispatch/static_type_dispatcher.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -36,7 +36,7 @@
#include <boost/log/utility/type_dispatch/type_dispatcher.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -62,12 +62,12 @@
struct dispatching_map_initializer
{
     template< typename IteratorT >
- static BOOST_LOG_FORCEINLINE void init(IteratorT*, IteratorT*, std::pair< type_info_wrapper, void* >*)
+ static BOOST_FORCEINLINE void init(IteratorT*, IteratorT*, std::pair< type_info_wrapper, void* >*)
     {
     }

     template< typename BeginIteratorT, typename EndIteratorT >
- static BOOST_LOG_FORCEINLINE void init(BeginIteratorT*, EndIteratorT* end, std::pair< type_info_wrapper, void* >* p)
+ static BOOST_FORCEINLINE void init(BeginIteratorT*, EndIteratorT* end, std::pair< type_info_wrapper, void* >* p)
     {
         typedef typename mpl::deref< BeginIteratorT >::type type;
         do_init(static_cast< visible_type< type >* >(0), p);
@@ -78,7 +78,7 @@

private:
     template< typename T >
- static BOOST_LOG_FORCEINLINE void do_init(visible_type< T >*, std::pair< type_info_wrapper, void* >* p)
+ static BOOST_FORCEINLINE void do_init(visible_type< T >*, std::pair< type_info_wrapper, void* >* p)
     {
         p->first = typeid(visible_type< T >);

@@ -176,8 +176,8 @@
     }

     // Copying and assignment closed
- BOOST_LOG_DELETED_FUNCTION(type_sequence_dispatcher(type_sequence_dispatcher const&))
- BOOST_LOG_DELETED_FUNCTION(type_sequence_dispatcher& operator= (type_sequence_dispatcher const&))
+ BOOST_DELETED_FUNCTION(type_sequence_dispatcher(type_sequence_dispatcher const&))
+ BOOST_DELETED_FUNCTION(type_sequence_dispatcher& operator= (type_sequence_dispatcher const&))
};

//! A simple dispatcher that only supports one type
@@ -213,8 +213,8 @@
     }

     // Copying and assignment closed
- BOOST_LOG_DELETED_FUNCTION(single_type_dispatcher(single_type_dispatcher const&))
- BOOST_LOG_DELETED_FUNCTION(single_type_dispatcher& operator= (single_type_dispatcher const&))
+ BOOST_DELETED_FUNCTION(single_type_dispatcher(single_type_dispatcher const&))
+ BOOST_DELETED_FUNCTION(single_type_dispatcher& operator= (single_type_dispatcher const&))
};

} // namespace aux
@@ -259,8 +259,8 @@
     }

     // Copying and assignment prohibited
- BOOST_LOG_DELETED_FUNCTION(static_type_dispatcher(static_type_dispatcher const&))
- BOOST_LOG_DELETED_FUNCTION(static_type_dispatcher& operator= (static_type_dispatcher const&))
+ BOOST_DELETED_FUNCTION(static_type_dispatcher(static_type_dispatcher const&))
+ BOOST_DELETED_FUNCTION(static_type_dispatcher& operator= (static_type_dispatcher const&))
};

BOOST_LOG_CLOSE_NAMESPACE // namespace log

Modified: branches/release/boost/log/utility/type_dispatch/type_dispatcher.hpp
==============================================================================
--- branches/release/boost/log/utility/type_dispatch/type_dispatcher.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/type_dispatch/type_dispatcher.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -22,7 +22,7 @@
#include <boost/log/utility/explicit_operator_bool.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -162,9 +162,9 @@
     {
     }
     // Destructor and copying can only be called from the derived classes
- BOOST_LOG_DEFAULTED_FUNCTION(~type_dispatcher(), {})
- BOOST_LOG_DEFAULTED_FUNCTION(type_dispatcher(type_dispatcher const& that), : m_get_callback_impl(that.m_get_callback_impl) {})
- BOOST_LOG_DEFAULTED_FUNCTION(type_dispatcher& operator= (type_dispatcher const& that), { m_get_callback_impl = that.m_get_callback_impl; return *this; })
+ BOOST_DEFAULTED_FUNCTION(~type_dispatcher(), {})
+ BOOST_DEFAULTED_FUNCTION(type_dispatcher(type_dispatcher const& that), : m_get_callback_impl(that.m_get_callback_impl) {})
+ BOOST_DEFAULTED_FUNCTION(type_dispatcher& operator= (type_dispatcher const& that), { m_get_callback_impl = that.m_get_callback_impl; return *this; })

public:
     /*!

Modified: branches/release/boost/log/utility/type_info_wrapper.hpp
==============================================================================
--- branches/release/boost/log/utility/type_info_wrapper.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/type_info_wrapper.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -27,7 +27,7 @@

#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -48,7 +48,7 @@
#ifndef BOOST_LOG_DOXYGEN_PASS

//! An inaccessible type to indicate an uninitialized state of the wrapper
- struct BOOST_LOG_VISIBLE uninitialized {};
+ struct BOOST_SYMBOL_VISIBLE uninitialized {};

#ifdef BOOST_LOG_HAS_CXXABI_H
//! A simple scope guard for automatic memory free

Modified: branches/release/boost/log/utility/unique_identifier_name.hpp
==============================================================================
--- branches/release/boost/log/utility/unique_identifier_name.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/unique_identifier_name.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -19,7 +19,7 @@
#include <boost/preprocessor/cat.hpp>
#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/boost/log/utility/unused_variable.hpp
==============================================================================
--- branches/release/boost/log/utility/unused_variable.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/unused_variable.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -17,7 +17,7 @@

#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -35,7 +35,7 @@
namespace aux {

template< typename T >
-BOOST_LOG_FORCEINLINE void no_unused_warnings(T const&) {}
+BOOST_FORCEINLINE void no_unused_warnings(T const&) {}

} // namespace aux

Modified: branches/release/boost/log/utility/value_ref.hpp
==============================================================================
--- branches/release/boost/log/utility/value_ref.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/value_ref.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -47,7 +47,7 @@
#include <boost/log/utility/value_ref_fwd.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -428,12 +428,12 @@
     /*!
      * Default constructor. Creates a reference wrapper that does not refer to a value.
      */
- BOOST_LOG_DEFAULTED_FUNCTION(value_ref(), BOOST_NOEXCEPT {})
+ BOOST_DEFAULTED_FUNCTION(value_ref(), BOOST_NOEXCEPT {})

     /*!
      * Copy constructor.
      */
- BOOST_LOG_DEFAULTED_FUNCTION(value_ref(value_ref const& that), BOOST_NOEXCEPT : base_type(static_cast< base_type const& >(that)) {})
+ BOOST_DEFAULTED_FUNCTION(value_ref(value_ref const& that), BOOST_NOEXCEPT : base_type(static_cast< base_type const& >(that)) {})

     /*!
      * Initializing constructor. Creates a reference wrapper that refers to the specified value.

Modified: branches/release/boost/log/utility/value_ref_fwd.hpp
==============================================================================
--- branches/release/boost/log/utility/value_ref_fwd.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/boost/log/utility/value_ref_fwd.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -17,7 +17,7 @@

#include <boost/log/detail/config.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/libs/log/build/Jamfile.v2
==============================================================================
--- branches/release/libs/log/build/Jamfile.v2 Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/build/Jamfile.v2 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -104,6 +104,7 @@
         <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
@@ -344,6 +345,7 @@
     filter_parser.cpp
     formatter_parser.cpp
     default_filter_factory.cpp
+ matches_relation_factory.cpp
     default_formatter_factory.cpp
     ;

Modified: branches/release/libs/log/doc/Jamfile.v2
==============================================================================
--- branches/release/libs/log/doc/Jamfile.v2 Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/doc/Jamfile.v2 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -45,8 +45,8 @@
# <doxygen:param>EXCLUDE_SYMBOLS="aux aux::*"
         <doxygen:param>"PREDEFINED=BOOST_LOG_DOXYGEN_PASS \\
                         BOOST_LOG_NO_VTABLE= \\
- BOOST_LOG_VISIBLE= \\
- BOOST_LOG_FORCEINLINE=inline \\
+ BOOST_SYMBOL_VISIBLE= \\
+ BOOST_FORCEINLINE=inline \\
                         BOOST_STATIC_ASSERT(x)= \\
                         BOOST_STATIC_ASSERT_MSG(x,y)= \\
                         BOOST_RV_REF(x)=\"x&&\" \\
@@ -67,8 +67,8 @@
                         BOOST_LOG_NAMESPACE=log \\
                         BOOST_LOG_OPEN_NAMESPACE=\"namespace log {\" \\
                         BOOST_LOG_CLOSE_NAMESPACE=\"}\" \\
- BOOST_LOG_DEFAULTED_FUNCTION(x,y)=\"x = default;\" \\
- BOOST_LOG_DELETED_FUNCTION(x)=\"x = delete;\" \\
+ BOOST_DEFAULTED_FUNCTION(x,y)=\"x = default;\" \\
+ BOOST_DELETED_FUNCTION(x)=\"x = delete;\" \\
                         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 Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/doc/changelog.qbk 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -14,6 +14,13 @@
[*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.
+
+[*Bug fixes:]
+
+* Fixed [link log.detailed.attributes.timer `timer`] attribute generating incorrect time readings on Windows on heavy thread contention when `QueryPerformanceCounter` API was used.
+* Fixed a bug in the filter parser that prevented using parsed filters with some attributes. For example, parsed filters didn't work with a string-typed attribute value, if the value was compared to a numeric operand.
+* Closed tickets: [ticket 8815], [ticket 8819], [ticket 8915], [ticket 8917].

[heading 2.1, Boost 1.54]

Modified: branches/release/libs/log/doc/log.qbk
==============================================================================
--- branches/release/libs/log/doc/log.qbk Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/doc/log.qbk 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -48,6 +48,8 @@
[def __boost_locale__ [@http://www.boost.org/doc/libs/release/libs/locale/doc/html/index.html Boost.Locale]]
[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>''']
+
[/ Auto-generated macros that refer to Reference sections /]
[include top_level_reference.qbk]
[include core_reference.qbk]

Modified: branches/release/libs/log/example/doc/tutorial_fmt_stream.cpp
==============================================================================
--- branches/release/libs/log/example/doc/tutorial_fmt_stream.cpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/example/doc/tutorial_fmt_stream.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -5,18 +5,22 @@
* http://www.boost.org/LICENSE_1_0.txt)
*/

+#include <boost/date_time/posix_time/posix_time_types.hpp>
#include <boost/log/trivial.hpp>
#include <boost/log/expressions.hpp>
#include <boost/log/sources/severity_logger.hpp>
#include <boost/log/sources/record_ostream.hpp>
#include <boost/log/utility/setup/file.hpp>
#include <boost/log/utility/setup/common_attributes.hpp>
+#include <boost/log/support/date_time.hpp>

namespace logging = boost::log;
namespace src = boost::log::sources;
namespace expr = boost::log::expressions;
namespace keywords = boost::log::keywords;

+#if 1
+
//[ example_tutorial_formatters_stream
void init()
{
@@ -37,7 +41,7 @@
}
//]

-#if 0
+#else

//[ example_tutorial_formatters_stream_date_time
void init()

Modified: branches/release/libs/log/src/alignment_gap_between.hpp
==============================================================================
--- branches/release/libs/log/src/alignment_gap_between.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/alignment_gap_between.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 20.11.2007
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_ALIGNMENT_GAP_BETWEEN_HPP_INCLUDED_

Modified: branches/release/libs/log/src/atomic_queue.hpp
==============================================================================
--- branches/release/libs/log/src/atomic_queue.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/atomic_queue.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 14.07.2009
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_ATOMIC_QUEUE_HPP_INCLUDED_

Modified: branches/release/libs/log/src/attribute_name.cpp
==============================================================================
--- branches/release/libs/log/src/attribute_name.cpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/attribute_name.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 28.06.2010
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#include <cstring>

Modified: branches/release/libs/log/src/attribute_set.cpp
==============================================================================
--- branches/release/libs/log/src/attribute_set.cpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/attribute_set.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 19.04.2007
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#include <deque>

Modified: branches/release/libs/log/src/attribute_set_impl.hpp
==============================================================================
--- branches/release/libs/log/src/attribute_set_impl.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/attribute_set_impl.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 03.07.2010
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_ATTRIBUTE_SET_IMPL_HPP_INCLUDED_

Modified: branches/release/libs/log/src/attribute_value_set.cpp
==============================================================================
--- branches/release/libs/log/src/attribute_value_set.cpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/attribute_value_set.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 19.04.2007
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#include <new>
@@ -32,13 +32,13 @@

BOOST_LOG_OPEN_NAMESPACE

-BOOST_LOG_FORCEINLINE attribute_value_set::node_base::node_base() :
+BOOST_FORCEINLINE attribute_value_set::node_base::node_base() :
     m_pPrev(NULL),
     m_pNext(NULL)
{
}

-BOOST_LOG_FORCEINLINE attribute_value_set::node::node(key_type const& key, mapped_type& data, bool dynamic) :
+BOOST_FORCEINLINE attribute_value_set::node::node(key_type const& key, mapped_type& data, bool dynamic) :
     node_base(),
     m_Value(key, mapped_type()),
     m_DynamicallyAllocated(dynamic)

Modified: branches/release/libs/log/src/code_conversion.cpp
==============================================================================
--- branches/release/libs/log/src/code_conversion.cpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/code_conversion.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 08.11.2008
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#include <locale>

Modified: branches/release/libs/log/src/core.cpp
==============================================================================
--- branches/release/libs/log/src/core.cpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/core.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 19.04.2007
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#include <cstddef>
@@ -134,8 +134,8 @@
     //! Returns the flag indicating whether it is needed to detach the record from the current thread
     bool is_detach_from_thread_needed() const BOOST_NOEXCEPT { return m_detach_from_thread_needed; }

- BOOST_LOG_DELETED_FUNCTION(private_data(private_data const&))
- BOOST_LOG_DELETED_FUNCTION(private_data& operator= (private_data const&))
+ BOOST_DELETED_FUNCTION(private_data(private_data const&))
+ BOOST_DELETED_FUNCTION(private_data& operator= (private_data const&))

private:
     //! Returns a pointer to the first accepting sink
@@ -286,7 +286,7 @@

     //! Opens a record
     template< typename SourceAttributesT >
- BOOST_LOG_FORCEINLINE record open_record(BOOST_FWD_REF(SourceAttributesT) source_attributes)
+ BOOST_FORCEINLINE record open_record(BOOST_FWD_REF(SourceAttributesT) source_attributes)
     {
         // Try a quick win first
         if (m_enabled) try

Modified: branches/release/libs/log/src/date_time_format_parser.cpp
==============================================================================
--- branches/release/libs/log/src/date_time_format_parser.cpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/date_time_format_parser.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 30.09.2012
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#include <cstring>

Modified: branches/release/libs/log/src/default_attribute_names.cpp
==============================================================================
--- branches/release/libs/log/src/default_attribute_names.cpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/default_attribute_names.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 13.07.2012
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#include <boost/shared_ptr.hpp>

Modified: branches/release/libs/log/src/default_filter_factory.cpp
==============================================================================
--- branches/release/libs/log/src/default_filter_factory.cpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/default_filter_factory.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 29.05.2010
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#if !defined(BOOST_LOG_WITHOUT_SETTINGS_PARSERS) && !defined(BOOST_LOG_WITHOUT_DEFAULT_FACTORIES)
@@ -18,11 +18,14 @@
#include <string>
#include <boost/move/core.hpp>
#include <boost/move/utility.hpp>
+#include <boost/utility/enable_if.hpp>
+#include <boost/mpl/copy.hpp>
+#include <boost/mpl/contains.hpp>
+#include <boost/mpl/back_inserter.hpp>
#include <boost/spirit/include/qi_core.hpp>
#include <boost/spirit/include/qi_eoi.hpp>
#include <boost/spirit/include/qi_as.hpp>
#include <boost/log/exceptions.hpp>
-#include <boost/log/attributes/value_visitation.hpp>
#include <boost/log/expressions/predicates/has_attr.hpp>
#include <boost/log/utility/type_dispatch/standard_types.hpp>
#include <boost/log/utility/string_literal.hpp>
@@ -30,13 +33,8 @@
#include <boost/log/utility/functional/begins_with.hpp>
#include <boost/log/utility/functional/ends_with.hpp>
#include <boost/log/utility/functional/contains.hpp>
-#include <boost/log/utility/functional/matches.hpp>
-#include <boost/log/utility/functional/bind.hpp>
#include <boost/log/utility/functional/as_action.hpp>
-#include <boost/log/utility/functional/save_result.hpp>
#include <boost/log/detail/code_conversion.hpp>
-#include <boost/log/support/xpressive.hpp>
-#include <boost/xpressive/xpressive_dynamic.hpp>
#if defined(BOOST_LOG_USE_CHAR) && defined(BOOST_LOG_USE_WCHAR_T)
#include <boost/fusion/container/set.hpp>
#include <boost/fusion/sequence/intrinsic/at_key.hpp>
@@ -55,135 +53,156 @@

namespace aux {

-template< typename CharT >
-template< typename ValueT, typename PredicateT >
-struct default_filter_factory< CharT >::predicate_wrapper
+BOOST_LOG_ANONYMOUS_NAMESPACE {
+
+#if defined(BOOST_LOG_USE_CHAR) && defined(BOOST_LOG_USE_WCHAR_T)
+
+//! A special filtering predicate that adopts the string operand to the attribute value character type
+template< typename RelationT >
+class string_predicate :
+ public RelationT
{
- typedef typename PredicateT::result_type result_type;
+private:
+ template< typename StringT >
+ struct initializer
+ {
+ typedef void result_type;
+
+ explicit initializer(StringT const& val) : m_initializer(val)
+ {
+ }
+
+ template< typename T >
+ result_type operator() (T& val) const
+ {
+ try
+ {
+ log::aux::code_convert(m_initializer, val);
+ }
+ catch (...)
+ {
+ val.clear();
+ }
+ }
+
+ private:
+ StringT const& m_initializer;
+ };

- explicit predicate_wrapper(attribute_name const& name, PredicateT const& pred) : m_name(name), m_visitor(pred)
+public:
+ typedef RelationT relation_type;
+ typedef typename relation_type::result_type result_type;
+
+ template< typename StringT >
+ string_predicate(relation_type const& rel, StringT const& operand) : relation_type(rel)
     {
+ fusion::for_each(m_operands, initializer< StringT >(operand));
     }

     template< typename T >
- result_type operator() (T const& arg) const
+ typename boost::enable_if<
+ mpl::contains< log::string_types::type, T >,
+ result_type
+ >::type operator() (T const& val) const
     {
- bool res = false;
- boost::log::visit< ValueT >(m_name, arg, save_result_wrapper< PredicateT const&, bool >(m_visitor, res));
- return res;
+ typedef std::basic_string< typename T::value_type > operand_type;
+ return relation_type::operator() (val, fusion::at_key< operand_type >(m_operands));
     }

private:
- attribute_name m_name;
- const PredicateT m_visitor;
+ fusion::set< std::string, std::wstring > m_operands;
};

-template< typename CharT >
+#else // defined(BOOST_LOG_USE_CHAR) && defined(BOOST_LOG_USE_WCHAR_T)
+
+//! A special filtering predicate that adopts the string operand to the attribute value character type
template< typename RelationT >
-struct default_filter_factory< CharT >::on_integral_argument
+class string_predicate :
+ public RelationT
{
- typedef void result_type;
+private:
+#if defined(BOOST_LOG_USE_CHAR)
+ typedef std::basic_string< char > string_type;
+#elif defined(BOOST_LOG_USE_WCHAR_T)
+ typedef std::basic_string< wchar_t > string_type;
+#else
+#error Boost.Log: Inconsistent character configuration
+#endif
+
+public:
+ typedef RelationT relation_type;
+ typedef typename relation_type::result_type result_type;

- on_integral_argument(attribute_name const& name, filter& f) : m_name(name), m_filter(f)
+public:
+ string_predicate(relation_type const& rel, string_type const& operand) : relation_type(rel), m_operand(operand)
     {
     }

- result_type operator() (long val) const
+ template< typename T >
+ typename boost::enable_if<
+ mpl::contains< log::string_types::type, T >,
+ result_type
+ >::type operator() (T const& val) const
     {
- typedef binder2nd< RelationT, long > predicate;
- m_filter = predicate_wrapper< log::integral_types::type, predicate >(m_name, predicate(RelationT(), val));
+ return relation_type::operator() (val, m_operand);
     }

private:
- attribute_name m_name;
- filter& m_filter;
+ const string_type m_operand;
};

-template< typename CharT >
-template< typename RelationT >
-struct default_filter_factory< CharT >::on_fp_argument
+#endif // defined(BOOST_LOG_USE_CHAR) && defined(BOOST_LOG_USE_WCHAR_T)
+
+//! A filtering predicate for numeric relations
+template< typename NumericT, typename RelationT >
+class numeric_predicate :
+ public string_predicate< RelationT >
{
- typedef void result_type;
+ typedef string_predicate< RelationT > base_type;
+
+public:
+ typedef NumericT numeric_type;
+ typedef typename base_type::relation_type relation_type;
+ typedef typename base_type::result_type result_type;

- on_fp_argument(attribute_name const& name, filter& f) : m_name(name), m_filter(f)
+public:
+ template< typename StringT >
+ numeric_predicate(relation_type const& rel, StringT const& string_operand, numeric_type numeric_operand) :
+ base_type(rel, string_operand),
+ m_numeric_operand(numeric_operand)
     {
     }

- result_type operator() (double val) const
+ using base_type::operator();
+
+ template< typename T >
+ typename boost::disable_if<
+ mpl::contains< log::string_types::type, T >,
+ result_type
+ >::type operator() (T const& val) const
     {
- typedef binder2nd< RelationT, double > predicate;
- m_filter = predicate_wrapper< log::floating_point_types::type, predicate >(m_name, predicate(RelationT(), val));
+ return relation_type::operator() (val, m_numeric_operand);
     }

private:
- attribute_name m_name;
- filter& m_filter;
+ const numeric_type m_numeric_operand;
};

-template< typename CharT >
+
template< typename RelationT >
-struct default_filter_factory< CharT >::on_string_argument
+struct on_string_argument
{
     typedef void result_type;

-#if defined(BOOST_LOG_USE_CHAR) && defined(BOOST_LOG_USE_WCHAR_T)
- //! A special filtering predicate that adopts the string operand to the attribute value character type
- struct predicate :
- public RelationT
- {
- struct initializer
- {
- typedef void result_type;
-
- explicit initializer(string_type const& val) : m_initializer(val)
- {
- }
-
- template< typename T >
- result_type operator() (T& val) const
- {
- try
- {
- log::aux::code_convert(m_initializer, val);
- }
- catch (...)
- {
- val.clear();
- }
- }
-
- private:
- string_type const& m_initializer;
- };
-
- typedef typename RelationT::result_type result_type;
-
- explicit predicate(RelationT const& rel, string_type const& operand) : RelationT(rel)
- {
- fusion::for_each(m_operands, initializer(operand));
- }
-
- template< typename T >
- result_type operator() (T const& val) const
- {
- typedef std::basic_string< typename T::value_type > operand_type;
- return RelationT::operator() (val, fusion::at_key< operand_type >(m_operands));
- }
-
- private:
- fusion::set< std::string, std::wstring > m_operands;
- };
-#else
- typedef binder2nd< RelationT, string_type > predicate;
-#endif
-
     on_string_argument(attribute_name const& name, filter& f) : m_name(name), m_filter(f)
     {
     }

- result_type operator() (string_type const& val) const
+ template< typename StringT >
+ result_type operator() (StringT const& val) const
     {
- m_filter = predicate_wrapper< log::string_types::type, predicate >(m_name, predicate(RelationT(), val));
+ typedef string_predicate< RelationT > predicate;
+ m_filter = predicate_wrapper< log::string_types, predicate >(m_name, predicate(RelationT(), val));
     }

private:
@@ -191,101 +210,57 @@
     filter& m_filter;
};

-template< typename CharT >
-template< typename RelationT >
-struct default_filter_factory< CharT >::on_regex_argument
+template< typename RelationT, typename StringT >
+struct on_integral_argument
{
     typedef void result_type;

-#if defined(BOOST_LOG_USE_CHAR) && defined(BOOST_LOG_USE_WCHAR_T)
- //! A special filtering predicate that adopts the string operand to the attribute value character type
- struct predicate :
- public RelationT
+ on_integral_argument(attribute_name const& name, StringT const& operand, filter& f) : m_name(name), m_operand(operand), m_filter(f)
     {
- struct initializer
- {
- typedef void result_type;
-
- explicit initializer(string_type const& val) : m_initializer(val)
- {
- }
-
- template< typename T >
- result_type operator() (T& val) const
- {
- try
- {
- typedef typename T::char_type char_type;
- std::basic_string< char_type > str;
- log::aux::code_convert(m_initializer, str);
- val = T::compile(str.c_str(), str.size(), T::ECMAScript | T::optimize);
- }
- catch (...)
- {
- }
- }
-
- private:
- string_type const& m_initializer;
- };
-
- typedef typename RelationT::result_type result_type;
-
- explicit predicate(RelationT const& rel, string_type const& operand) : RelationT(rel)
- {
- fusion::for_each(m_operands, initializer(operand));
- }
-
- template< typename T >
- result_type operator() (T const& val) const
- {
- typedef typename T::value_type char_type;
- typedef xpressive::basic_regex< const char_type* > regex_type;
- return RelationT::operator() (val, fusion::at_key< regex_type >(m_operands));
- }
+ }

- private:
- fusion::set< xpressive::cregex, xpressive::wcregex > m_operands;
- };
-#else
- //! A special filtering predicate that adopts the string operand to the attribute value character type
- struct predicate :
- public RelationT
- {
- typedef typename RelationT::result_type result_type;
- typedef xpressive::basic_regex< typename string_type::value_type const* > regex_type;
-
- explicit predicate(RelationT const& rel, string_type const& operand) :
- RelationT(rel),
- m_operand(regex_type::compile(operand.c_str(), operand.size(), regex_type::ECMAScript | regex_type::optimize))
- {
- }
+ result_type operator() (long val) const
+ {
+ typedef numeric_predicate< long, RelationT > predicate;
+ typedef mpl::copy<
+ log::string_types,
+ mpl::back_inserter< log::numeric_types >
+ >::type value_types;
+ m_filter = predicate_wrapper< value_types, predicate >(m_name, predicate(RelationT(), m_operand, val));
+ }

- template< typename T >
- result_type operator() (T const& val) const
- {
- return RelationT::operator() (val, m_operand);
- }
+private:
+ attribute_name m_name;
+ StringT const& m_operand;
+ filter& m_filter;
+};

- private:
- regex_type m_operand;
- };
-#endif
+template< typename RelationT, typename StringT >
+struct on_fp_argument
+{
+ typedef void result_type;

- on_regex_argument(attribute_name const& name, filter& f) : m_name(name), m_filter(f)
+ on_fp_argument(attribute_name const& name, StringT const& operand, filter& f) : m_name(name), m_operand(operand), m_filter(f)
     {
     }

- result_type operator() (string_type const& val) const
+ result_type operator() (double val) const
     {
- m_filter = predicate_wrapper< log::string_types::type, predicate >(m_name, predicate(RelationT(), val));
+ typedef numeric_predicate< double, RelationT > predicate;
+ typedef mpl::copy<
+ log::string_types,
+ mpl::back_inserter< log::floating_point_types >
+ >::type value_types;
+ m_filter = predicate_wrapper< value_types, predicate >(m_name, predicate(RelationT(), m_operand, val));
     }

private:
     attribute_name m_name;
+ StringT const& m_operand;
     filter& m_filter;
};

+} // namespace

//! The callback for equality relation filter
template< typename CharT >
@@ -343,7 +318,7 @@
     else if (rel == constants::contains_keyword())
         on_string_argument< contains_fun >(name, f)(arg);
     else if (rel == constants::matches_keyword())
- on_regex_argument< matches_fun >(name, f)(arg);
+ f = parse_matches_relation(name, arg);
     else
     {
         BOOST_LOG_THROW_DESCR(parse_error, "The custom attribute relation \"" + log::aux::to_narrow(rel) + "\" is not supported");
@@ -362,8 +337,8 @@
     const qi::real_parser< double, qi::strict_real_policies< double > > real_;

     filter f;
- const on_fp_argument< RelationT > on_fp(name, f);
- const on_integral_argument< RelationT > on_int(name, f);
+ const on_fp_argument< RelationT, string_type > on_fp(name, arg, f);
+ const on_integral_argument< RelationT, string_type > on_int(name, arg, f);
     const on_string_argument< RelationT > on_str(name, f);

     const bool res = qi::parse

Modified: branches/release/libs/log/src/default_filter_factory.hpp
==============================================================================
--- branches/release/libs/log/src/default_filter_factory.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/default_filter_factory.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,13 +10,17 @@
  * \date 29.05.2010
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_DEFAULT_FILTER_FACTORY_HPP_INCLUDED_
#define BOOST_DEFAULT_FILTER_FACTORY_HPP_INCLUDED_

+#include <cstddef>
+#include <boost/log/attributes/attribute_name.hpp>
+#include <boost/log/attributes/value_visitation.hpp>
#include <boost/log/utility/setup/filter_parser.hpp>
+#include <boost/log/utility/functional/save_result.hpp>
#include <boost/log/detail/header.hpp>

namespace boost {
@@ -25,28 +29,40 @@

namespace aux {

+//! Relation predicate wrapper
+template< typename ValueT, typename PredicateT >
+struct predicate_wrapper
+{
+ typedef typename PredicateT::result_type result_type;
+
+ explicit predicate_wrapper(attribute_name const& name, PredicateT const& pred) : m_name(name), m_visitor(pred)
+ {
+ }
+
+ template< typename T >
+ result_type operator() (T const& arg) const
+ {
+ bool res = false;
+ boost::log::visit< ValueT >(m_name, arg, save_result_wrapper< PredicateT const&, bool >(m_visitor, res));
+ return res;
+ }
+
+private:
+ attribute_name m_name;
+ const PredicateT m_visitor;
+};
+
//! The default filter factory that supports creating filters for the standard types (see utility/type_dispatch/standard_types.hpp)
template< typename CharT >
class default_filter_factory :
     public filter_factory< CharT >
{
+private:
     //! Base type
     typedef filter_factory< CharT > base_type;
     //! Self type
     typedef default_filter_factory< CharT > this_type;

- template< typename ValueT, typename PredicateT >
- struct predicate_wrapper;
-
- template< typename RelationT >
- struct on_integral_argument;
- template< typename RelationT >
- struct on_fp_argument;
- template< typename RelationT >
- struct on_string_argument;
- template< typename RelationT >
- struct on_regex_argument;
-
public:
     // Type imports
     typedef typename base_type::char_type char_type;
@@ -68,11 +84,16 @@
     //! The callback for custom relation filter
     virtual filter on_custom_relation(attribute_name const& name, string_type const& rel, string_type const& arg);

+private:
     //! The function parses the argument value for a binary relation and constructs the corresponding filter
     template< typename RelationT >
     static filter parse_argument(attribute_name const& name, string_type const& arg);
};

+//! The function parses the "matches" relation
+template< typename CharT >
+filter parse_matches_relation(attribute_name const& name, std::basic_string< CharT > const& operand);
+
} // namespace aux

BOOST_LOG_CLOSE_NAMESPACE // namespace log

Modified: branches/release/libs/log/src/default_formatter_factory.cpp
==============================================================================
--- branches/release/libs/log/src/default_formatter_factory.cpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/default_formatter_factory.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 14.07.2013
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#if !defined(BOOST_LOG_WITHOUT_SETTINGS_PARSERS) && !defined(BOOST_LOG_WITHOUT_DEFAULT_FACTORIES)

Modified: branches/release/libs/log/src/default_formatter_factory.hpp
==============================================================================
--- branches/release/libs/log/src/default_formatter_factory.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/default_formatter_factory.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 14.07.2013
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_DEFAULT_FORMATTER_FACTORY_HPP_INCLUDED_

Modified: branches/release/libs/log/src/default_sink.cpp
==============================================================================
--- branches/release/libs/log/src/default_sink.cpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/default_sink.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 19.04.2007
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#include <cstdio>

Modified: branches/release/libs/log/src/default_sink.hpp
==============================================================================
--- branches/release/libs/log/src/default_sink.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/default_sink.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 08.01.2012
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_DEFAULT_SINK_HPP_INCLUDED_
@@ -29,7 +29,7 @@
#endif
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/libs/log/src/dump.cpp
==============================================================================
--- branches/release/libs/log/src/dump.cpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/dump.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 03.05.2013
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#include <ostream>

Modified: branches/release/libs/log/src/dump_avx2.cpp
==============================================================================
--- branches/release/libs/log/src/dump_avx2.cpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/dump_avx2.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 05.05.2013
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

// NOTE: You should generally avoid including headers as much as possible here, because this file
@@ -20,7 +20,6 @@
#include <immintrin.h>
#include <boost/cstdint.hpp>
#include <boost/log/detail/config.hpp>
-#include <boost/log/detail/intptr_t.hpp>
#include <boost/log/detail/header.hpp>

namespace boost {
@@ -56,7 +55,7 @@
static const ymm_constant mm_shuffle_pattern13 = {{ 0x80, 0, 1, 0x80, 2, 3, 0x80, 4, 5, 0x80, 6, 7, 0x80, 8, 9, 0x80, 5, 0x80, 6, 7, 0x80, 8, 9, 0x80, 10, 11, 0x80, 12, 13, 0x80, 14, 15 }};

//! Dumps a pack of input data into a string of 8 bit ASCII characters
-static BOOST_LOG_FORCEINLINE void dump_pack(__m256i mm_char_a, __m256i mm_input, __m256i& mm_output1, __m256i& mm_output2, __m256i& mm_output3)
+static BOOST_FORCEINLINE void dump_pack(__m256i mm_char_a, __m256i mm_input, __m256i& mm_output1, __m256i& mm_output2, __m256i& mm_output3)
{
     // Split half-bytes
     const __m256i mm_15 = _mm256_set1_epi8(0x0F);
@@ -98,7 +97,7 @@
}

//! Dumps a pack of input data into a string of 8 bit ASCII characters
-static BOOST_LOG_FORCEINLINE void dump_pack(__m256i mm_char_a, __m128i mm_input, __m128i& mm_output1, __m128i& mm_output2, __m128i& mm_output3)
+static BOOST_FORCEINLINE void dump_pack(__m256i mm_char_a, __m128i mm_input, __m128i& mm_output1, __m128i& mm_output2, __m128i& mm_output3)
{
     // Split half-bytes
     __m128i mm_input_hi = _mm_srli_epi16(mm_input, 4);
@@ -123,7 +122,7 @@
}

template< typename CharT >
-BOOST_LOG_FORCEINLINE void store_characters(__m256i mm_chars, CharT* buf)
+BOOST_FORCEINLINE void store_characters(__m256i mm_chars, CharT* buf)
{
     switch (sizeof(CharT))
     {
@@ -149,7 +148,7 @@
}

template< typename CharT >
-BOOST_LOG_FORCEINLINE void store_characters(__m128i mm_chars, CharT* buf)
+BOOST_FORCEINLINE void store_characters(__m128i mm_chars, CharT* buf)
{
     switch (sizeof(CharT))
     {
@@ -172,7 +171,7 @@
}

template< typename CharT >
-BOOST_LOG_FORCEINLINE void dump_data_avx2(const void* data, std::size_t size, std::basic_ostream< CharT >& strm)
+BOOST_FORCEINLINE void dump_data_avx2(const void* data, std::size_t size, std::basic_ostream< CharT >& strm)
{
     typedef CharT char_type;

Modified: branches/release/libs/log/src/dump_ssse3.cpp
==============================================================================
--- branches/release/libs/log/src/dump_ssse3.cpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/dump_ssse3.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 05.05.2013
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

// NOTE: You should generally avoid including headers as much as possible here, because this file
@@ -20,7 +20,6 @@
#include <tmmintrin.h>
#include <boost/cstdint.hpp>
#include <boost/log/detail/config.hpp>
-#include <boost/log/detail/intptr_t.hpp>
#include <boost/log/detail/header.hpp>

namespace boost {
@@ -58,7 +57,7 @@
static const xmm_constant mm_shuffle_pattern3 = {{ 5, 0x80, 6, 7, 0x80, 8, 9, 0x80, 10, 11, 0x80, 12, 13, 0x80, 14, 15 }};

//! Dumps a pack of input data into a string of 8 bit ASCII characters
-static BOOST_LOG_FORCEINLINE void dump_pack(__m128i mm_char_10_to_a, __m128i mm_input, __m128i& mm_output1, __m128i& mm_output2, __m128i& mm_output3)
+static BOOST_FORCEINLINE void dump_pack(__m128i mm_char_10_to_a, __m128i mm_input, __m128i& mm_output1, __m128i& mm_output2, __m128i& mm_output3)
{
     // Split half-bytes
     __m128i mm_input_hi = _mm_and_si128(_mm_srli_epi16(mm_input, 4), mm_15.as_mm);
@@ -96,7 +95,7 @@
}

template< typename CharT >
-BOOST_LOG_FORCEINLINE void store_characters(__m128i mm_chars, CharT* buf)
+BOOST_FORCEINLINE void store_characters(__m128i mm_chars, CharT* buf)
{
     switch (sizeof(CharT))
     {
@@ -127,7 +126,7 @@
}

template< typename CharT >
-BOOST_LOG_FORCEINLINE void dump_data_ssse3(const void* data, std::size_t size, std::basic_ostream< CharT >& strm)
+BOOST_FORCEINLINE void dump_data_ssse3(const void* data, std::size_t size, std::basic_ostream< CharT >& strm)
{
     typedef CharT char_type;

Modified: branches/release/libs/log/src/event.cpp
==============================================================================
--- branches/release/libs/log/src/event.cpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/event.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,13 +10,14 @@
  * \date 24.07.2011
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#include <boost/log/detail/config.hpp>

#ifndef BOOST_LOG_NO_THREADS

+#include <boost/assert.hpp>
#include <boost/cstdint.hpp>
#include <boost/throw_exception.hpp>
#include <boost/system/error_code.hpp>
@@ -61,15 +62,16 @@
{
     if (sem_init(&m_semaphore, 0, 0) != 0)
     {
+ const int err = errno;
         BOOST_THROW_EXCEPTION(system::system_error(
- errno, system::system_category(), "Failed to initialize semaphore"));
+ err, system::system_category(), "Failed to initialize semaphore"));
     }
}

//! Destructor
BOOST_LOG_API sem_based_event::~sem_based_event()
{
- sem_destroy(&m_semaphore);
+ BOOST_VERIFY(sem_destroy(&m_semaphore) == 0);
}

//! Waits for the object to become signalled
@@ -79,10 +81,11 @@
     {
         if (sem_wait(&m_semaphore) != 0)
         {
- if (errno != EINTR)
+ const int err = errno;
+ if (err != EINTR)
             {
                 BOOST_THROW_EXCEPTION(system::system_error(
- errno, system::system_category(), "Failed to block on the semaphore"));
+ err, system::system_category(), "Failed to block on the semaphore"));
             }
         }
         else
@@ -98,9 +101,10 @@
     {
         if (sem_post(&m_semaphore) != 0)
         {
+ const int err = errno;
             BOOST_LOG_EVENT_RESET(m_state);
             BOOST_THROW_EXCEPTION(system::system_error(
- errno, system::system_category(), "Failed to wake the blocked thread"));
+ err, system::system_category(), "Failed to wake the blocked thread"));
         }
     }
}
@@ -114,15 +118,16 @@
{
     if (!m_event)
     {
+ const DWORD err = GetLastError();
         BOOST_THROW_EXCEPTION(system::system_error(
- GetLastError(), system::system_category(), "Failed to create Windows event"));
+ err, system::system_category(), "Failed to create Windows event"));
     }
}

//! Destructor
BOOST_LOG_API winapi_based_event::~winapi_based_event()
{
- CloseHandle(m_event);
+ BOOST_VERIFY(CloseHandle(m_event) != 0);
}

//! Waits for the object to become signalled
@@ -133,8 +138,9 @@
     {
         if (WaitForSingleObject(m_event, INFINITE) != 0)
         {
+ const DWORD err = GetLastError();
             BOOST_THROW_EXCEPTION(system::system_error(
- GetLastError(), system::system_category(), "Failed to block on Windows event"));
+ err, system::system_category(), "Failed to block on Windows event"));
         }
     }
     const_cast< volatile boost::uint32_t& >(m_state) = 0;
@@ -147,9 +153,10 @@
     {
         if (SetEvent(m_event) == 0)
         {
+ const DWORD err = GetLastError();
             const_cast< volatile boost::uint32_t& >(m_state) = 0;
             BOOST_THROW_EXCEPTION(system::system_error(
- GetLastError(), system::system_category(), "Failed to wake the blocked thread"));
+ err, system::system_category(), "Failed to wake the blocked thread"));
         }
     }
}

Modified: branches/release/libs/log/src/event_log_registry.hpp
==============================================================================
--- branches/release/libs/log/src/event_log_registry.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/event_log_registry.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 16.11.2008
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_EVENT_LOG_REGISTRY_HPP_INCLUDED_

Modified: branches/release/libs/log/src/exceptions.cpp
==============================================================================
--- branches/release/libs/log/src/exceptions.cpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/exceptions.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 31.10.2009
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#include <boost/throw_exception.hpp>

Modified: branches/release/libs/log/src/filter_parser.cpp
==============================================================================
--- branches/release/libs/log/src/filter_parser.cpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/filter_parser.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 31.03.2008
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_WITHOUT_SETTINGS_PARSERS
@@ -23,23 +23,14 @@
#include <stdexcept>
#include <utility>
#include <boost/assert.hpp>
-#include <boost/bind.hpp>
#include <boost/none.hpp>
#include <boost/move/core.hpp>
#include <boost/move/utility.hpp>
#include <boost/optional/optional.hpp>
#include <boost/utility/in_place_factory.hpp>
-#include <boost/spirit/include/qi_core.hpp>
-#include <boost/spirit/include/qi_char.hpp>
-#include <boost/spirit/include/qi_lit.hpp>
-#include <boost/spirit/include/qi_raw.hpp>
-#include <boost/spirit/include/qi_lexeme.hpp>
-#include <boost/spirit/include/qi_as.hpp>
-#include <boost/spirit/include/qi_symbols.hpp>
#include <boost/phoenix/core.hpp>
#include <boost/phoenix/bind/bind_function_object.hpp>
#include <boost/phoenix/operator/logical.hpp>
-#include <boost/range/iterator_range_core.hpp>
#include <boost/log/detail/singleton.hpp>
#include <boost/log/exceptions.hpp>
#include <boost/log/utility/setup/filter_parser.hpp>
@@ -54,8 +45,6 @@
#include "spirit_encoding.hpp"
#include <boost/log/detail/header.hpp>

-namespace qi = boost::spirit::qi;
-
namespace boost {

BOOST_LOG_OPEN_NAMESPACE
@@ -125,23 +114,17 @@
     }
};

-//! Filter parsing grammar
+//! Filter parser
template< typename CharT >
-class filter_grammar :
- public qi::grammar<
- const CharT*,
- typename log::aux::encoding_specific< typename log::aux::encoding< CharT >::type >::space_type
- >
+class filter_parser
{
private:
     typedef CharT char_type;
     typedef const char_type* iterator_type;
- typedef log::aux::encoding_specific< typename log::aux::encoding< char_type >::type > encoding_specific;
+ typedef typename log::aux::encoding< char_type >::type encoding;
+ typedef log::aux::encoding_specific< encoding > encoding_specific;
     typedef std::basic_string< char_type > string_type;
     typedef log::aux::char_constants< char_type > constants;
- typedef filter_grammar< char_type > this_type;
- typedef qi::grammar< iterator_type, typename encoding_specific::space_type > base_type;
- typedef typename base_type::start_type rule_type;
     typedef filter_factory< char_type > filter_factory_type;

     typedef filter (filter_factory_type::*comparison_relation_handler_t)(attribute_name const&, string_type const&);
@@ -159,147 +142,230 @@
     //! Filter subexpressions as they are parsed
     mutable std::stack< filter > m_Subexpressions;

- //! A parser for an attribute name in a single relation
- rule_type attr_name;
- //! A parser for a quoted string
- rule_type quoted_string_operand;
- //! A parser for an operand in a single relation
- rule_type operand;
- //! A parser for a single relation that consists of two operands and an operation between them
- rule_type relation;
- //! A set of comparison relation symbols with corresponding pointers to callbacks
- qi::symbols< char_type, comparison_relation_handler_t > comparison_relation;
- //! A parser for a custom relation word
- rule_type custom_relation;
- //! A parser for a term, which can be a relation, an expression in parenthesis or a negation thereof
- rule_type term;
- //! A parser for the complete filter expression that consists of one or several terms with boolean operations between them
- rule_type expression;
-
public:
     //! Constructor
- filter_grammar() :
- base_type(expression),
+ filter_parser() :
         m_ComparisonRelation(NULL)
     {
- attr_name = qi::lexeme
- [
- // An attribute name in form %name%
- qi::as< string_type >()[ qi::lit(constants::char_percent) >> +(encoding_specific::print - constants::char_percent) >> qi::lit(constants::char_percent) ]
- [boost::bind(&filter_grammar::on_attribute_name, this, _1)]
- ];
-
- quoted_string_operand = qi::raw
- [
- qi::lexeme
- [
- // A quoted string with C-style escape sequences support
- qi::lit(constants::char_quote) >>
- *(
- (qi::lit(constants::char_backslash) >> qi::char_) |
- (qi::char_ - qi::lit(constants::char_quote))
- ) >>
- qi::lit(constants::char_quote)
- ]
- ]
- [boost::bind(&filter_grammar::on_quoted_string_operand, this, _1)];
-
- operand =
- (
- quoted_string_operand |
- // A single word, enclosed with white spaces. It cannot contain parenthesis, since it is used by the filter parser.
- qi::raw[ qi::lexeme[ +(encoding_specific::graph - qi::lit(constants::char_paren_bracket_left) - qi::lit(constants::char_paren_bracket_right)) ] ]
- [boost::bind(&filter_grammar::on_operand, this, _1)]
- );
-
- // Custom relation is a keyword that may contain either alphanumeric characters or an underscore
- custom_relation = qi::as< string_type >()[ qi::lexeme[ +(encoding_specific::alnum | qi::char_(constants::char_underline)) ] ]
- [boost::bind(&filter_grammar::set_custom_relation, this, _1)];
-
- comparison_relation.add
- (constants::equal_keyword(), &filter_factory_type::on_equality_relation)
- (constants::not_equal_keyword(), &filter_factory_type::on_inequality_relation)
- (constants::greater_keyword(), &filter_factory_type::on_greater_relation)
- (constants::less_keyword(), &filter_factory_type::on_less_relation)
- (constants::greater_or_equal_keyword(), &filter_factory_type::on_greater_or_equal_relation)
- (constants::less_or_equal_keyword(), &filter_factory_type::on_less_or_equal_relation);
-
- relation =
- (
- attr_name >> // The relation may be as simple as a sole attribute name, in which case the filter checks for the attribute value presence
- -(
- (comparison_relation[boost::bind(&filter_grammar::set_comparison_relation, this, _1)] >> operand) |
- (custom_relation >> operand)
- )
- )
- [boost::bind(&filter_grammar::on_relation_complete, this)];
-
- term =
- (
- (qi::lit(constants::char_paren_bracket_left) >> expression >> constants::char_paren_bracket_right) |
- ((qi::lit(constants::not_keyword()) | constants::char_exclamation) >> term)[boost::bind(&filter_grammar::on_negation, this)] |
- relation
- );
-
- expression =
- (
- term >>
- *(
- ((qi::lit(constants::and_keyword()) | constants::char_and) >> term)[boost::bind(&filter_grammar::on_and, this)] |
- ((qi::lit(constants::or_keyword()) | constants::char_or) >> term)[boost::bind(&filter_grammar::on_or, this)]
- )
- );
     }

     //! The method returns the constructed filter
     filter get_filter()
     {
- BOOST_ASSERT(!m_Subexpressions.empty());
+ if (m_Subexpressions.empty())
+ return filter();
         return boost::move(m_Subexpressions.top());
     }

-private:
- //! The attribute name handler
- void on_attribute_name(string_type const& name)
+ //! The pethod parses filter from the string
+ void parse(iterator_type& begin, iterator_type end, unsigned int depth = 0)
     {
- m_AttributeName = attribute_name(log::aux::to_narrow(name));
+ typedef void (filter_parser::*logical_op_t)();
+ logical_op_t logical_op = NULL;
+ iterator_type p = constants::trim_spaces_left(begin, end);
+ while (p != end)
+ {
+ // Parse subexpression
+ parse_subexpression(p, end, depth);
+ if (logical_op)
+ {
+ // This was the right-hand subexpression. Compose the two top subexpressions into a single filter.
+ (this->*logical_op)();
+ logical_op = NULL;
+ }
+
+ p = constants::trim_spaces_left(p, end);
+ if (p != end)
+ {
+ char_type c = *p;
+ iterator_type next = p + 1;
+ if (c == constants::char_paren_bracket_right)
+ {
+ // The subexpression has ended
+ if (depth == 0)
+ BOOST_LOG_THROW_DESCR(parse_error, "Invalid filter definition: unmatched closing parenthesis");
+
+ p = next;
+ --depth;
+ break;
+ }
+ else if (c == constants::char_and || scan_keyword(p, end, next, constants::and_keyword()))
+ {
+ logical_op = &filter_parser::on_and;
+ }
+ else if (c == constants::char_or || scan_keyword(p, end, next, constants::or_keyword()))
+ {
+ logical_op = &filter_parser::on_or;
+ }
+ else
+ {
+ BOOST_LOG_THROW_DESCR(parse_error, "Invalid filter definition: unexpected character encountered");
+ }
+
+ p = constants::trim_spaces_left(next, end);
+ }
+ else
+ break;
+ }
+
+ if (logical_op)
+ {
+ BOOST_LOG_THROW_DESCR(parse_error, "Invalid filter definition: logical operation without the right-hand subexpression");
+ }
+
+ if (p == end && depth > 0)
+ {
+ BOOST_LOG_THROW_DESCR(parse_error, "Invalid filter definition: unterminated parenthesis");
+ }
+
+ begin = p;
     }

- //! The operand string handler
- void on_operand(iterator_range< iterator_type > const& arg)
+private:
+ //! The method parses a single subexpression
+ void parse_subexpression(iterator_type& begin, iterator_type end, unsigned int depth)
     {
- // An attribute name should have been parsed at this point
- if (!m_AttributeName)
- BOOST_LOG_THROW_DESCR(parse_error, "Invalid filter definition: operand is not expected");
+ bool negated = false, negation_present = false, done = false;
+ iterator_type p = begin;

- m_Operand = boost::in_place(arg.begin(), arg.end());
+ while (p != end)
+ {
+ char_type c = *p;
+ iterator_type next = p + 1;
+ if (c == constants::char_percent)
+ {
+ // We found an attribute placeholder
+ iterator_type start = constants::trim_spaces_left(next, end);
+ p = constants::scan_attr_placeholder(start, end);
+ if (p == end)
+ BOOST_LOG_THROW_DESCR(parse_error, "Invalid attribute placeholder in the filter string");
+
+ on_attribute_name(start, p);
+
+ p = constants::trim_spaces_left(p, end);
+ if (p == end || *p != constants::char_percent)
+ BOOST_LOG_THROW_DESCR(parse_error, "Invalid attribute placeholder in the filter string");
+
+ // Skip the closing char_percent
+ p = constants::trim_spaces_left(++p, end);
+
+ // If the filter has negation operator, do not expect a relation (i.e. "!%attr% > 1" is not valid because "!%attr%" is interpreted as an attribute presence test)
+ if (!negation_present)
+ p = parse_relation(p, end);
+ else
+ on_relation_complete();
+ }
+ else if (c == constants::char_exclamation || scan_keyword(p, end, next, constants::not_keyword()))
+ {
+ // We found negation operation. Parse the subexpression to be negated.
+ negated ^= true;
+ negation_present = true;
+ p = constants::trim_spaces_left(next, end);
+ continue;
+ }
+ else if (c == constants::char_paren_bracket_left)
+ {
+ // We found a nested subexpression
+ parse(next, end, depth + 1);
+ p = next;
+ }
+ else
+ {
+ BOOST_LOG_THROW_DESCR(parse_error, "Invalid filter definition: unexpected character");
+ }
+
+ if (negated)
+ on_negation();
+
+ done = true;
+
+ break;
+ }
+
+ if (negation_present && !done)
+ {
+ // This would happen if a filter consists of a single '!'
+ BOOST_LOG_THROW_DESCR(parse_error, "Filter parsing error: negation operator applied to nothingness");
+ }
+
+ begin = p;
     }

- //! The quoted string handler
- void on_quoted_string_operand(iterator_range< iterator_type > const& arg)
+ //! Parses filtering relation
+ iterator_type parse_relation(iterator_type begin, iterator_type end)
     {
- // An attribute name should have been parsed at this point
- if (!m_AttributeName)
- BOOST_LOG_THROW_DESCR(parse_error, "Invalid filter definition: quoted string operand is not expected");
+ iterator_type p = begin;
+ if (p != end)
+ {
+ iterator_type next = p;
+ if (scan_keyword(p, end, next, constants::equal_keyword()))
+ m_ComparisonRelation = &filter_factory_type::on_equality_relation;
+ else if (scan_keyword(p, end, next, constants::not_equal_keyword()))
+ m_ComparisonRelation = &filter_factory_type::on_inequality_relation;
+ else if (scan_keyword(p, end, next, constants::greater_keyword()))
+ m_ComparisonRelation = &filter_factory_type::on_greater_relation;
+ else if (scan_keyword(p, end, next, constants::less_keyword()))
+ m_ComparisonRelation = &filter_factory_type::on_less_relation;
+ else if (scan_keyword(p, end, next, constants::greater_or_equal_keyword()))
+ m_ComparisonRelation = &filter_factory_type::on_greater_or_equal_relation;
+ else if (scan_keyword(p, end, next, constants::less_or_equal_keyword()))
+ m_ComparisonRelation = &filter_factory_type::on_less_or_equal_relation;
+ else
+ {
+ // Check for custom relation
+ while (next != end && (encoding::isalnum(*next) || *next == constants::char_underline))
+ ++next;
+ if (p == next)
+ goto DoneL;
+ m_CustomRelation.assign(p, next);
+ }

- // Cut off the quotes
- string_type str(arg.begin() + 1, arg.end() - 1);
+ // We have parsed a relation operator, there must be an operand
+ next = constants::trim_spaces_left(next, end);
+ string_type operand;
+ p = constants::parse_operand(next, end, operand);
+ if (next == p)
+ BOOST_LOG_THROW_DESCR(parse_error, "Missing operand for a relation in the filter string");
+
+ m_Operand = boost::in_place(operand);
+ }

- // Translate escape sequences
- constants::translate_escape_sequences(str);
- m_Operand = str;
+ DoneL:
+ // The relation can be as simple as a sole attribute placeholder (which means that only attribute presence has to be checked).
+ // So regardless how we get here, the relation is parsed completely.
+ on_relation_complete();
+
+ return p;
     }

- //! The method saves the relation word into an internal string
- void set_comparison_relation(comparison_relation_handler_t rel)
+ //! Checks if the string contains a keyword
+ static bool scan_keyword(iterator_type begin, iterator_type end, iterator_type& next, iterator_type keyword)
     {
- m_ComparisonRelation = rel;
+ for (iterator_type p = begin; p != end; ++p, ++keyword)
+ {
+ char_type c1 = *p, c2 = *keyword;
+ if (c2 == 0)
+ {
+ if (encoding::isspace(c1))
+ {
+ next = p;
+ return true;
+ }
+ break;
+ }
+ if (c1 != c2)
+ break;
+ }
+
+ return false;
     }

- //! The method saves the relation word into an internal string
- void set_custom_relation(string_type const& rel)
+ //! The attribute name handler
+ void on_attribute_name(iterator_type begin, iterator_type end)
     {
- m_CustomRelation = rel;
+ if (begin == end)
+ BOOST_LOG_THROW_DESCR(parse_error, "Empty attribute name encountered");
+ m_AttributeName = attribute_name(log::aux::to_narrow(string_type(begin, end)));
     }

     //! The comparison relation handler
@@ -357,8 +423,8 @@
         }
         else
         {
- // This would happen if a filter consists of a single '!'
- BOOST_LOG_THROW_DESCR(parse_error, "Filter parsing error: a negation operator applied to nothingness");
+ // This would happen if a filter consists of "!()"
+ BOOST_LOG_THROW_DESCR(parse_error, "Filter parsing error: negation operator applied to an empty subexpression");
         }
     }

@@ -401,8 +467,8 @@
     }

     // Assignment and copying are prohibited
- BOOST_LOG_DELETED_FUNCTION(filter_grammar(filter_grammar const&))
- BOOST_LOG_DELETED_FUNCTION(filter_grammar& operator= (filter_grammar const&))
+ BOOST_DELETED_FUNCTION(filter_parser(filter_parser const&))
+ BOOST_DELETED_FUNCTION(filter_parser& operator= (filter_parser const&))
};

} // namespace
@@ -427,21 +493,15 @@
     typedef CharT char_type;
     typedef log::aux::encoding_specific< typename log::aux::encoding< char_type >::type > encoding_specific;

- filter_grammar< char_type > gram;
+ filter_parser< char_type > parser;
     const char_type* p = begin;

     BOOST_LOG_EXPR_IF_MT(filters_repository< CharT >& repo = filters_repository< CharT >::get();)
     BOOST_LOG_EXPR_IF_MT(log::aux::shared_lock_guard< log::aux::light_rw_mutex > lock(repo.m_Mutex);)

- bool result = qi::phrase_parse(p, end, gram, encoding_specific::space);
- if (!result || p != end)
- {
- std::ostringstream strm;
- strm << "Could not parse the filter, parsing stopped at position " << p - begin;
- BOOST_LOG_THROW_DESCR(parse_error, strm.str());
- }
+ parser.parse(p, end);

- return gram.get_filter();
+ return parser.get_filter();
}

#ifdef BOOST_LOG_USE_CHAR

Modified: branches/release/libs/log/src/format_parser.cpp
==============================================================================
--- branches/release/libs/log/src/format_parser.cpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/format_parser.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 16.11.2012
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#include <string>

Modified: branches/release/libs/log/src/formatter_parser.cpp
==============================================================================
--- branches/release/libs/log/src/formatter_parser.cpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/formatter_parser.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,12 +10,11 @@
  * \date 07.04.2008
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_WITHOUT_SETTINGS_PARSERS

-#include <ctime>
#include <map>
#include <string>
#include <sstream>
@@ -26,14 +25,6 @@
#include <boost/move/utility.hpp>
#include <boost/optional/optional.hpp>
#include <boost/utility/in_place_factory.hpp>
-#include <boost/range/iterator_range_core.hpp>
-#include <boost/spirit/include/qi_core.hpp>
-#include <boost/spirit/include/qi_char.hpp>
-#include <boost/spirit/include/qi_lit.hpp>
-#include <boost/spirit/include/qi_raw.hpp>
-#include <boost/spirit/include/qi_lexeme.hpp>
-#include <boost/spirit/include/qi_as.hpp>
-#include <boost/spirit/include/qi_symbols.hpp>
#include <boost/phoenix/core.hpp>
#include <boost/phoenix/operator.hpp>
#include <boost/log/expressions/message.hpp>
@@ -56,8 +47,6 @@
#endif
#include <boost/log/detail/header.hpp>

-namespace qi = boost::spirit::qi;
-
namespace boost {

BOOST_LOG_OPEN_NAMESPACE
@@ -161,18 +150,16 @@

//! Formatter parsing grammar
template< typename CharT >
-class formatter_grammar :
- public qi::grammar< const CharT* >
+class formatter_parser
{
private:
     typedef CharT char_type;
     typedef const char_type* iterator_type;
- typedef qi::grammar< iterator_type > base_type;
- typedef typename base_type::start_type rule_type;
     typedef std::basic_string< char_type > string_type;
     typedef basic_formatter< char_type > formatter_type;
     typedef boost::log::aux::char_constants< char_type > constants;
- typedef log::aux::encoding_specific< typename log::aux::encoding< char_type >::type > encoding_specific;
+ typedef typename log::aux::encoding< char_type >::type encoding;
+ typedef log::aux::encoding_specific< encoding > encoding_specific;
     typedef formatter_factory< char_type > formatter_factory_type;
     typedef typename formatter_factory_type::args_map args_map;

@@ -190,88 +177,74 @@
     //! Argument value
     mutable string_type m_ArgValue;

- //! A parser for a quoted string argument value
- rule_type quoted_string_arg_value;
- //! A parser for an argument value
- rule_type arg_value;
- //! A parser for a named argument
- rule_type arg;
- //! A parser for an optional argument list for a formatter
- rule_type arg_list;
- //! A parser for an attribute placeholder
- rule_type attr_name;
- //! A parser for the complete formatter expression
- rule_type expression;
-
public:
     //! Constructor
- formatter_grammar() :
- base_type(expression)
+ formatter_parser()
+ {
+ }
+
+ //! Parses formatter
+ void parse(iterator_type& begin, iterator_type end)
     {
- quoted_string_arg_value = qi::raw
- [
- // A quoted string with C-style escape sequences support
- qi::lit(constants::char_quote) >>
- *(
- (qi::lit(constants::char_backslash) >> qi::char_) |
- (qi::char_ - qi::lit(constants::char_quote))
- ) >>
- qi::lit(constants::char_quote)
- ]
- [boost::bind(&formatter_grammar::on_quoted_string_arg_value, this, _1)];
-
- arg_value =
- (
- quoted_string_arg_value |
- qi::raw[ *(encoding_specific::graph - constants::char_comma - constants::char_paren_bracket_left - constants::char_paren_bracket_right) ]
- [boost::bind(&formatter_grammar::on_arg_value, this, _1)]
- );
-
- arg =
- (
- *encoding_specific::space >>
- qi::raw[ encoding_specific::alpha >> *encoding_specific::alnum ][boost::bind(&formatter_grammar::on_arg_name, this, _1)] >>
- *encoding_specific::space >>
- constants::char_equal >>
- *encoding_specific::space >>
- arg_value >>
- *encoding_specific::space
- );
-
- arg_list =
- (
- qi::lit(constants::char_paren_bracket_left) >>
- (arg[boost::bind(&formatter_grammar::push_arg, this)] % qi::lit(constants::char_comma)) >>
- qi::lit(constants::char_paren_bracket_right)
- );
-
- attr_name =
- (
- qi::lit(constants::char_percent) >>
- (
- qi::raw[ qi::lit(constants::message_text_keyword()) ]
- [boost::bind(&formatter_grammar::on_attr_name, this, _1)] |
- (
- qi::raw[ +(encoding_specific::print - constants::char_paren_bracket_left - constants::char_percent) ]
- [boost::bind(&formatter_grammar::on_attr_name, this, _1)] >>
- -arg_list
- )
- ) >>
- qi::lit(constants::char_percent)
- )
- [boost::bind(&formatter_grammar::push_attr, this)];
-
- expression =
- (
- qi::raw
- [
- *(
- (qi::lit(constants::char_backslash) >> qi::char_) |
- (qi::char_ - qi::lit(constants::char_quote) - qi::lit(constants::char_percent))
- )
- ][boost::bind(&formatter_grammar::push_string, this, _1)] %
- attr_name
- );
+ iterator_type p = begin;
+
+ while (p != end)
+ {
+ // Find the end of a string literal
+ iterator_type start = p;
+ for (; p != end; ++p)
+ {
+ char_type c = *p;
+ if (c == constants::char_backslash)
+ {
+ // We found an escaped character
+ ++p;
+ if (p == end)
+ BOOST_LOG_THROW_DESCR(parse_error, "Invalid escape sequence in the formatter string");
+ }
+ else if (c == constants::char_percent)
+ {
+ // We found an attribute
+ break;
+ }
+ }
+
+ if (start != p)
+ push_string(start, p);
+
+ if (p != end)
+ {
+ // We found an attribute placeholder
+ iterator_type start = constants::trim_spaces_left(++p, end);
+ p = constants::scan_attr_placeholder(start, end);
+ if (p == end)
+ BOOST_LOG_THROW_DESCR(parse_error, "Invalid attribute placeholder in the formatter string");
+
+ on_attribute_name(start, p);
+
+ p = constants::trim_spaces_left(p, end);
+ if (p == end)
+ BOOST_LOG_THROW_DESCR(parse_error, "Invalid attribute placeholder in the formatter string");
+
+ if (*p == constants::char_paren_bracket_left)
+ {
+ // We found formatter arguments
+ p = parse_args(constants::trim_spaces_left(++p, end), end);
+ p = constants::trim_spaces_left(p, end);
+ if (p == end)
+ BOOST_LOG_THROW_DESCR(parse_error, "Invalid attribute placeholder in the formatter string");
+ }
+
+ if (*p != constants::char_percent)
+ BOOST_LOG_THROW_DESCR(parse_error, "Invalid attribute placeholder in the formatter string");
+
+ ++p;
+
+ push_attr();
+ }
+ }
+
+ begin = p;
     }

     //! Returns the parsed formatter
@@ -287,23 +260,79 @@
     }

private:
- //! The method is called when an argument name is discovered
- void on_arg_name(iterator_range< iterator_type > const& name)
- {
- m_ArgName.assign(name.begin(), name.end());
- }
- //! The method is called when an argument value is discovered
- void on_quoted_string_arg_value(iterator_range< iterator_type > const& value)
+ //! The method parses formatter arguments
+ iterator_type parse_args(iterator_type begin, iterator_type end)
     {
- // Cut off the quotes
- m_ArgValue.assign(value.begin() + 1, value.end() - 1);
- constants::translate_escape_sequences(m_ArgValue);
+ iterator_type p = begin;
+ if (p == end)
+ BOOST_LOG_THROW_DESCR(parse_error, "Invalid attribute placeholder arguments description in the formatter string");
+ if (*p == constants::char_paren_bracket_right)
+ return ++p;
+
+ while (true)
+ {
+ char_type c = *p;
+
+ // Read argument name
+ iterator_type start = p;
+ if (!encoding::isalpha(*p))
+ BOOST_LOG_THROW_DESCR(parse_error, "Placeholder argument name is invalid");
+ for (++p; p != end; ++p)
+ {
+ c = *p;
+ if (encoding::isspace(c) || c == constants::char_equal)
+ break;
+ if (!encoding::isalnum(c) && c != constants::char_underline)
+ BOOST_LOG_THROW_DESCR(parse_error, "Placeholder argument name is invalid");
+ }
+
+ if (start == p)
+ BOOST_LOG_THROW_DESCR(parse_error, "Placeholder argument name is empty");
+
+ on_arg_name(start, p);
+
+ p = constants::trim_spaces_left(p, end);
+ if (p == end || *p != constants::char_equal)
+ BOOST_LOG_THROW_DESCR(parse_error, "Placeholder argument description is not valid");
+
+ // Read argument value
+ start = p = constants::trim_spaces_left(++p, end);
+ p = constants::parse_operand(p, end, m_ArgValue);
+ if (p == start)
+ BOOST_LOG_THROW_DESCR(parse_error, "Placeholder argument value is not specified");
+
+ push_arg();
+
+ p = constants::trim_spaces_left(p, end);
+ if (p == end)
+ BOOST_LOG_THROW_DESCR(parse_error, "Invalid attribute placeholder arguments description in the formatter string");
+
+ c = *p;
+ if (c == constants::char_paren_bracket_right)
+ {
+ break;
+ }
+ else if (c == constants::char_comma)
+ {
+ p = constants::trim_spaces_left(++p, end);
+ if (p == end)
+ BOOST_LOG_THROW_DESCR(parse_error, "Placeholder argument name is invalid");
+ }
+ else
+ {
+ BOOST_LOG_THROW_DESCR(parse_error, "Invalid attribute placeholder arguments description in the formatter string");
+ }
+ }
+
+ return ++p;
     }
- //! The method is called when an argument value is discovered
- void on_arg_value(iterator_range< iterator_type > const& value)
+
+ //! The method is called when an argument name is discovered
+ void on_arg_name(iterator_type begin, iterator_type end)
     {
- m_ArgValue.assign(value.begin(), value.end());
+ m_ArgName.assign(begin, end);
     }
+
     //! The method is called when an argument is filled
     void push_arg()
     {
@@ -313,16 +342,22 @@
     }

     //! The method is called when an attribute name is discovered
- void on_attr_name(iterator_range< iterator_type > const& name)
+ void on_attribute_name(iterator_type begin, iterator_type end)
     {
- if (name.empty())
+ if (begin == end)
             BOOST_LOG_THROW_DESCR(parse_error, "Empty attribute name encountered");

         // For compatibility with Boost.Log v1 we recognize %_% as the message attribute name
- if (std::char_traits< char_type >::compare(constants::message_text_keyword(), name.begin(), name.size()) == 0)
+ const std::size_t len = end - begin;
+ if (std::char_traits< char_type >::length(constants::message_text_keyword()) == len &&
+ std::char_traits< char_type >::compare(constants::message_text_keyword(), begin, len) == 0)
+ {
             m_AttrName = log::aux::default_attribute_names::message();
+ }
         else
- m_AttrName = attribute_name(log::aux::to_narrow(string_type(name.begin(), name.end())));
+ {
+ m_AttrName = attribute_name(log::aux::to_narrow(string_type(begin, end)));
+ }
     }
     //! The method is called when an attribute is filled
     void push_attr()
@@ -348,14 +383,11 @@
     }

     //! The method is called when a string literal is discovered
- void push_string(iterator_range< iterator_type > const& str)
+ void push_string(iterator_type begin, iterator_type end)
     {
- if (!str.empty())
- {
- string_type s(str.begin(), str.end());
- constants::translate_escape_sequences(s);
- append_formatter(expressions::stream << s);
- }
+ string_type s(begin, end);
+ constants::translate_escape_sequences(s);
+ append_formatter(expressions::stream << s);
     }

     //! The method appends a formatter part to the final formatter
@@ -369,8 +401,8 @@
     }

     // Assignment and copying are prohibited
- BOOST_LOG_DELETED_FUNCTION(formatter_grammar(formatter_grammar const&))
- BOOST_LOG_DELETED_FUNCTION(formatter_grammar& operator= (formatter_grammar const&))
+ BOOST_DELETED_FUNCTION(formatter_parser(formatter_parser const&))
+ BOOST_DELETED_FUNCTION(formatter_parser& operator= (formatter_parser const&))
};

} // namespace
@@ -383,7 +415,7 @@
     BOOST_ASSERT(!!factory);

     formatters_repository< CharT >& repo = formatters_repository< CharT >::get();
- BOOST_LOG_EXPR_IF_MT(log::aux::exclusive_lock_guard< log::aux::light_rw_mutex > _(repo.m_Mutex);)
+ BOOST_LOG_EXPR_IF_MT(log::aux::exclusive_lock_guard< log::aux::light_rw_mutex > lock(repo.m_Mutex);)
     repo.m_Map[name] = factory;
}

@@ -393,21 +425,15 @@
{
     typedef CharT char_type;

- formatter_grammar< char_type > gram;
+ formatter_parser< char_type > parser;
     const char_type* p = begin;

     BOOST_LOG_EXPR_IF_MT(formatters_repository< CharT >& repo = formatters_repository< CharT >::get();)
- BOOST_LOG_EXPR_IF_MT(log::aux::shared_lock_guard< log::aux::light_rw_mutex > _(repo.m_Mutex);)
+ BOOST_LOG_EXPR_IF_MT(log::aux::shared_lock_guard< log::aux::light_rw_mutex > lock(repo.m_Mutex);)

- bool result = qi::parse(p, end, gram);
- if (!result || p != end)
- {
- std::ostringstream strm;
- strm << "Could not parse the formatter, parsing stopped at position " << p - begin;
- BOOST_LOG_THROW_DESCR(parse_error, strm.str());
- }
+ parser.parse(p, end);

- return gram.get_formatter();
+ return parser.get_formatter();
}

#ifdef BOOST_LOG_USE_CHAR

Modified: branches/release/libs/log/src/global_logger_storage.cpp
==============================================================================
--- branches/release/libs/log/src/global_logger_storage.cpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/global_logger_storage.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 21.04.2008
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#include <map>

Modified: branches/release/libs/log/src/init_from_settings.cpp
==============================================================================
--- branches/release/libs/log/src/init_from_settings.cpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/init_from_settings.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 11.10.2009
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_WITHOUT_SETTINGS_PARSERS

Modified: branches/release/libs/log/src/init_from_stream.cpp
==============================================================================
--- branches/release/libs/log/src/init_from_stream.cpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/init_from_stream.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 22.03.2008
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_WITHOUT_SETTINGS_PARSERS

Modified: branches/release/libs/log/src/light_rw_mutex.cpp
==============================================================================
--- branches/release/libs/log/src/light_rw_mutex.cpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/light_rw_mutex.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 19.06.2010
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

// This first include is to ensure that __MSVCRT_VERSION__ is defined properly

Copied: branches/release/libs/log/src/matches_relation_factory.cpp (from r85460, trunk/libs/log/src/matches_relation_factory.cpp)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/release/libs/log/src/matches_relation_factory.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461, copy of r85460, trunk/libs/log/src/matches_relation_factory.cpp)
@@ -0,0 +1,157 @@
+/*
+ * 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 matches_relation_factory.hpp
+ * \author Andrey Semashev
+ * \date 03.08.2013
+ *
+ * \brief This header is the Boost.Log library implementation, see the library documentation
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
+ */
+
+#if !defined(BOOST_LOG_WITHOUT_SETTINGS_PARSERS) && !defined(BOOST_LOG_WITHOUT_DEFAULT_FACTORIES)
+
+#include <string>
+#include <boost/xpressive/xpressive_dynamic.hpp>
+#include <boost/log/support/xpressive.hpp>
+#include <boost/log/utility/string_literal.hpp>
+#include <boost/log/utility/functional/matches.hpp>
+#include <boost/log/utility/type_dispatch/standard_types.hpp>
+#include <boost/log/detail/code_conversion.hpp>
+#if defined(BOOST_LOG_USE_CHAR) && defined(BOOST_LOG_USE_WCHAR_T)
+#include <boost/fusion/container/set.hpp>
+#include <boost/fusion/sequence/intrinsic/at_key.hpp>
+#include <boost/fusion/algorithm/iteration/for_each.hpp>
+#endif
+#include "default_filter_factory.hpp"
+#include <boost/log/detail/header.hpp>
+
+namespace boost {
+
+BOOST_LOG_OPEN_NAMESPACE
+
+namespace aux {
+
+BOOST_LOG_ANONYMOUS_NAMESPACE {
+
+#if defined(BOOST_LOG_USE_CHAR) && defined(BOOST_LOG_USE_WCHAR_T)
+
+//! A special filtering predicate that adopts the string operand to the attribute value character type
+struct matches_predicate :
+ public matches_fun
+{
+ template< typename CharT >
+ struct initializer
+ {
+ typedef void result_type;
+ typedef CharT char_type;
+ typedef std::basic_string< char_type > string_type;
+
+ explicit initializer(string_type const& val) : m_initializer(val)
+ {
+ }
+
+ template< typename T >
+ result_type operator() (T& val) const
+ {
+ try
+ {
+ typedef typename T::char_type target_char_type;
+ std::basic_string< target_char_type > str;
+ log::aux::code_convert(m_initializer, str);
+ val = T::compile(str.c_str(), str.size(), T::ECMAScript | T::optimize);
+ }
+ catch (...)
+ {
+ }
+ }
+
+ private:
+ string_type const& m_initializer;
+ };
+
+ typedef matches_fun::result_type result_type;
+
+ template< typename CharT >
+ explicit matches_predicate(std::basic_string< CharT > const& operand)
+ {
+ fusion::for_each(m_operands, initializer< CharT >(operand));
+ }
+
+ template< typename T >
+ result_type operator() (T const& val) const
+ {
+ typedef typename T::value_type char_type;
+ typedef xpressive::basic_regex< const char_type* > regex_type;
+ return matches_fun::operator() (val, fusion::at_key< regex_type >(m_operands));
+ }
+
+private:
+ fusion::set< xpressive::cregex, xpressive::wcregex > m_operands;
+};
+
+#else
+
+//! A special filtering predicate that adopts the string operand to the attribute value character type
+template< typename CharT >
+struct matches_predicate :
+ public matches_fun
+{
+ typedef typename matches_fun::result_type result_type;
+ typedef CharT char_type;
+ typedef std::basic_string< char_type > string_type;
+ typedef xpressive::basic_regex< const char_type* > regex_type;
+
+ explicit matches_predicate(string_type const& operand) :
+ m_operand(regex_type::compile(operand.c_str(), operand.size(), regex_type::ECMAScript | regex_type::optimize))
+ {
+ }
+
+ template< typename T >
+ result_type operator() (T const& val) const
+ {
+ return matches_fun::operator() (val, m_operand);
+ }
+
+private:
+ regex_type m_operand;
+};
+
+#endif
+
+} // namespace
+
+//! The function parses the "matches" relation
+template< typename CharT >
+filter parse_matches_relation(attribute_name const& name, std::basic_string< CharT > const& operand)
+{
+#if defined(BOOST_LOG_USE_CHAR) && defined(BOOST_LOG_USE_WCHAR_T)
+ return predicate_wrapper< log::string_types::type, matches_predicate >(name, matches_predicate(operand));
+#else
+ return predicate_wrapper< std::basic_string< CharT >, matches_predicate< CharT > >(name, matches_predicate< CharT >(operand));
+#endif
+}
+
+// Explicitly instantiate factory implementation
+#ifdef BOOST_LOG_USE_CHAR
+template
+filter parse_matches_relation< char >(attribute_name const& name, std::basic_string< char > const& operand);
+#endif
+#ifdef BOOST_LOG_USE_WCHAR_T
+template
+filter parse_matches_relation< wchar_t >(attribute_name const& name, std::basic_string< wchar_t > const& operand);
+#endif
+
+} // namespace aux
+
+BOOST_LOG_CLOSE_NAMESPACE // namespace log
+
+} // namespace boost
+
+#include <boost/log/detail/footer.hpp>
+
+#endif // !defined(BOOST_LOG_WITHOUT_SETTINGS_PARSERS) && !defined(BOOST_LOG_WITHOUT_DEFAULT_FACTORIES)

Modified: branches/release/libs/log/src/named_scope.cpp
==============================================================================
--- branches/release/libs/log/src/named_scope.cpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/named_scope.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 24.06.2007
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#include <memory>
@@ -50,7 +50,7 @@

     public:
         //! The method pushes the scope to the back of the list
- BOOST_LOG_FORCEINLINE void push_back(const_reference entry) BOOST_NOEXCEPT
+ BOOST_FORCEINLINE void push_back(const_reference entry) BOOST_NOEXCEPT
         {
             register aux::named_scope_list_node* top = this->m_RootNode._m_pPrev;
             entry._m_pPrev = top;
@@ -64,7 +64,7 @@
             ++this->m_Size;
         }
         //! The method removes the top scope entry from the list
- BOOST_LOG_FORCEINLINE void pop_back() BOOST_NOEXCEPT
+ BOOST_FORCEINLINE void pop_back() BOOST_NOEXCEPT
         {
             register aux::named_scope_list_node* top = this->m_RootNode._m_pPrev;
             top->_m_pPrev->_m_pNext = top->_m_pNext;
@@ -126,7 +126,7 @@
} // namespace

//! Named scope attribute implementation
-struct BOOST_LOG_VISIBLE named_scope::impl :
+struct BOOST_SYMBOL_VISIBLE named_scope::impl :
     public attribute::impl,
     public log::aux::singleton<
         impl,

Modified: branches/release/libs/log/src/named_scope_format_parser.cpp
==============================================================================
--- branches/release/libs/log/src/named_scope_format_parser.cpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/named_scope_format_parser.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 14.11.2012
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#include <string>
@@ -113,7 +113,7 @@
     formatters m_formatters;

public:
- BOOST_LOG_DEFAULTED_FUNCTION(named_scope_formatter(), {})
+ BOOST_DEFAULTED_FUNCTION(named_scope_formatter(), {})
     named_scope_formatter(named_scope_formatter const& that) : m_formatters(that.m_formatters) {}
     named_scope_formatter(BOOST_RV_REF(named_scope_formatter) that) { m_formatters.swap(that.m_formatters); }

Modified: branches/release/libs/log/src/once_block.cpp
==============================================================================
--- branches/release/libs/log/src/once_block.cpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/once_block.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 23.06.2010
  *
  * \brief This file is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  *
  * The code in this file is based on the \c call_once function implementation in Boost.Thread.
  */

Modified: branches/release/libs/log/src/parser_utils.cpp
==============================================================================
--- branches/release/libs/log/src/parser_utils.cpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/parser_utils.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,15 +10,20 @@
  * \date 31.03.2008
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_WITHOUT_SETTINGS_PARSERS

+#include <cctype>
#include <iterator>
#include <algorithm>
+#include <boost/log/exceptions.hpp>
#include "parser_utils.hpp"
#include <boost/log/detail/header.hpp>
+#ifdef BOOST_LOG_USE_WCHAR_T
+#include <cwctype>
+#endif

namespace boost {

@@ -32,6 +37,7 @@

const char_constants< char >::char_type char_constants< char >::char_comment;
const char_constants< char >::char_type char_constants< char >::char_comma;
+const char_constants< char >::char_type char_constants< char >::char_dot;
const char_constants< char >::char_type char_constants< char >::char_quote;
const char_constants< char >::char_type char_constants< char >::char_percent;
const char_constants< char >::char_type char_constants< char >::char_exclamation;
@@ -49,11 +55,98 @@

#endif // BOOST_LOG_BROKEN_STATIC_CONSTANTS_LINKAGE

-void char_constants< char >::translate_escape_sequences(std::basic_string< char_type >& str)
+//! Skips spaces in the beginning of the input
+const char* char_constants< char >::trim_spaces_left(const char_type* begin, const char_type* end)
+{
+ using namespace std;
+ while (begin != end && isspace(*begin))
+ ++begin;
+ return begin;
+}
+
+//! Skips spaces in the end of the input
+const char* char_constants< char >::trim_spaces_right(const char_type* begin, const char_type* end)
+{
+ using namespace std;
+ while (begin != end && isspace(*(end - 1)))
+ --end;
+ return end;
+}
+
+//! Scans for the attribute name placeholder in the input
+const char* char_constants< char >::scan_attr_placeholder(const char_type* begin, const char_type* end)
+{
+ using namespace std;
+ while (begin != end)
+ {
+ char_type c = *begin;
+ if (!isalnum(c) && c != char_underline)
+ break;
+ ++begin;
+ }
+
+ return begin;
+}
+
+//! Parses an operand string (possibly quoted) from the input
+const char* char_constants< char >::parse_operand(const char_type* begin, const char_type* end, string_type& operand)
+{
+ using namespace std; // to make sure we can use C functions unqualified
+
+ const char_type* p = begin;
+ if (p == end)
+ BOOST_LOG_THROW_DESCR(parse_error, "Operand value is empty");
+
+ char_type c = *p;
+ if (c == char_quote)
+ {
+ // The value is specified as a quoted string
+ const char_type* start = ++p;
+ for (; p != end; ++p)
+ {
+ c = *p;
+ if (c == char_quote)
+ {
+ break;
+ }
+ else if (c == char_backslash)
+ {
+ ++p;
+ if (p == end)
+ BOOST_LOG_THROW_DESCR(parse_error, "Invalid escape sequence in the argument value");
+ }
+ }
+ if (p == end)
+ BOOST_LOG_THROW_DESCR(parse_error, "Unterminated quoted string in the argument value");
+
+ operand.assign(start, p);
+ translate_escape_sequences(operand);
+
+ ++p; // skip the closing quote
+ }
+ else
+ {
+ // The value is specified as a single word
+ const char_type* start = p;
+ for (++p; p != end; ++p)
+ {
+ c = *p;
+ if (!isalnum(c) && c != '_' && c != '-' && c != '+' && c != '.')
+ break;
+ }
+
+ operand.assign(start, p);
+ }
+
+ return p;
+}
+
+//! Converts escape sequences to the corresponding characters
+void char_constants< char >::translate_escape_sequences(string_type& str)
{
     using namespace std; // to make sure we can use C functions unqualified

- std::basic_string< char_type >::iterator it = str.begin();
+ string_type::iterator it = str.begin();
     while (it != str.end())
     {
         it = std::find(it, str.end(), '\\');
@@ -76,7 +169,7 @@
                 *it = '\b'; break;
             case 'x':
                 {
- std::basic_string< char_type >::iterator b = it;
+ string_type::iterator b = it;
                     if (std::distance(++b, str.end()) >= 2)
                     {
                         char_type c1 = *b++, c2 = *b++;
@@ -92,7 +185,7 @@
                 {
                     if (*it >= '0' && *it <= '7')
                     {
- std::basic_string< char_type >::iterator b = it;
+ string_type::iterator b = it;
                         int c = (*b++) - '0';
                         if (*b >= '0' && *b <= '7')
                             c = c * 8 + (*b++) - '0';
@@ -117,6 +210,7 @@

const char_constants< wchar_t >::char_type char_constants< wchar_t >::char_comment;
const char_constants< wchar_t >::char_type char_constants< wchar_t >::char_comma;
+const char_constants< wchar_t >::char_type char_constants< wchar_t >::char_dot;
const char_constants< wchar_t >::char_type char_constants< wchar_t >::char_quote;
const char_constants< wchar_t >::char_type char_constants< wchar_t >::char_percent;
const char_constants< wchar_t >::char_type char_constants< wchar_t >::char_exclamation;
@@ -134,9 +228,98 @@

#endif // BOOST_LOG_BROKEN_STATIC_CONSTANTS_LINKAGE

-void char_constants< wchar_t >::translate_escape_sequences(std::basic_string< char_type >& str)
+//! Skips spaces in the beginning of the input
+const wchar_t* char_constants< wchar_t >::trim_spaces_left(const char_type* begin, const char_type* end)
{
- std::basic_string< char_type >::iterator it = str.begin();
+ using namespace std;
+ while (begin != end && iswspace(*begin))
+ ++begin;
+ return begin;
+}
+
+//! Skips spaces in the end of the input
+const wchar_t* char_constants< wchar_t >::trim_spaces_right(const char_type* begin, const char_type* end)
+{
+ using namespace std;
+ while (begin != end && iswspace(*(end - 1)))
+ --end;
+ return end;
+}
+
+//! Scans for the attribute name placeholder in the input
+const wchar_t* char_constants< wchar_t >::scan_attr_placeholder(const char_type* begin, const char_type* end)
+{
+ using namespace std;
+ while (begin != end)
+ {
+ char_type c = *begin;
+ if (!iswalnum(c) && c != char_underline)
+ break;
+ ++begin;
+ }
+
+ return begin;
+}
+
+//! Parses an operand string (possibly quoted) from the input
+const wchar_t* char_constants< wchar_t >::parse_operand(const char_type* begin, const char_type* end, string_type& operand)
+{
+ using namespace std; // to make sure we can use C functions unqualified
+
+ const char_type* p = begin;
+ if (p == end)
+ BOOST_LOG_THROW_DESCR(parse_error, "Operand value is empty");
+
+ char_type c = *p;
+ if (c == char_quote)
+ {
+ // The value is specified as a quoted string
+ const char_type* start = ++p;
+ for (; p != end; ++p)
+ {
+ c = *p;
+ if (c == char_quote)
+ {
+ break;
+ }
+ else if (c == char_backslash)
+ {
+ ++p;
+ if (p == end)
+ BOOST_LOG_THROW_DESCR(parse_error, "Invalid escape sequence in the argument value");
+ }
+ }
+ if (p == end)
+ BOOST_LOG_THROW_DESCR(parse_error, "Unterminated quoted string in the argument value");
+
+ operand.assign(start, p);
+ translate_escape_sequences(operand);
+
+ ++p; // skip the closing quote
+ }
+ else
+ {
+ // The value is specified as a single word
+ const char_type* start = p;
+ for (++p; p != end; ++p)
+ {
+ c = *p;
+ if (!iswalnum(c) && c != L'_' && c != L'-' && c != L'+' && c != L'.')
+ break;
+ }
+
+ operand.assign(start, p);
+ }
+
+ return p;
+}
+
+//! Converts escape sequences to the corresponding characters
+void char_constants< wchar_t >::translate_escape_sequences(string_type& str)
+{
+ using namespace std; // to make sure we can use C functions unqualified
+
+ string_type::iterator it = str.begin();
     while (it != str.end())
     {
         it = std::find(it, str.end(), L'\\');
@@ -159,7 +342,7 @@
                 *it = L'\b'; break;
             case L'x':
                 {
- std::basic_string< char_type >::iterator b = it;
+ string_type::iterator b = it;
                     if (std::distance(++b, str.end()) >= 2)
                     {
                         char_type c1 = *b++, c2 = *b++;
@@ -173,7 +356,7 @@
                 }
             case L'u':
                 {
- std::basic_string< char_type >::iterator b = it;
+ string_type::iterator b = it;
                     if (std::distance(++b, str.end()) >= 4)
                     {
                         char_type c1 = *b++, c2 = *b++, c3 = *b++, c4 = *b++;
@@ -191,7 +374,7 @@
                 }
             case L'U':
                 {
- std::basic_string< char_type >::iterator b = it;
+ string_type::iterator b = it;
                     if (std::distance(++b, str.end()) >= 8)
                     {
                         char_type c1 = *b++, c2 = *b++, c3 = *b++, c4 = *b++;
@@ -217,7 +400,7 @@
                 {
                     if (*it >= L'0' && *it <= L'7')
                     {
- std::basic_string< char_type >::iterator b = it;
+ string_type::iterator b = it;
                         int c = (*b++) - L'0';
                         if (*b >= L'0' && *b <= L'7')
                             c = c * 8 + (*b++) - L'0';

Modified: branches/release/libs/log/src/parser_utils.hpp
==============================================================================
--- branches/release/libs/log/src/parser_utils.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/parser_utils.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 31.03.2008
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_PARSER_UTILS_HPP_INCLUDED_
@@ -22,7 +22,7 @@
#include <boost/log/detail/config.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

@@ -40,8 +40,11 @@
struct char_constants< char >
{
     typedef char char_type;
+ typedef std::basic_string< char_type > string_type;
+
     static const char_type char_comment = '#';
     static const char_type char_comma = ',';
+ static const char_type char_dot = '.';
     static const char_type char_quote = '"';
     static const char_type char_percent = '%';
     static const char_type char_exclamation = '!';
@@ -147,7 +150,16 @@
         return n;
     }

- static void translate_escape_sequences(std::basic_string< char_type >& str);
+ //! Skips spaces in the beginning of the input
+ static const char_type* trim_spaces_left(const char_type* begin, const char_type* end);
+ //! Skips spaces in the end of the input
+ static const char_type* trim_spaces_right(const char_type* begin, const char_type* end);
+ //! Scans for the attribute name placeholder in the input
+ static const char_type* scan_attr_placeholder(const char_type* begin, const char_type* end);
+ //! Parses an operand string (possibly quoted) from the input
+ static const char_type* parse_operand(const char_type* begin, const char_type* end, string_type& operand);
+ //! Converts escape sequences to the corresponding characters
+ static void translate_escape_sequences(string_type& str);
};
#endif

@@ -156,8 +168,11 @@
struct char_constants< wchar_t >
{
     typedef wchar_t char_type;
+ typedef std::basic_string< char_type > string_type;
+
     static const char_type char_comment = L'#';
     static const char_type char_comma = L',';
+ static const char_type char_dot = L'.';
     static const char_type char_quote = L'"';
     static const char_type char_percent = L'%';
     static const char_type char_exclamation = L'!';
@@ -267,7 +282,16 @@
         return (c >= L'0' && c <= L'9') || (c >= L'a' && c <= L'f') || (c >= L'A' && c <= L'F');
     }

- static void translate_escape_sequences(std::basic_string< char_type >& str);
+ //! Skips spaces in the beginning of the input
+ static const char_type* trim_spaces_left(const char_type* begin, const char_type* end);
+ //! Skips spaces in the end of the input
+ static const char_type* trim_spaces_right(const char_type* begin, const char_type* end);
+ //! Scans for the attribute name placeholder in the input
+ static const char_type* scan_attr_placeholder(const char_type* begin, const char_type* end);
+ //! Parses an operand string (possibly quoted) from the input
+ static const char_type* parse_operand(const char_type* begin, const char_type* end, string_type& operand);
+ //! Converts escape sequences to the corresponding characters
+ static void translate_escape_sequences(string_type& str);
};
#endif

Modified: branches/release/libs/log/src/process_id.cpp
==============================================================================
--- branches/release/libs/log/src/process_id.cpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/process_id.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 12.09.2009
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#include <iostream>

Modified: branches/release/libs/log/src/process_name.cpp
==============================================================================
--- branches/release/libs/log/src/process_name.cpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/process_name.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 29.07.2012
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  *
  * The code in this file is based on information on this page:
  *

Modified: branches/release/libs/log/src/record_ostream.cpp
==============================================================================
--- branches/release/libs/log/src/record_ostream.cpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/record_ostream.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 17.04.2008
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#include <memory>

Modified: branches/release/libs/log/src/settings_parser.cpp
==============================================================================
--- branches/release/libs/log/src/settings_parser.cpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/settings_parser.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,62 +10,46 @@
  * \date 20.07.2012
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_WITHOUT_SETTINGS_PARSERS

#include <string>
-#include <iostream>
#include <locale>
-#include <memory>
+#include <iostream>
#include <stdexcept>
-#include <boost/ref.hpp>
-#include <boost/bind.hpp>
+#include <algorithm>
#include <boost/throw_exception.hpp>
+#include <boost/exception/exception.hpp>
+#include <boost/exception/info.hpp>
+#include <boost/exception/errinfo_at_line.hpp>
#include <boost/io/ios_state.hpp>
#include <boost/move/core.hpp>
#include <boost/move/utility.hpp>
-#include <boost/algorithm/string/trim.hpp>
-#include <boost/spirit/include/qi_core.hpp>
-#include <boost/spirit/include/qi_char.hpp>
-#include <boost/spirit/include/qi_lit.hpp>
-#include <boost/spirit/include/qi_eoi.hpp>
-#include <boost/spirit/include/qi_eol.hpp>
-#include <boost/spirit/include/qi_raw.hpp>
-#include <boost/spirit/include/qi_lexeme.hpp>
-#include <boost/range/iterator_range_core.hpp>
#include <boost/log/detail/config.hpp>
#include <boost/log/detail/code_conversion.hpp>
-#include <boost/log/exceptions.hpp>
#include <boost/log/utility/setup/settings_parser.hpp>
+#include <boost/log/exceptions.hpp>
#include "parser_utils.hpp"
#include "spirit_encoding.hpp"
#include <boost/log/detail/header.hpp>

-namespace qi = boost::spirit::qi;
-
namespace boost {

BOOST_LOG_OPEN_NAMESPACE

BOOST_LOG_ANONYMOUS_NAMESPACE {

-//! Settings parsing grammar
+//! Settings parser
template< typename CharT >
-class settings_grammar :
- public qi::grammar<
- const CharT*,
- typename log::aux::encoding_specific< typename log::aux::encoding< CharT >::type >::space_type
- >
+class settings_parser
{
private:
     typedef CharT char_type;
     typedef const char_type* iterator_type;
- typedef log::aux::encoding_specific< typename log::aux::encoding< char_type >::type > encoding_specific;
- typedef settings_grammar< char_type > this_type;
- typedef qi::grammar< iterator_type, typename encoding_specific::space_type > base_type;
- typedef typename base_type::start_type rule_type;
+ typedef typename log::aux::encoding< char_type >::type encoding;
+ typedef settings_parser< char_type > this_type;

     typedef std::basic_string< char_type > string_type;
     typedef log::aux::char_constants< char_type > constants;
@@ -83,70 +67,101 @@
     //! Current line number
     unsigned int& m_LineCounter;

- //! A parser for a comment
- rule_type comment;
- //! A parser for a section name
- rule_type section_name;
- //! A parser for a quoted string
- rule_type quoted_string;
- //! A parser for a parameter name and value
- rule_type parameter;
- //! A parser for a single line
- rule_type line;
-
public:
     //! Constructor
- explicit settings_grammar(settings_type& setts, unsigned int& line_counter, std::locale const& loc) :
- base_type(line, "settings_grammar"),
+ explicit settings_parser(settings_type& setts, unsigned int& line_counter, std::locale const& loc) :
         m_Settings(setts),
         m_Locale(loc),
         m_LineCounter(line_counter)
     {
- comment = qi::lit(constants::char_comment) >> *qi::char_;
+ }

- section_name =
- qi::raw[ qi::lit(constants::char_section_bracket_left) >> +(encoding_specific::graph - constants::char_section_bracket_right) >> constants::char_section_bracket_right ]
- [boost::bind(&this_type::set_section_name, this, _1)] >>
- -comment;
-
- quoted_string = qi::lexeme
- [
- qi::lit(constants::char_quote) >>
- *(
- (qi::lit(constants::char_backslash) >> qi::char_) |
- (qi::char_ - qi::lit(constants::char_quote))
- ) >>
- qi::lit(constants::char_quote)
- ];
-
- parameter =
- // Parameter name
- qi::raw[ qi::lexeme[ encoding_specific::alpha >> *(encoding_specific::graph - constants::char_equal) ] ]
- [boost::bind(&this_type::set_parameter_name, this, _1)] >>
- qi::lit(constants::char_equal) >>
- // Parameter value
- (
- qi::raw[ quoted_string ][boost::bind(&this_type::set_parameter_quoted_value, this, _1)] |
- qi::raw[ +encoding_specific::graph ][boost::bind(&this_type::set_parameter_value, this, _1)]
- ) >>
- -comment;
+ //! Parses a line of the input
+ void parse_line(iterator_type& begin, iterator_type end)
+ {
+ iterator_type p = begin;
+ p = constants::trim_spaces_left(p, end);
+ if (p != end)
+ {
+ char_type c = *p;
+ if (c == constants::char_section_bracket_left)
+ {
+ // We have a section name
+ iterator_type start = ++p;
+ start = constants::trim_spaces_left(start, end);
+ iterator_type stop = std::find(start, end, constants::char_section_bracket_right);
+ if (stop == end)
+ BOOST_LOG_THROW_DESCR_PARAMS(parse_error, "Section header is invalid", (m_LineCounter));
+
+ p = stop + 1;
+ stop = constants::trim_spaces_right(start, stop);
+
+ set_section_name(start, stop);
+ }
+ else if (c != constants::char_comment)
+ {
+ // We have a parameter
+ iterator_type eq = std::find(p, end, constants::char_equal);
+ if (eq == end)
+ BOOST_LOG_THROW_DESCR_PARAMS(parse_error, "Parameter description is invalid", (m_LineCounter));
+
+ // Parameter name
+ set_parameter_name(p, constants::trim_spaces_right(p, eq));
+
+ // Parameter value
+ p = constants::trim_spaces_left(eq + 1, end);
+ if (p == end || *p == constants::char_comment)
+ BOOST_LOG_THROW_DESCR_PARAMS(parse_error, "Parameter value is not specified", (m_LineCounter));
+
+ try
+ {
+ string_type value;
+ p = constants::parse_operand(p, end, value);
+ set_parameter_value(value);
+ }
+ catch (parse_error& e)
+ {
+ throw boost::enable_error_info(e) << boost::errinfo_at_line(m_LineCounter);
+ }
+ }

- line = (comment | section_name | parameter) >> qi::eoi;
+ // In the end of the line we may have a comment
+ p = constants::trim_spaces_left(p, end);
+ if (p != end)
+ {
+ c = *p;
+ if (c == constants::char_comment)
+ {
+ // The comment spans until the end of the line
+ p = end;
+ }
+ else
+ {
+ BOOST_LOG_THROW_DESCR_PARAMS(parse_error, "Unexpected characters in the end of the line", (m_LineCounter));
+ }
+ }
+ }
+
+ begin = p;
     }

private:
     //! The method sets the parsed section name
- void set_section_name(iterator_range< iterator_type > const& sec)
+ void set_section_name(iterator_type begin, iterator_type end)
     {
- // Trim square brackets
- m_SectionName = log::aux::to_narrow(string_type(sec.begin() + 1, sec.end() - 1), m_Locale);
- algorithm::trim(m_SectionName, m_Locale);
- if (m_SectionName.empty())
+ // Check that the section name is valid
+ if (begin == end)
+ BOOST_LOG_THROW_DESCR_PARAMS(parse_error, "Section name is empty", (m_LineCounter));
+
+ for (iterator_type p = begin; p != end; ++p)
         {
- // The section starter is broken
- BOOST_LOG_THROW_DESCR_PARAMS(parse_error, "The section header is invalid.", (m_LineCounter));
+ char_type c = *p;
+ if (c != constants::char_dot && !encoding::isalnum(c))
+ BOOST_LOG_THROW_DESCR_PARAMS(parse_error, "Section name is invalid", (m_LineCounter));
         }

+ m_SectionName = log::aux::to_narrow(string_type(begin, end), m_Locale);
+
         // For compatibility with Boost.Log v1, we replace the "Sink:" prefix with "Sinks."
         // so that all sink parameters are placed in the common Sinks section.
         if (m_SectionName.compare(0, 5, "Sink:") == 0)
@@ -154,38 +169,41 @@
     }

     //! The method sets the parsed parameter name
- void set_parameter_name(iterator_range< iterator_type > const& name)
+ void set_parameter_name(iterator_type begin, iterator_type end)
     {
         if (m_SectionName.empty())
         {
             // The parameter encountered before any section starter
- BOOST_LOG_THROW_DESCR_PARAMS(parse_error, "Parameters are only allowed within sections.", (m_LineCounter));
+ BOOST_LOG_THROW_DESCR_PARAMS(parse_error, "Parameters are only allowed within sections", (m_LineCounter));
         }

- m_ParameterName = log::aux::to_narrow(string_type(name.begin(), name.end()), m_Locale);
- }
+ // Check that the parameter name is valid
+ if (begin == end)
+ BOOST_LOG_THROW_DESCR_PARAMS(parse_error, "Parameter name is empty", (m_LineCounter));
+
+ iterator_type p = begin;
+ if (!encoding::isalpha(*p))
+ BOOST_LOG_THROW_DESCR_PARAMS(parse_error, "Parameter name is invalid", (m_LineCounter));
+ for (++p; p != end; ++p)
+ {
+ char_type c = *p;
+ if (!encoding::isgraph(c))
+ BOOST_LOG_THROW_DESCR_PARAMS(parse_error, "Parameter name is invalid", (m_LineCounter));
+ }

- //! The method sets the parsed parameter value (non-quoted)
- void set_parameter_value(iterator_range< iterator_type > const& value)
- {
- string_type val(value.begin(), value.end());
- m_Settings[m_SectionName][m_ParameterName] = val;
- m_ParameterName.clear();
+ m_ParameterName = log::aux::to_narrow(string_type(begin, end), m_Locale);
     }

- //! The method sets the parsed parameter value (quoted)
- void set_parameter_quoted_value(iterator_range< iterator_type > const& value)
+ //! The method sets the parsed parameter value (non-quoted)
+ void set_parameter_value(string_type const& value)
     {
- // Cut off the quotes
- string_type val(value.begin() + 1, value.end() - 1);
- constants::translate_escape_sequences(val);
- m_Settings[m_SectionName][m_ParameterName] = val;
+ m_Settings[m_SectionName][m_ParameterName] = value;
         m_ParameterName.clear();
     }

     // Assignment and copying are prohibited
- BOOST_LOG_DELETED_FUNCTION(settings_grammar(settings_grammar const&))
- BOOST_LOG_DELETED_FUNCTION(settings_grammar& operator= (settings_grammar const&))
+ BOOST_DELETED_FUNCTION(settings_parser(settings_parser const&))
+ BOOST_DELETED_FUNCTION(settings_parser& operator= (settings_parser const&))
};

} // namespace
@@ -196,9 +214,8 @@
{
     typedef CharT char_type;
     typedef std::basic_string< char_type > string_type;
- typedef settings_grammar< char_type > settings_grammar_type;
+ typedef settings_parser< char_type > settings_parser_type;
     typedef basic_settings< char_type > settings_type;
- typedef log::aux::encoding_specific< typename log::aux::encoding< char_type >::type > encoding_specific;

     if (!strm.good())
         BOOST_THROW_EXCEPTION(std::invalid_argument("The input stream for parsing settings is not valid"));
@@ -209,23 +226,17 @@
     settings_type settings;
     unsigned int line_number = 1;
     std::locale loc = strm.getloc();
- settings_grammar_type gram(settings, line_number, loc);
+ settings_parser_type parser(settings, line_number, loc);

     string_type line;
     while (!strm.eof())
     {
         std::getline(strm, line);
- algorithm::trim(line, loc);

- if (!line.empty())
- {
- if (!qi::phrase_parse(line.c_str(), line.c_str() + line.size(), gram, encoding_specific::space))
- {
- BOOST_LOG_THROW_DESCR_PARAMS(parse_error, "Could not parse settings from stream.", (line_number));
- }
- line.clear();
- }
+ const char_type* p = line.c_str();
+ parser.parse_line(p, p + line.size());

+ line.clear();
         ++line_number;
     }

Modified: branches/release/libs/log/src/severity_level.cpp
==============================================================================
--- branches/release/libs/log/src/severity_level.cpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/severity_level.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 10.05.2008
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#include <boost/cstdint.hpp>

Modified: branches/release/libs/log/src/spirit_encoding.cpp
==============================================================================
--- branches/release/libs/log/src/spirit_encoding.cpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/spirit_encoding.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 20.07.2012
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#include <boost/preprocessor/tuple/elem.hpp>

Modified: branches/release/libs/log/src/spirit_encoding.hpp
==============================================================================
--- branches/release/libs/log/src/spirit_encoding.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/spirit_encoding.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 20.07.2012
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_SPIRIT_ENCODING_HPP_INCLUDED_
@@ -24,7 +24,7 @@
#include <boost/log/detail/config.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/libs/log/src/stateless_allocator.hpp
==============================================================================
--- branches/release/libs/log/src/stateless_allocator.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/stateless_allocator.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 11.02.2012
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_STATELESS_ALLOCATOR_HPP_INCLUDED_
@@ -22,7 +22,7 @@
#include <boost/log/detail/config.hpp>
#include <boost/log/detail/header.hpp>

-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif

Modified: branches/release/libs/log/src/syslog_backend.cpp
==============================================================================
--- branches/release/libs/log/src/syslog_backend.cpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/syslog_backend.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 08.01.2008
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_WITHOUT_SYSLOG

Modified: branches/release/libs/log/src/text_file_backend.cpp
==============================================================================
--- branches/release/libs/log/src/text_file_backend.cpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/text_file_backend.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 09.06.2009
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#include <ctime>

Modified: branches/release/libs/log/src/text_ostream_backend.cpp
==============================================================================
--- branches/release/libs/log/src/text_ostream_backend.cpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/text_ostream_backend.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 19.04.2007
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#include <vector>

Modified: branches/release/libs/log/src/thread_id.cpp
==============================================================================
--- branches/release/libs/log/src/thread_id.cpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/thread_id.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 08.1.2012
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#include <boost/log/detail/config.hpp>

Modified: branches/release/libs/log/src/thread_specific.cpp
==============================================================================
--- branches/release/libs/log/src/thread_specific.cpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/thread_specific.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 01.03.2008
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#include <string>

Modified: branches/release/libs/log/src/threadsafe_queue.cpp
==============================================================================
--- branches/release/libs/log/src/threadsafe_queue.cpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/threadsafe_queue.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 05.11.2010
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  *
  * The implementation is based on algorithms published in the "Simple, Fast,
  * and Practical Non-Blocking and Blocking Concurrent Queue Algorithms" article
@@ -31,7 +31,6 @@
#include <boost/type_traits/alignment_of.hpp>
#include <boost/log/detail/spin_mutex.hpp>
#include <boost/log/detail/locks.hpp>
-#include <boost/log/detail/alignas.hpp>
#include <boost/log/detail/malloc_aligned.hpp>
#include <boost/log/detail/header.hpp>

@@ -53,7 +52,7 @@
      * A structure that contains a pointer to the node and the associated mutex.
      * The alignment below allows to eliminate false sharing, it should not be less than CPU cache line size.
      */
- struct BOOST_LOG_ALIGNAS(BOOST_LOG_CPU_CACHE_LINE_SIZE) pointer
+ struct BOOST_ALIGNMENT(BOOST_LOG_CPU_CACHE_LINE_SIZE) pointer
     {
         //! Pointer to the either end of the queue
         node_base* node;
@@ -121,11 +120,11 @@
     threadsafe_queue_impl_generic(threadsafe_queue_impl_generic const&);
     threadsafe_queue_impl_generic& operator= (threadsafe_queue_impl_generic const&);

- BOOST_LOG_FORCEINLINE static void set_next(node_base* p, node_base* next)
+ BOOST_FORCEINLINE static void set_next(node_base* p, node_base* next)
     {
         p->next.data[0] = next;
     }
- BOOST_LOG_FORCEINLINE static node_base* get_next(node_base* p)
+ BOOST_FORCEINLINE static node_base* get_next(node_base* p)
     {
         return static_cast< node_base* >(p->next.data[0]);
     }

Modified: branches/release/libs/log/src/timer.cpp
==============================================================================
--- branches/release/libs/log/src/timer.cpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/timer.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 02.12.2007
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#include <boost/config.hpp>
@@ -20,12 +20,13 @@
#if defined(BOOST_WINDOWS) && !defined(BOOST_LOG_NO_QUERY_PERFORMANCE_COUNTER)

#include "windows_version.hpp"
-#include <boost/limits.hpp>
#include <boost/assert.hpp>
#include <boost/cstdint.hpp>
-#include <boost/detail/interlocked.hpp>
+#include <boost/log/detail/config.hpp>
+#if !defined(BOOST_LOG_NO_THREADS)
#include <boost/log/detail/locks.hpp>
-#include <boost/log/detail/spin_mutex.hpp>
+#include <boost/thread/mutex.hpp>
+#endif
#include <windows.h>
#include <boost/log/detail/header.hpp>

@@ -36,18 +37,18 @@
namespace attributes {

//! Factory implementation
-class BOOST_LOG_VISIBLE timer::impl :
+class BOOST_SYMBOL_VISIBLE timer::impl :
     public attribute::impl
{
private:
#if !defined(BOOST_LOG_NO_THREADS)
     //! Synchronization mutex type
- typedef log::aux::spin_mutex mutex_type;
+ typedef boost::mutex mutex_type;
     //! Synchronization mutex
     mutex_type m_Mutex;
#endif
     //! Frequency factor for calculating duration
- uint64_t m_FrequencyFactor;
+ double m_FrequencyFactor;
     //! Last value of the performance counter
     uint64_t m_LastCounter;
     //! Elapsed time duration, in microseconds
@@ -60,7 +61,7 @@
         LARGE_INTEGER li;
         QueryPerformanceFrequency(&li);
         BOOST_ASSERT(li.QuadPart != 0LL);
- m_FrequencyFactor = static_cast< uint64_t >(li.QuadPart) / 1000000ULL;
+ m_FrequencyFactor = 1000000.0 / static_cast< double >(li.QuadPart);

         QueryPerformanceCounter(&li);
         m_LastCounter = static_cast< uint64_t >(li.QuadPart);
@@ -69,43 +70,20 @@
     //! The method returns the actual attribute value. It must not return NULL.
     attribute_value get_value()
     {
- LARGE_INTEGER li;
- QueryPerformanceCounter(&li);
-
         uint64_t duration;
         {
- BOOST_LOG_EXPR_IF_MT(log::aux::exclusive_lock_guard< mutex_type > _(m_Mutex);)
+ BOOST_LOG_EXPR_IF_MT(log::aux::exclusive_lock_guard< mutex_type > lock(m_Mutex);)

- const uint64_t counts = static_cast< uint64_t >(li.QuadPart) - m_LastCounter;
- m_LastCounter = static_cast< uint64_t >(li.QuadPart);
- m_Duration += counts / m_FrequencyFactor;
- duration = m_Duration;
- }
-
- // All these dances are needed simply to construct Boost.DateTime duration without truncating the value
- value_type res;
- if (duration < static_cast< uint64_t >((std::numeric_limits< value_type::fractional_seconds_type >::max)()))
- {
- res = value_type(0, 0, 0, static_cast< value_type::fractional_seconds_type >(
- duration * (1000000 / value_type::traits_type::ticks_per_second)));
- }
- else
- {
- uint64_t total_seconds = duration / 1000000ULL;
- value_type::fractional_seconds_type usec = static_cast< value_type::fractional_seconds_type >(duration % 1000000ULL);
- if (total_seconds < static_cast< uint64_t >((std::numeric_limits< value_type::sec_type >::max)()))
- {
- res = value_type(0, 0, static_cast< value_type::sec_type >(total_seconds), usec);
- }
- else
- {
- uint64_t total_hours = total_seconds / 3600ULL;
- value_type::sec_type seconds = static_cast< value_type::sec_type >(total_seconds % 3600ULL);
- res = value_type(static_cast< value_type::hour_type >(total_hours), 0, seconds, usec);
- }
+ LARGE_INTEGER li;
+ QueryPerformanceCounter(&li);
+ const uint64_t counter = static_cast< uint64_t >(li.QuadPart);
+ const uint64_t counts = counter - m_LastCounter;
+ m_LastCounter = counter;
+ duration = m_Duration + static_cast< uint64_t >(counts * m_FrequencyFactor);
+ m_Duration = duration;
         }

- return attribute_value(new attribute_value_impl< value_type >(res));
+ return attribute_value(new attribute_value_impl< value_type >(boost::posix_time::microseconds(duration)));
     }
};

@@ -138,7 +116,7 @@
namespace attributes {

//! Factory implementation
-class BOOST_LOG_VISIBLE timer::impl :
+class BOOST_SYMBOL_VISIBLE timer::impl :
     public attribute::impl
{
public:

Modified: branches/release/libs/log/src/timestamp.cpp
==============================================================================
--- branches/release/libs/log/src/timestamp.cpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/timestamp.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,13 +10,12 @@
  * \date 31.07.2011
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#include <boost/log/detail/timestamp.hpp>

#if defined(BOOST_WINDOWS) && !defined(__CYGWIN__)
-#include <boost/log/detail/alignas.hpp>
#include <boost/detail/interlocked.hpp>
#include "windows_version.hpp"
#include <windows.h>
@@ -57,7 +56,7 @@
# if defined(_M_IX86)
# if defined(_M_IX86_FP) && _M_IX86_FP >= 2
//! Atomically loads and stores the 64-bit value through SSE2 instructions
-BOOST_LOG_FORCEINLINE void move64(const uint64_t* from, uint64_t* to)
+BOOST_FORCEINLINE void move64(const uint64_t* from, uint64_t* to)
{
     __asm
     {
@@ -69,7 +68,7 @@
}
# else // defined(_M_IX86_FP) && _M_IX86_FP >= 2
//! Atomically loads and stores the 64-bit value through FPU instructions
-BOOST_LOG_FORCEINLINE void move64(const uint64_t* from, uint64_t* to)
+BOOST_FORCEINLINE void move64(const uint64_t* from, uint64_t* to)
{
     __asm
     {
@@ -82,7 +81,7 @@
# endif // defined(_M_IX86_FP) && _M_IX86_FP >= 2
# elif defined(_M_AMD64) || defined(_M_IA64)
//! Atomically loads and stores the 64-bit value
-BOOST_LOG_FORCEINLINE void move64(const uint64_t* from, uint64_t* to)
+BOOST_FORCEINLINE void move64(const uint64_t* from, uint64_t* to)
{
     *to = *from;
}
@@ -95,7 +94,7 @@
# if defined(__i386__)
# if defined(__SSE2__)
//! Atomically loads and stores the 64-bit value through SSE2 instructions
-BOOST_LOG_FORCEINLINE void move64(const uint64_t* from, uint64_t* to)
+BOOST_FORCEINLINE void move64(const uint64_t* from, uint64_t* to)
{
     __asm__ __volatile__
     (
@@ -108,7 +107,7 @@
}
# else // defined(__SSE2__)
//! Atomically loads and stores the 64-bit value through FPU instructions
-BOOST_LOG_FORCEINLINE void move64(const uint64_t* from, uint64_t* to)
+BOOST_FORCEINLINE void move64(const uint64_t* from, uint64_t* to)
{
     __asm__ __volatile__
     (
@@ -122,7 +121,7 @@
# endif // defined(__SSE2__)
# elif defined(__x86_64__)
//! Atomically loads and stores the 64-bit value
-BOOST_LOG_FORCEINLINE void move64(const uint64_t* from, uint64_t* to)
+BOOST_FORCEINLINE void move64(const uint64_t* from, uint64_t* to)
{
     *to = *from;
}
@@ -138,10 +137,10 @@

#if defined(BOOST_LOG_GENERIC_MOVE64)

-BOOST_LOG_ALIGNAS(16) long g_spin_lock = 0;
+BOOST_ALIGNMENT(16) long g_spin_lock = 0;

//! Atomically loads and stores the 64-bit value
-BOOST_LOG_FORCEINLINE void move64(const uint64_t* from, uint64_t* to)
+BOOST_FORCEINLINE void move64(const uint64_t* from, uint64_t* to)
{
     while (BOOST_INTERLOCKED_COMPARE_EXCHANGE(&g_spin_lock, 1, 0) != 0);
     *to = *from;
@@ -150,7 +149,7 @@

#endif // defined(BOOST_LOG_GENERIC_MOVE64)

-BOOST_LOG_ALIGNAS(16) uint64_t g_ticks = 0;
+BOOST_ALIGNMENT(16) uint64_t g_ticks = 0;

union ticks_caster
{
@@ -223,8 +222,9 @@
     timespec ts;
     if (clock_gettime(CLOCK_REALTIME, &ts) != 0)
     {
+ const int err = errno;
         BOOST_THROW_EXCEPTION(boost::system::system_error(
- errno, boost::system::system_category(), "Failed to acquire current time"));
+ err, boost::system::system_category(), "Failed to acquire current time"));
     }

     return timestamp(static_cast< uint64_t >(ts.tv_sec) * 1000000000ULL + ts.tv_nsec);
@@ -238,7 +238,7 @@
     timespec ts;
     if (clock_gettime(CLOCK_MONOTONIC, &ts) != 0)
     {
- int err = errno;
+ const int err = errno;
         if (err == EINVAL)
         {
             // The current platform does not support monotonic timer.

Modified: branches/release/libs/log/src/trivial.cpp
==============================================================================
--- branches/release/libs/log/src/trivial.cpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/trivial.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 07.11.2009
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#include <boost/log/detail/config.hpp>

Modified: branches/release/libs/log/src/unhandled_exception_count.cpp
==============================================================================
--- branches/release/libs/log/src/unhandled_exception_count.cpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/unhandled_exception_count.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 05.11.2012
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  *
  * The code in this file is based on the implementation by Evgeny Panasyuk:
  *

Modified: branches/release/libs/log/src/windows_version.hpp
==============================================================================
--- branches/release/libs/log/src/windows_version.hpp Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/src/windows_version.hpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -10,7 +10,7 @@
  * \date 07.03.2009
  *
  * \brief This header is the Boost.Log library implementation, see the library documentation
- * at http://www.boost.org/libs/log/doc/log.html.
+ * at http://www.boost.org/doc/libs/release/libs/log/doc/html/index.html.
  */

#ifndef BOOST_LOG_WINDOWS_VERSION_HPP_INCLUDED_

Modified: branches/release/libs/log/test/Jamfile.v2
==============================================================================
--- branches/release/libs/log/test/Jamfile.v2 Sun Aug 25 09:26:30 2013 (r85460)
+++ branches/release/libs/log/test/Jamfile.v2 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461)
@@ -21,6 +21,7 @@
         <toolset>intel-win:<define>_CRT_SECURE_NO_DEPRECATE
         <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
         <library>/boost/regex//boost_regex
         <library>/boost/filesystem//boost_filesystem

Copied: branches/release/libs/log/test/run/setup_filter_parser.cpp (from r85460, trunk/libs/log/test/run/setup_filter_parser.cpp)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/release/libs/log/test/run/setup_filter_parser.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461, copy of r85460, trunk/libs/log/test/run/setup_filter_parser.cpp)
@@ -0,0 +1,794 @@
+/*
+ * 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 setup_filter_parser.cpp
+ * \author Andrey Semashev
+ * \date 24.08.2013
+ *
+ * \brief This header contains tests for the filter parser.
+ */
+
+#define BOOST_TEST_MODULE setup_filter_parser
+
+#include <string>
+#include <boost/test/unit_test.hpp>
+#include <boost/log/utility/setup/filter_parser.hpp>
+
+#if !defined(BOOST_LOG_WITHOUT_SETTINGS_PARSERS) && !defined(BOOST_LOG_WITHOUT_DEFAULT_FACTORIES)
+
+#include <boost/shared_ptr.hpp>
+#include <boost/log/exceptions.hpp>
+#include <boost/log/attributes/constant.hpp>
+#include <boost/log/attributes/attribute_set.hpp>
+#include <boost/log/attributes/attribute_value_set.hpp>
+#include <boost/log/expressions/filter.hpp>
+
+namespace logging = boost::log;
+namespace attrs = logging::attributes;
+
+typedef logging::attribute_set attr_set;
+typedef logging::attribute_value_set attr_values;
+
+// Tests for attribute presence check
+BOOST_AUTO_TEST_CASE(attr_presence)
+{
+ attrs::constant< int > attr1(10);
+ attr_set set1, set2, set3;
+
+ attr_values values1(set1, set2, set3);
+ values1.freeze();
+
+ set1["MyAttr"] = attr1;
+ attr_values values2(set1, set2, set3);
+ values2.freeze();
+
+ {
+ logging::filter f = logging::parse_filter("%MyAttr%");
+ BOOST_CHECK(!f(values1));
+ BOOST_CHECK(f(values2));
+ }
+ {
+ logging::filter f = logging::parse_filter(" % MyAttr % ");
+ BOOST_CHECK(!f(values1));
+ BOOST_CHECK(f(values2));
+ }
+}
+
+// Tests for integer relation filter
+BOOST_AUTO_TEST_CASE(int_relation)
+{
+ attrs::constant< int > attr1(10);
+ attrs::constant< long > attr2(20);
+ attrs::constant< int > attr3(-2);
+ attr_set set1, set2, set3;
+
+ attr_values values1(set1, set2, set3);
+ values1.freeze();
+
+ set1["MyAttr"] = attr1;
+ attr_values values2(set1, set2, set3);
+ values2.freeze();
+
+ set1["MyAttr"] = attr2;
+ attr_values values3(set1, set2, set3);
+ values3.freeze();
+
+ set1["MyAttr"] = attr3;
+ attr_values values4(set1, set2, set3);
+ values4.freeze();
+
+ {
+ logging::filter f = logging::parse_filter("%MyAttr% = 10");
+ BOOST_CHECK(!f(values1));
+ BOOST_CHECK(f(values2));
+ BOOST_CHECK(!f(values3));
+ BOOST_CHECK(!f(values4));
+ }
+ {
+ logging::filter f = logging::parse_filter("%MyAttr% != 10");
+ BOOST_CHECK(!f(values1));
+ BOOST_CHECK(!f(values2));
+ BOOST_CHECK(f(values3));
+ BOOST_CHECK(f(values4));
+ }
+ {
+ logging::filter f = logging::parse_filter("%MyAttr% < 20");
+ BOOST_CHECK(!f(values1));
+ BOOST_CHECK(f(values2));
+ BOOST_CHECK(!f(values3));
+ BOOST_CHECK(f(values4));
+ }
+ {
+ logging::filter f = logging::parse_filter("%MyAttr% < -7");
+ BOOST_CHECK(!f(values1));
+ BOOST_CHECK(!f(values2));
+ BOOST_CHECK(!f(values3));
+ BOOST_CHECK(!f(values4));
+ }
+ {
+ logging::filter f = logging::parse_filter("%MyAttr% > 10");
+ BOOST_CHECK(!f(values1));
+ BOOST_CHECK(!f(values2));
+ BOOST_CHECK(f(values3));
+ BOOST_CHECK(!f(values4));
+ }
+ {
+ logging::filter f = logging::parse_filter("%MyAttr% > -5");
+ BOOST_CHECK(!f(values1));
+ BOOST_CHECK(f(values2));
+ BOOST_CHECK(f(values3));
+ BOOST_CHECK(f(values4));
+ }
+ {
+ logging::filter f = logging::parse_filter("%MyAttr% <= 20");
+ BOOST_CHECK(!f(values1));
+ BOOST_CHECK(f(values2));
+ BOOST_CHECK(f(values3));
+ BOOST_CHECK(f(values4));
+ }
+ {
+ logging::filter f = logging::parse_filter("%MyAttr% >= 20");
+ BOOST_CHECK(!f(values1));
+ BOOST_CHECK(!f(values2));
+ BOOST_CHECK(f(values3));
+ BOOST_CHECK(!f(values4));
+ }
+}
+
+// Tests for floating point relation filter
+BOOST_AUTO_TEST_CASE(fp_relation)
+{
+ attrs::constant< float > attr1(2.5);
+ attrs::constant< float > attr2(8.8);
+ attrs::constant< double > attr3(-9.1);
+ attrs::constant< float > attr4(0);
+ attr_set set1, set2, set3;
+
+ attr_values values1(set1, set2, set3);
+ values1.freeze();
+
+ set1["MyAttr"] = attr1;
+ attr_values values2(set1, set2, set3);
+ values2.freeze();
+
+ set1["MyAttr"] = attr2;
+ attr_values values3(set1, set2, set3);
+ values3.freeze();
+
+ set1["MyAttr"] = attr3;
+ attr_values values4(set1, set2, set3);
+ values4.freeze();
+
+ set1["MyAttr"] = attr4;
+ attr_values values5(set1, set2, set3);
+ values5.freeze();
+
+ {
+ logging::filter f = logging::parse_filter("%MyAttr% = 10.3");
+ BOOST_CHECK(!f(values1));
+ BOOST_CHECK(!f(values2));
+ BOOST_CHECK(!f(values3));
+ BOOST_CHECK(!f(values4));
+ BOOST_CHECK(!f(values5));
+ }
+ {
+ logging::filter f = logging::parse_filter("%MyAttr% != 10");
+ BOOST_CHECK(!f(values1));
+ BOOST_CHECK(f(values2));
+ BOOST_CHECK(f(values3));
+ BOOST_CHECK(f(values4));
+ BOOST_CHECK(f(values5));
+ }
+ {
+ logging::filter f = logging::parse_filter("%MyAttr% < 5.5");
+ BOOST_CHECK(!f(values1));
+ BOOST_CHECK(f(values2));
+ BOOST_CHECK(!f(values3));
+ BOOST_CHECK(f(values4));
+ BOOST_CHECK(f(values5));
+ }
+ {
+ logging::filter f = logging::parse_filter("%MyAttr% < -7");
+ BOOST_CHECK(!f(values1));
+ BOOST_CHECK(!f(values2));
+ BOOST_CHECK(!f(values3));
+ BOOST_CHECK(f(values4));
+ BOOST_CHECK(!f(values5));
+ }
+ {
+ logging::filter f = logging::parse_filter("%MyAttr% > 5.6");
+ BOOST_CHECK(!f(values1));
+ BOOST_CHECK(!f(values2));
+ BOOST_CHECK(f(values3));
+ BOOST_CHECK(!f(values4));
+ BOOST_CHECK(!f(values5));
+ }
+ {
+ logging::filter f = logging::parse_filter("%MyAttr% > -5");
+ BOOST_CHECK(!f(values1));
+ BOOST_CHECK(f(values2));
+ BOOST_CHECK(f(values3));
+ BOOST_CHECK(!f(values4));
+ BOOST_CHECK(f(values5));
+ }
+ {
+ logging::filter f = logging::parse_filter("%MyAttr% <= 20");
+ BOOST_CHECK(!f(values1));
+ BOOST_CHECK(f(values2));
+ BOOST_CHECK(f(values3));
+ BOOST_CHECK(f(values4));
+ BOOST_CHECK(f(values5));
+ }
+ {
+ logging::filter f = logging::parse_filter("%MyAttr% >= 20");
+ BOOST_CHECK(!f(values1));
+ BOOST_CHECK(!f(values2));
+ BOOST_CHECK(!f(values3));
+ BOOST_CHECK(!f(values4));
+ BOOST_CHECK(!f(values5));
+ }
+}
+
+// Tests for string relation filter
+BOOST_AUTO_TEST_CASE(string_relation)
+{
+ attrs::constant< std::string > attr1("hello");
+ attr_set set1, set2, set3;
+
+ attr_values values1(set1, set2, set3);
+ values1.freeze();
+
+ set1["MyStr"] = attr1;
+ attr_values values2(set1, set2, set3);
+ values2.freeze();
+
+ {
+ logging::filter f = logging::parse_filter("%MyStr% = hello");
+ BOOST_CHECK(!f(values1));
+ BOOST_CHECK(f(values2));
+ }
+ {
+ logging::filter f = logging::parse_filter("%MyStr% = \"hello\"");
+ BOOST_CHECK(!f(values1));
+ BOOST_CHECK(f(values2));
+ }
+ {
+ logging::filter f = logging::parse_filter(" % MyStr % = \"hello\" ");
+ BOOST_CHECK(!f(values1));
+ BOOST_CHECK(f(values2));
+ }
+ {
+ logging::filter f = logging::parse_filter("%MyStr% = \" hello\"");
+ BOOST_CHECK(!f(values1));
+ BOOST_CHECK(!f(values2));
+ }
+ {
+ logging::filter f = logging::parse_filter("%MyStr% = \"hello \"");
+ BOOST_CHECK(!f(values1));
+ BOOST_CHECK(!f(values2));
+ }
+ {
+ logging::filter f = logging::parse_filter("%MyStr% = \"world\"");
+ BOOST_CHECK(!f(values1));
+ BOOST_CHECK(!f(values2));
+ }
+ {
+ logging::filter f = logging::parse_filter("%MyStr% = \"Hello\"");
+ BOOST_CHECK(!f(values1));
+ BOOST_CHECK(!f(values2));
+ }
+ {
+ logging::filter f = logging::parse_filter("%MyStr% != hello");
+ BOOST_CHECK(!f(values1));
+ BOOST_CHECK(!f(values2));
+ }
+ {
+ logging::filter f = logging::parse_filter("%MyStr% != world");
+ BOOST_CHECK(!f(values1));
+ BOOST_CHECK(f(values2));
+ }
+ {
+ logging::filter f = logging::parse_filter("%MyStr% < world");
+ BOOST_CHECK(!f(values1));
+ BOOST_CHECK(f(values2));
+ }
+ {
+ logging::filter f = logging::parse_filter("%MyStr% > world");
+ BOOST_CHECK(!f(values1));
+ BOOST_CHECK(!f(values2));
+ }
+
+ // Check that strings that look like numbers can still be used in filters
+ attrs::constant< std::string > attr2("55");
+ set1["MyStr"] = attr2;
+ attr_values values3(set1, set2, set3);
+ values3.freeze();
+
+ {
+ logging::filter f = logging::parse_filter("%MyStr% = \"55\"");
+ BOOST_CHECK(f(values3));
+ }
+ {
+ logging::filter f = logging::parse_filter("%MyStr% < \"555\"");
+ BOOST_CHECK(f(values3));
+ }
+ {
+ logging::filter f = logging::parse_filter("%MyStr% > \"44\"");
+ BOOST_CHECK(f(values3));
+ }
+}
+
+// Tests for multiple expression filter
+BOOST_AUTO_TEST_CASE(multi_expression)
+{
+ attrs::constant< int > attr1(10);
+ attrs::constant< int > attr2(20);
+ attrs::constant< std::string > attr3("hello");
+ attrs::constant< std::string > attr4("world");
+ attr_set set1, set2, set3;
+
+ attr_values values1(set1, set2, set3);
+ values1.freeze();
+
+ set1["MyAttr"] = attr1;
+ attr_values values2(set1, set2, set3);
+ values2.freeze();
+
+ set1["MyAttr"] = attr2;
+ attr_values values3(set1, set2, set3);
+ values3.freeze();
+
+ set1["MyStr"] = attr3;
+ attr_values values4(set1, set2, set3);
+ values4.freeze();
+
+ set1["MyStr"] = attr4;
+ attr_values values5(set1, set2, set3);
+ values5.freeze();
+
+ {
+ logging::filter f = logging::parse_filter("%MyAttr% = 10 & %MyStr% = \"hello\"");
+ BOOST_CHECK(!f(values1));
+ BOOST_CHECK(!f(values2));
+ BOOST_CHECK(!f(values3));
+ BOOST_CHECK(!f(values4));
+ BOOST_CHECK(!f(values5));
+ }
+ {
+ logging::filter f = logging::parse_filter("%MyAttr% > 10 & %MyStr% = \"hello\"");
+ BOOST_CHECK(!f(values1));
+ BOOST_CHECK(!f(values2));
+ BOOST_CHECK(!f(values3));
+ BOOST_CHECK(f(values4));
+ BOOST_CHECK(!f(values5));
+ }
+ {
+ logging::filter f = logging::parse_filter("%MyAttr% > 10 and %MyStr% = \"hello\"");
+ BOOST_CHECK(!f(values1));
+ BOOST_CHECK(!f(values2));
+ BOOST_CHECK(!f(values3));
+ BOOST_CHECK(f(values4));
+ BOOST_CHECK(!f(values5));
+ }
+ {
+ logging::filter f = logging::parse_filter("%MyAttr% = 10 | %MyStr% = \"world\"");
+ BOOST_CHECK(!f(values1));
+ BOOST_CHECK(f(values2));
+ BOOST_CHECK(!f(values3));
+ BOOST_CHECK(!f(values4));
+ BOOST_CHECK(f(values5));
+ }
+ {
+ logging::filter f = logging::parse_filter("%MyAttr% > 10 | %MyStr% = \"world\"");
+ BOOST_CHECK(!f(values1));
+ BOOST_CHECK(!f(values2));
+ BOOST_CHECK(f(values3));
+ BOOST_CHECK(f(values4));
+ BOOST_CHECK(f(values5));
+ }
+ {
+ logging::filter f = logging::parse_filter("%MyAttr% = 10 or %MyStr% = \"world\"");
+ BOOST_CHECK(!f(values1));
+ BOOST_CHECK(f(values2));
+ BOOST_CHECK(!f(values3));
+ BOOST_CHECK(!f(values4));
+ BOOST_CHECK(f(values5));
+ }
+ {
+ logging::filter f = logging::parse_filter("%MyAttr% > 0 & %MyAttr% < 20 | %MyStr% = \"hello\"");
+ BOOST_CHECK(!f(values1));
+ BOOST_CHECK(f(values2));
+ BOOST_CHECK(!f(values3));
+ BOOST_CHECK(f(values4));
+ BOOST_CHECK(!f(values5));
+ }
+}
+
+// Tests for negation
+BOOST_AUTO_TEST_CASE(negation)
+{
+ attrs::constant< int > attr1(10);
+ attrs::constant< int > attr2(20);
+ attrs::constant< std::string > attr3("hello");
+ attr_set set1, set2, set3;
+
+ attr_values values1(set1, set2, set3);
+ values1.freeze();
+
+ set1["MyAttr"] = attr1;
+ attr_values values2(set1, set2, set3);
+ values2.freeze();
+
+ set1["MyAttr"] = attr2;
+ attr_values values3(set1, set2, set3);
+ values3.freeze();
+
+ set1["MyStr"] = attr3;
+ attr_values values4(set1, set2, set3);
+ values4.freeze();
+
+ // Test with presence filter
+ {
+ logging::filter f = logging::parse_filter("!%MyAttr%");
+ BOOST_CHECK(f(values1));
+ BOOST_CHECK(!f(values2));
+ }
+ {
+ logging::filter f = logging::parse_filter(" ! % MyAttr % ");
+ BOOST_CHECK(f(values1));
+ BOOST_CHECK(!f(values2));
+ }
+ {
+ logging::filter f = logging::parse_filter("not %MyAttr%");
+ BOOST_CHECK(f(values1));
+ BOOST_CHECK(!f(values2));
+ }
+ {
+ logging::filter f = logging::parse_filter("!!%MyAttr%");
+ BOOST_CHECK(!f(values1));
+ BOOST_CHECK(f(values2));
+ }
+
+ // Test with relations
+ {
+ logging::filter f = logging::parse_filter("!(%MyAttr% = 10)");
+ BOOST_CHECK(f(values1));
+ BOOST_CHECK(!f(values2));
+ BOOST_CHECK(f(values3));
+ }
+ {
+ logging::filter f = logging::parse_filter("not ( %MyAttr% = 10 ) ");
+ BOOST_CHECK(f(values1));
+ BOOST_CHECK(!f(values2));
+ BOOST_CHECK(f(values3));
+ }
+ {
+ logging::filter f = logging::parse_filter("!(%MyAttr% < 20)");
+ BOOST_CHECK(f(values1));
+ BOOST_CHECK(!f(values2));
+ BOOST_CHECK(f(values3));
+ }
+
+ // Test with multiple subexpressions
+ {
+ logging::filter f = logging::parse_filter("!(%MyAttr% = 20 & %MyStr% = hello)");
+ BOOST_CHECK(f(values1));
+ BOOST_CHECK(f(values2));
+ BOOST_CHECK(f(values3));
+ BOOST_CHECK(!f(values4));
+ }
+ {
+ logging::filter f = logging::parse_filter("!(%MyAttr% = 10 | %MyStr% = hello)");
+ BOOST_CHECK(f(values1));
+ BOOST_CHECK(!f(values2));
+ BOOST_CHECK(f(values3));
+ BOOST_CHECK(!f(values4));
+ }
+}
+
+// Tests for begins_with relation filter
+BOOST_AUTO_TEST_CASE(begins_with_relation)
+{
+ attrs::constant< std::string > attr1("abcdABCD");
+ attr_set set1, set2, set3;
+
+ set1["MyStr"] = attr1;
+ attr_values values1(set1, set2, set3);
+ values1.freeze();
+
+ {
+ logging::filter f = logging::parse_filter("%MyStr% begins_with \"abcd\"");
+ BOOST_CHECK(f(values1));
+ }
+ {
+ logging::filter f = logging::parse_filter("%MyStr% begins_with \"ABCD\"");
+ BOOST_CHECK(!f(values1));
+ }
+ {
+ logging::filter f = logging::parse_filter("%MyStr% begins_with \"efgh\"");
+ BOOST_CHECK(!f(values1));
+ }
+}
+
+// Tests for ends_with relation filter
+BOOST_AUTO_TEST_CASE(ends_with_relation)
+{
+ attrs::constant< std::string > attr1("abcdABCD");
+ attr_set set1, set2, set3;
+
+ set1["MyStr"] = attr1;
+ attr_values values1(set1, set2, set3);
+ values1.freeze();
+
+ {
+ logging::filter f = logging::parse_filter("%MyStr% ends_with \"abcd\"");
+ BOOST_CHECK(!f(values1));
+ }
+ {
+ logging::filter f = logging::parse_filter("%MyStr% ends_with \"ABCD\"");
+ BOOST_CHECK(f(values1));
+ }
+ {
+ logging::filter f = logging::parse_filter("%MyStr% ends_with \"efgh\"");
+ BOOST_CHECK(!f(values1));
+ }
+}
+
+// Tests for contains relation filter
+BOOST_AUTO_TEST_CASE(contains_relation)
+{
+ attrs::constant< std::string > attr1("abcdABCD");
+ attr_set set1, set2, set3;
+
+ set1["MyStr"] = attr1;
+ attr_values values1(set1, set2, set3);
+ values1.freeze();
+
+ {
+ logging::filter f = logging::parse_filter("%MyStr% contains \"abcd\"");
+ BOOST_CHECK(f(values1));
+ }
+ {
+ logging::filter f = logging::parse_filter("%MyStr% contains \"ABCD\"");
+ BOOST_CHECK(f(values1));
+ }
+ {
+ logging::filter f = logging::parse_filter("%MyStr% contains \"cdAB\"");
+ BOOST_CHECK(f(values1));
+ }
+ {
+ logging::filter f = logging::parse_filter("%MyStr% contains \"efgh\"");
+ BOOST_CHECK(!f(values1));
+ }
+}
+
+// Tests for regex matching relation filter
+BOOST_AUTO_TEST_CASE(matches_relation)
+{
+ attrs::constant< std::string > attr1("hello");
+ attr_set set1, set2, set3;
+
+ set1["MyStr"] = attr1;
+ attr_values values1(set1, set2, set3);
+ values1.freeze();
+
+ {
+ logging::filter f = logging::parse_filter("%MyStr% matches \"h.*\"");
+ BOOST_CHECK(f(values1));
+ }
+ {
+ logging::filter f = logging::parse_filter("%MyStr% matches \"w.*\"");
+ BOOST_CHECK(!f(values1));
+ }
+}
+
+namespace {
+
+class test_filter_factory :
+ public logging::filter_factory< char >
+{
+private:
+ typedef logging::filter_factory< char > base_type;
+
+public:
+ enum relation_type
+ {
+ custom,
+ exists,
+ equality,
+ inequality,
+ less,
+ greater,
+ less_or_equal,
+ greater_or_equal
+ };
+
+ typedef base_type::string_type string_type;
+
+public:
+ explicit test_filter_factory(logging::attribute_name const& name) : m_name(name), m_rel(custom), m_called(false)
+ {
+ }
+
+ void expect_relation(relation_type rel, string_type const& arg)
+ {
+ m_rel = rel;
+ m_arg = arg;
+ m_custom_rel.clear();
+ }
+
+ void expect_relation(string_type const& rel, string_type const& arg)
+ {
+ m_rel = custom;
+ m_arg = arg;
+ m_custom_rel = rel;
+ }
+
+ void check_called()
+ {
+ BOOST_CHECK(m_called);
+ m_called = false;
+ }
+
+ logging::filter on_exists_test(logging::attribute_name const& name)
+ {
+ BOOST_CHECK_EQUAL(m_name, name);
+ BOOST_CHECK_EQUAL(m_rel, exists);
+ m_called = true;
+ return logging::filter();
+ }
+ logging::filter on_equality_relation(logging::attribute_name const& name, string_type const& arg)
+ {
+ BOOST_CHECK_EQUAL(m_name, name);
+ BOOST_CHECK_EQUAL(m_rel, equality);
+ BOOST_CHECK_EQUAL(m_arg, arg);
+ m_called = true;
+ return logging::filter();
+ }
+ logging::filter on_inequality_relation(logging::attribute_name const& name, string_type const& arg)
+ {
+ BOOST_CHECK_EQUAL(m_name, name);
+ BOOST_CHECK_EQUAL(m_rel, inequality);
+ BOOST_CHECK_EQUAL(m_arg, arg);
+ m_called = true;
+ return logging::filter();
+ }
+ logging::filter on_less_relation(logging::attribute_name const& name, string_type const& arg)
+ {
+ BOOST_CHECK_EQUAL(m_name, name);
+ BOOST_CHECK_EQUAL(m_rel, less);
+ BOOST_CHECK_EQUAL(m_arg, arg);
+ m_called = true;
+ return logging::filter();
+ }
+ logging::filter on_greater_relation(logging::attribute_name const& name, string_type const& arg)
+ {
+ BOOST_CHECK_EQUAL(m_name, name);
+ BOOST_CHECK_EQUAL(m_rel, greater);
+ BOOST_CHECK_EQUAL(m_arg, arg);
+ m_called = true;
+ return logging::filter();
+ }
+ logging::filter on_less_or_equal_relation(logging::attribute_name const& name, string_type const& arg)
+ {
+ BOOST_CHECK_EQUAL(m_name, name);
+ BOOST_CHECK_EQUAL(m_rel, less_or_equal);
+ BOOST_CHECK_EQUAL(m_arg, arg);
+ m_called = true;
+ return logging::filter();
+ }
+ logging::filter on_greater_or_equal_relation(logging::attribute_name const& name, string_type const& arg)
+ {
+ BOOST_CHECK_EQUAL(m_name, name);
+ BOOST_CHECK_EQUAL(m_rel, greater_or_equal);
+ BOOST_CHECK_EQUAL(m_arg, arg);
+ m_called = true;
+ return logging::filter();
+ }
+ logging::filter on_custom_relation(logging::attribute_name const& name, string_type const& rel, string_type const& arg)
+ {
+ BOOST_CHECK_EQUAL(m_name, name);
+ BOOST_CHECK_EQUAL(m_rel, custom);
+ BOOST_CHECK_EQUAL(m_custom_rel, rel);
+ BOOST_CHECK_EQUAL(m_arg, arg);
+ m_called = true;
+ return logging::filter();
+ }
+
+private:
+ logging::attribute_name m_name;
+ relation_type m_rel;
+ string_type m_arg;
+ string_type m_custom_rel;
+ bool m_called;
+};
+
+} // namespace
+
+// Tests for filter factory
+BOOST_AUTO_TEST_CASE(filter_factory)
+{
+ logging::attribute_name attr_name("MyCustomAttr");
+ boost::shared_ptr< test_filter_factory > factory(new test_filter_factory(attr_name));
+ logging::register_filter_factory(attr_name, factory);
+
+ BOOST_TEST_CHECKPOINT("filter_factory::exists");
+ factory->expect_relation(test_filter_factory::exists, "");
+ logging::parse_filter("%MyCustomAttr%");
+ factory->check_called();
+
+ BOOST_TEST_CHECKPOINT("filter_factory::equality");
+ factory->expect_relation(test_filter_factory::equality, "15");
+ logging::parse_filter("%MyCustomAttr% = 15");
+ factory->check_called();
+
+ BOOST_TEST_CHECKPOINT("filter_factory::equality");
+ factory->expect_relation(test_filter_factory::equality, "hello");
+ logging::parse_filter("%MyCustomAttr% = hello");
+ factory->check_called();
+
+ BOOST_TEST_CHECKPOINT("filter_factory::equality");
+ factory->expect_relation(test_filter_factory::equality, "hello");
+ logging::parse_filter("%MyCustomAttr% = \"hello\"");
+ factory->check_called();
+
+ BOOST_TEST_CHECKPOINT("filter_factory::equality");
+ factory->expect_relation(test_filter_factory::equality, "hello\nworld");
+ logging::parse_filter("%MyCustomAttr% = \"hello\\nworld\"");
+ factory->check_called();
+
+ BOOST_TEST_CHECKPOINT("filter_factory::inequality");
+ factory->expect_relation(test_filter_factory::inequality, "hello");
+ logging::parse_filter("%MyCustomAttr% != \"hello\"");
+ factory->check_called();
+
+ BOOST_TEST_CHECKPOINT("filter_factory::less");
+ factory->expect_relation(test_filter_factory::less, "hello");
+ logging::parse_filter("%MyCustomAttr% < \"hello\"");
+ factory->check_called();
+
+ BOOST_TEST_CHECKPOINT("filter_factory::greater");
+ factory->expect_relation(test_filter_factory::greater, "hello");
+ logging::parse_filter("%MyCustomAttr% > \"hello\"");
+ factory->check_called();
+
+ BOOST_TEST_CHECKPOINT("filter_factory::less_or_equal");
+ factory->expect_relation(test_filter_factory::less_or_equal, "hello");
+ logging::parse_filter("%MyCustomAttr% <= \"hello\"");
+ factory->check_called();
+
+ BOOST_TEST_CHECKPOINT("filter_factory::greater_or_equal");
+ factory->expect_relation(test_filter_factory::greater_or_equal, "hello");
+ logging::parse_filter("%MyCustomAttr% >= \"hello\"");
+ factory->check_called();
+
+ BOOST_TEST_CHECKPOINT("filter_factory::custom");
+ factory->expect_relation("my_relation", "hello");
+ logging::parse_filter("%MyCustomAttr% my_relation \"hello\"");
+ factory->check_called();
+}
+
+// Tests for invalid filters
+BOOST_AUTO_TEST_CASE(invalid)
+{
+ BOOST_CHECK_THROW(logging::parse_filter("%MyStr"), logging::parse_error);
+ BOOST_CHECK_THROW(logging::parse_filter("MyStr%"), logging::parse_error);
+ BOOST_CHECK_THROW(logging::parse_filter("%MyStr% abcd"), logging::parse_error);
+ BOOST_CHECK_THROW(logging::parse_filter("(%MyStr%"), logging::parse_error);
+ BOOST_CHECK_THROW(logging::parse_filter("%MyStr%)"), logging::parse_error);
+ BOOST_CHECK_THROW(logging::parse_filter("%%"), logging::parse_error);
+ BOOST_CHECK_THROW(logging::parse_filter("%"), logging::parse_error);
+ BOOST_CHECK_THROW(logging::parse_filter("!"), logging::parse_error);
+ BOOST_CHECK_THROW(logging::parse_filter("!()"), logging::parse_error);
+ BOOST_CHECK_THROW(logging::parse_filter("\"xxx\" == %MyStr%"), logging::parse_error);
+ BOOST_CHECK_THROW(logging::parse_filter("%MyStr% == \"xxx"), logging::parse_error);
+ BOOST_CHECK_THROW(logging::parse_filter("%MyStr% === \"xxx\""), logging::parse_error);
+ BOOST_CHECK_THROW(logging::parse_filter("%MyStr% ! \"xxx\""), logging::parse_error);
+ BOOST_CHECK_THROW(logging::parse_filter("%MyStr% %MyStr2%"), logging::parse_error);
+}
+
+#endif // !defined(BOOST_LOG_WITHOUT_SETTINGS_PARSERS) && !defined(BOOST_LOG_WITHOUT_DEFAULT_FACTORIES)

Copied: branches/release/libs/log/test/run/setup_formatter_parser.cpp (from r85460, trunk/libs/log/test/run/setup_formatter_parser.cpp)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/release/libs/log/test/run/setup_formatter_parser.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461, copy of r85460, trunk/libs/log/test/run/setup_formatter_parser.cpp)
@@ -0,0 +1,257 @@
+/*
+ * 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 setup_formatter_parser.cpp
+ * \author Andrey Semashev
+ * \date 25.08.2013
+ *
+ * \brief This header contains tests for the formatter parser.
+ */
+
+#define BOOST_TEST_MODULE setup_formatter_parser
+
+#include <string>
+#include <boost/test/unit_test.hpp>
+#include <boost/log/utility/setup/formatter_parser.hpp>
+
+#if !defined(BOOST_LOG_WITHOUT_SETTINGS_PARSERS) && !defined(BOOST_LOG_WITHOUT_DEFAULT_FACTORIES)
+
+#include <boost/shared_ptr.hpp>
+#include <boost/log/exceptions.hpp>
+#include <boost/log/core/record.hpp>
+#include <boost/log/core/record_view.hpp>
+#include <boost/log/attributes/constant.hpp>
+#include <boost/log/attributes/attribute_set.hpp>
+#include <boost/log/attributes/attribute_value_set.hpp>
+#include <boost/log/utility/formatting_ostream.hpp>
+#include <boost/log/expressions/formatter.hpp>
+#include "make_record.hpp"
+
+namespace logging = boost::log;
+namespace attrs = logging::attributes;
+
+typedef logging::attribute_set attr_set;
+typedef logging::attribute_value_set attr_values;
+typedef logging::record_view record_view;
+
+typedef logging::basic_formatting_ostream< char > osstream;
+typedef logging::basic_formatter< char > formatter;
+
+// Tests for simple attribute placeholders in formatters
+BOOST_AUTO_TEST_CASE(attr_placeholders)
+{
+ attrs::constant< int > attr1(10);
+ attrs::constant< std::string > attr2("hello");
+ attr_set set1;
+
+ set1["MyAttr"] = attr1;
+ set1["MyStr"] = attr2;
+
+ record_view rec = make_record_view(set1);
+
+ {
+ formatter f = logging::parse_formatter("String literal");
+ std::string str1, str2;
+ osstream strm1(str1), strm2(str2);
+ f(rec, strm1);
+ strm2 << "String literal";
+ BOOST_CHECK_EQUAL(strm1.str(), strm2.str());
+ }
+ {
+ formatter f = logging::parse_formatter("MyAttr: %MyAttr%, MyStr: %MyStr%");
+ std::string str1, str2;
+ osstream strm1(str1), strm2(str2);
+ f(rec, strm1);
+ strm2 << "MyAttr: " << attr1.get() << ", MyStr: " << attr2.get();
+ BOOST_CHECK_EQUAL(strm1.str(), strm2.str());
+ }
+ {
+ formatter f = logging::parse_formatter("MyAttr: % MyAttr %, MyStr: % MyStr %");
+ std::string str1, str2;
+ osstream strm1(str1), strm2(str2);
+ f(rec, strm1);
+ strm2 << "MyAttr: " << attr1.get() << ", MyStr: " << attr2.get();
+ BOOST_CHECK_EQUAL(strm1.str(), strm2.str());
+ }
+ {
+ formatter f = logging::parse_formatter("%MyAttr%%MyStr%");
+ std::string str1, str2;
+ osstream strm1(str1), strm2(str2);
+ f(rec, strm1);
+ strm2 << attr1.get() << attr2.get();
+ BOOST_CHECK_EQUAL(strm1.str(), strm2.str());
+ }
+ {
+ formatter f = logging::parse_formatter("MyAttr: %MyAttr%, MissingAttr: %MissingAttr%");
+ std::string str1, str2;
+ osstream strm1(str1), strm2(str2);
+ f(rec, strm1);
+ strm2 << "MyAttr: " << attr1.get() << ", MissingAttr: ";
+ BOOST_CHECK_EQUAL(strm1.str(), strm2.str());
+ }
+}
+
+namespace {
+
+class test_formatter_factory :
+ public logging::formatter_factory< char >
+{
+private:
+ typedef logging::formatter_factory< char > base_type;
+
+public:
+ typedef base_type::string_type string_type;
+ typedef base_type::args_map args_map;
+ typedef base_type::formatter_type formatter_type;
+
+public:
+ explicit test_formatter_factory(logging::attribute_name const& name) : m_name(name), m_called(false)
+ {
+ }
+
+ void expect_args(args_map const& args)
+ {
+ m_args = args;
+ }
+
+ void check_called()
+ {
+ BOOST_CHECK(m_called);
+ m_called = false;
+ }
+
+ formatter_type create_formatter(logging::attribute_name const& name, args_map const& args)
+ {
+ BOOST_CHECK_EQUAL(m_name, name);
+ BOOST_CHECK_EQUAL(m_args.size(), args.size());
+
+ for (args_map::const_iterator it = m_args.begin(), end = m_args.end(); it != end; ++it)
+ {
+ args_map::const_iterator parsed_it = args.find(it->first);
+ if (parsed_it != args.end())
+ {
+ BOOST_TEST_CHECKPOINT(("Arg: " + it->first));
+ BOOST_CHECK_EQUAL(it->second, parsed_it->second);
+ }
+ else
+ {
+ BOOST_ERROR(("Arg not found: " + it->first));
+ }
+ }
+
+ m_called = true;
+ return formatter_type();
+ }
+
+private:
+ logging::attribute_name m_name;
+ args_map m_args;
+ bool m_called;
+};
+
+} // namespace
+
+// Tests for formatter factory
+BOOST_AUTO_TEST_CASE(formatter_factory)
+{
+ logging::attribute_name attr_name("MyCustomAttr");
+ boost::shared_ptr< test_formatter_factory > factory(new test_formatter_factory(attr_name));
+ logging::register_formatter_factory(attr_name, factory);
+
+ {
+ BOOST_TEST_CHECKPOINT("formatter 1");
+ test_formatter_factory::args_map args;
+ factory->expect_args(args);
+ logging::parse_formatter("Hello: %MyCustomAttr%");
+ factory->check_called();
+ }
+ {
+ BOOST_TEST_CHECKPOINT("formatter 2");
+ test_formatter_factory::args_map args;
+ factory->expect_args(args);
+ logging::parse_formatter("Hello: %MyCustomAttr()%");
+ factory->check_called();
+ }
+ {
+ BOOST_TEST_CHECKPOINT("formatter 3");
+ test_formatter_factory::args_map args;
+ factory->expect_args(args);
+ logging::parse_formatter("Hello: %MyCustomAttr ( ) %");
+ factory->check_called();
+ }
+ {
+ BOOST_TEST_CHECKPOINT("formatter 4");
+ test_formatter_factory::args_map args;
+ args["param1"] = "10";
+ factory->expect_args(args);
+ logging::parse_formatter("Hello: %MyCustomAttr(param1=10)%");
+ factory->check_called();
+ }
+ {
+ BOOST_TEST_CHECKPOINT("formatter 5");
+ test_formatter_factory::args_map args;
+ args["param1"] = "10";
+ factory->expect_args(args);
+ logging::parse_formatter("Hello: % MyCustomAttr ( param1 = 10 ) % ");
+ factory->check_called();
+ }
+ {
+ BOOST_TEST_CHECKPOINT("formatter 6");
+ test_formatter_factory::args_map args;
+ args["param1"] = " 10 ";
+ factory->expect_args(args);
+ logging::parse_formatter("Hello: %MyCustomAttr(param1=\" 10 \")%");
+ factory->check_called();
+ }
+ {
+ BOOST_TEST_CHECKPOINT("formatter 7");
+ test_formatter_factory::args_map args;
+ args["param1"] = "10";
+ args["param2"] = "abcd";
+ factory->expect_args(args);
+ logging::parse_formatter("Hello: %MyCustomAttr(param1 = 10, param2 = abcd)%");
+ factory->check_called();
+ }
+ {
+ BOOST_TEST_CHECKPOINT("formatter 8");
+ test_formatter_factory::args_map args;
+ args["param1"] = "10";
+ args["param2"] = "abcd";
+ factory->expect_args(args);
+ logging::parse_formatter("Hello: %MyCustomAttr(param1=10,param2=abcd)%");
+ factory->check_called();
+ }
+ {
+ BOOST_TEST_CHECKPOINT("formatter 9");
+ test_formatter_factory::args_map args;
+ args["param1"] = "10";
+ args["param2"] = "abcd";
+ args["param_last"] = "-2.2";
+ factory->expect_args(args);
+ logging::parse_formatter("Hello: %MyCustomAttr(param1 = 10, param2 = \"abcd\", param_last = -2.2)%");
+ factory->check_called();
+ }
+}
+
+// Tests for invalid formatters
+BOOST_AUTO_TEST_CASE(invalid)
+{
+ BOOST_CHECK_THROW(logging::parse_formatter("%MyStr"), logging::parse_error);
+ BOOST_CHECK_THROW(logging::parse_formatter("MyStr%"), logging::parse_error);
+ BOOST_CHECK_THROW(logging::parse_formatter("%MyStr(%"), logging::parse_error);
+ BOOST_CHECK_THROW(logging::parse_formatter("%MyStr)%"), logging::parse_error);
+ BOOST_CHECK_THROW(logging::parse_formatter("%MyStr(param%"), logging::parse_error);
+ BOOST_CHECK_THROW(logging::parse_formatter("%MyStr(param=%"), logging::parse_error);
+ BOOST_CHECK_THROW(logging::parse_formatter("%MyStr(param)%"), logging::parse_error);
+ BOOST_CHECK_THROW(logging::parse_formatter("%MyStr(param=)%"), logging::parse_error);
+ BOOST_CHECK_THROW(logging::parse_formatter("%MyStr(=value)%"), logging::parse_error);
+ BOOST_CHECK_THROW(logging::parse_formatter("%MyStr(param,param2)%"), logging::parse_error);
+ BOOST_CHECK_THROW(logging::parse_formatter("%MyStr(param=value,)%"), logging::parse_error);
+ BOOST_CHECK_THROW(logging::parse_formatter("%MyStr(param=value,param2)%"), logging::parse_error);
+}
+
+#endif // !defined(BOOST_LOG_WITHOUT_SETTINGS_PARSERS) && !defined(BOOST_LOG_WITHOUT_DEFAULT_FACTORIES)

Copied: branches/release/libs/log/test/run/setup_settings_parser.cpp (from r85460, trunk/libs/log/test/run/setup_settings_parser.cpp)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ branches/release/libs/log/test/run/setup_settings_parser.cpp 2013-08-25 10:20:22 EDT (Sun, 25 Aug 2013) (r85461, copy of r85460, trunk/libs/log/test/run/setup_settings_parser.cpp)
@@ -0,0 +1,294 @@
+/*
+ * 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 setup_settings_parser.cpp
+ * \author Andrey Semashev
+ * \date 25.08.2013
+ *
+ * \brief This header contains tests for the settings parser.
+ */
+
+#define BOOST_TEST_MODULE setup_settings_parser
+
+#include <string>
+#include <sstream>
+#include <boost/test/unit_test.hpp>
+#include <boost/log/utility/setup/settings_parser.hpp>
+
+#if !defined(BOOST_LOG_WITHOUT_SETTINGS_PARSERS)
+
+#include <boost/log/exceptions.hpp>
+
+namespace logging = boost::log;
+
+typedef logging::basic_settings< char > settings;
+
+// Tests for single-level settings
+BOOST_AUTO_TEST_CASE(single_level)
+{
+ {
+ std::istringstream strm
+ (
+ "[Section1]\n"
+ "\n"
+ "Param1 = Value1\n"
+ "Param2 = \"hello, \\\"world\\\"\"\n"
+ "\n"
+ "[Section2]\n"
+ "\n"
+ "Param1 = 10\n"
+ "Param2 = -2.2\n"
+ );
+ settings s = logging::parse_settings(strm);
+
+ BOOST_CHECK(s.has_section("Section1"));
+ BOOST_CHECK(s.has_section("Section2"));
+ BOOST_CHECK(!s.has_section("Section3"));
+
+ BOOST_CHECK(s.has_parameter("Section1", "Param1"));
+ BOOST_CHECK(s.has_parameter("Section1", "Param2"));
+
+ BOOST_CHECK(s.has_parameter("Section2", "Param1"));
+ BOOST_CHECK(s.has_parameter("Section2", "Param2"));
+
+ BOOST_CHECK_EQUAL(s["Section1"]["Param1"].or_default(std::string()), "Value1");
+ BOOST_CHECK_EQUAL(s["Section1"]["Param2"].or_default(std::string()), "hello, \"world\"");
+
+ BOOST_CHECK_EQUAL(s["Section2"]["Param1"].or_default(std::string()), "10");
+ BOOST_CHECK_EQUAL(s["Section2"]["Param2"].or_default(std::string()), "-2.2");
+ }
+}
+
+// Tests for multi-level settings
+BOOST_AUTO_TEST_CASE(multi_level)
+{
+ {
+ std::istringstream strm
+ (
+ " [Section1]\n"
+ "\n"
+ "Param1 = Value1 \n"
+ "Param2=\"hello, \\\"world\\\"\" \n"
+ "\n"
+ "[Section1.Subsection2] \n"
+ "\n"
+ "Param1=10\n"
+ "Param2=-2.2\n"
+ );
+ settings s = logging::parse_settings(strm);
+
+ BOOST_CHECK(s.has_section("Section1"));
+ BOOST_CHECK(s.has_section("Section1.Subsection2"));
+ BOOST_CHECK(!s.has_section("Subsection2"));
+
+ BOOST_CHECK(s.has_parameter("Section1", "Param1"));
+ BOOST_CHECK(s.has_parameter("Section1", "Param2"));
+
+ BOOST_CHECK(s.has_parameter("Section1.Subsection2", "Param1"));
+ BOOST_CHECK(s.has_parameter("Section1.Subsection2", "Param2"));
+ BOOST_CHECK(!s.has_parameter("Subsection2", "Param1"));
+ BOOST_CHECK(!s.has_parameter("Subsection2", "Param2"));
+
+ BOOST_CHECK_EQUAL(s["Section1"]["Param1"].or_default(std::string()), "Value1");
+ BOOST_CHECK_EQUAL(s["Section1"]["Param2"].or_default(std::string()), "hello, \"world\"");
+
+ BOOST_CHECK_EQUAL(s["Section1.Subsection2"]["Param1"].or_default(std::string()), "10");
+ BOOST_CHECK_EQUAL(s["Section1.Subsection2"]["Param2"].or_default(std::string()), "-2.2");
+ }
+}
+
+// Tests for comments
+BOOST_AUTO_TEST_CASE(comments)
+{
+ {
+ std::istringstream strm
+ (
+ "# Some comment\n"
+ "[ Section1 ] # another comment\n"
+ "\n"
+ "Param1 = Value1 ### yet another comment \n"
+ "Param2=\"hello, \\\"world\\\"\" # comment after a quoted string\n"
+ "\n"
+ "[ Section2 ]\n"
+ "\n"
+ "Param1=10#comment after a number\n"
+ "Param2=-2.2#comment without a terminating newline"
+ "\n"
+ "#[Section3]\n"
+ "#\n"
+ "#Param1=10#comment after a number\n"
+ "#Param2=-2.2#comment without a terminating newline"
+ );
+ settings s = logging::parse_settings(strm);
+
+ BOOST_CHECK(s.has_section("Section1"));
+ BOOST_CHECK(s.has_section("Section2"));
+ BOOST_CHECK(!s.has_section("Section3"));
+
+ BOOST_CHECK(s.has_parameter("Section1", "Param1"));
+ BOOST_CHECK(s.has_parameter("Section1", "Param2"));
+
+ BOOST_CHECK(s.has_parameter("Section2", "Param1"));
+ BOOST_CHECK(s.has_parameter("Section2", "Param2"));
+
+ BOOST_CHECK_EQUAL(s["Section1"]["Param1"].or_default(std::string()), "Value1");
+ BOOST_CHECK_EQUAL(s["Section1"]["Param2"].or_default(std::string()), "hello, \"world\"");
+
+ BOOST_CHECK_EQUAL(s["Section2"]["Param1"].or_default(std::string()), "10");
+ BOOST_CHECK_EQUAL(s["Section2"]["Param2"].or_default(std::string()), "-2.2");
+ }
+}
+
+// Tests for invalid settings
+BOOST_AUTO_TEST_CASE(invalid)
+{
+ {
+ std::istringstream strm
+ (
+ "Param1 = Value1\n" // parameters outside sections
+ "Param2 = \"hello, \\\"world\\\"\"\n"
+ );
+ BOOST_CHECK_THROW(logging::parse_settings(strm), logging::parse_error);
+ }
+ {
+ std::istringstream strm
+ (
+ "[Section1\n" // missing closing brace
+ "\n"
+ "Param1 = Value1\n"
+ "Param2 = \"hello, \\\"world\\\"\"\n"
+ "\n"
+ "[Section2]\n"
+ "\n"
+ "Param1 = 10\n"
+ "Param2 = -2.2\n"
+ );
+ BOOST_CHECK_THROW(logging::parse_settings(strm), logging::parse_error);
+ }
+ {
+ std::istringstream strm
+ (
+ "Section1]\n" // missing opening brace
+ "\n"
+ "Param1 = Value1\n"
+ "Param2 = \"hello, \\\"world\\\"\"\n"
+ "\n"
+ "[Section2]\n"
+ "\n"
+ "Param1 = 10\n"
+ "Param2 = -2.2\n"
+ );
+ BOOST_CHECK_THROW(logging::parse_settings(strm), logging::parse_error);
+ }
+ {
+ std::istringstream strm
+ (
+ "[Section1=xyz]\n" // invalid characters in the section name
+ "\n"
+ "Param1 = Value1\n"
+ "Param2 = \"hello, \\\"world\\\"\"\n"
+ "\n"
+ "[Section2]\n"
+ "\n"
+ "Param1 = 10\n"
+ "Param2 = -2.2\n"
+ );
+ BOOST_CHECK_THROW(logging::parse_settings(strm), logging::parse_error);
+ }
+ {
+ std::istringstream strm
+ (
+ "[Section1# hello?]\n" // invalid characters in the section name
+ "\n"
+ "Param1 = Value1\n"
+ "Param2 = \"hello, \\\"world\\\"\"\n"
+ "\n"
+ "[Section2]\n"
+ "\n"
+ "Param1 = 10\n"
+ "Param2 = -2.2\n"
+ );
+ BOOST_CHECK_THROW(logging::parse_settings(strm), logging::parse_error);
+ }
+ {
+ std::istringstream strm
+ (
+ "(Section1)\n" // invalid braces
+ "\n"
+ "Param1 = Value1\n"
+ "Param2 = \"hello, \\\"world\\\"\"\n"
+ "\n"
+ "[Section2]\n"
+ "\n"
+ "Param1 = 10\n"
+ "Param2 = -2.2\n"
+ );
+ BOOST_CHECK_THROW(logging::parse_settings(strm), logging::parse_error);
+ }
+ {
+ std::istringstream strm
+ (
+ "[Section1]\n"
+ "\n"
+ "Param1 =\n" // no parameter value
+ "Param2 = \"hello, \\\"world\\\"\"\n"
+ "\n"
+ "[Section2]\n"
+ "\n"
+ "Param1 = 10\n"
+ "Param2 = -2.2\n"
+ );
+ BOOST_CHECK_THROW(logging::parse_settings(strm), logging::parse_error);
+ }
+ {
+ std::istringstream strm
+ (
+ "[Section1]\n"
+ "\n"
+ "Param1\n" // no parameter value
+ "Param2 = \"hello, \\\"world\\\"\"\n"
+ "\n"
+ "[Section2]\n"
+ "\n"
+ "Param1 = 10\n"
+ "Param2 = -2.2\n"
+ );
+ BOOST_CHECK_THROW(logging::parse_settings(strm), logging::parse_error);
+ }
+ {
+ std::istringstream strm
+ (
+ "[Section1]\n"
+ "\n"
+ "Param1 = Value1\n"
+ "Param2 = \"hello, \\\"world\\\"\n" // unterminated quote
+ "\n"
+ "[Section2]\n"
+ "\n"
+ "Param1 = 10\n"
+ "Param2 = -2.2\n"
+ );
+ BOOST_CHECK_THROW(logging::parse_settings(strm), logging::parse_error);
+ }
+ {
+ std::istringstream strm
+ (
+ "[Section1]\n"
+ "\n"
+ "Param1 = Value1 Value2\n" // multi-word value
+ "Param2 = \"hello, \\\"world\\\"\"\n"
+ "\n"
+ "[Section2]\n"
+ "\n"
+ "Param1 = 10\n"
+ "Param2 = -2.2\n"
+ );
+ BOOST_CHECK_THROW(logging::parse_settings(strm), logging::parse_error);
+ }
+}
+
+#endif // !defined(BOOST_LOG_WITHOUT_SETTINGS_PARSERS)

Next message: vicente.botet_at_[hidden]: "[Boost-commit] svn:boost r85462 - trunk/boost/thread"
Previous message: andrey.semashev_at_[hidden]: "[Boost-commit] svn:boost r85460 - trunk/libs/log/doc"

Date view	Thread view	Subject view	Author view

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