|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r85197 - in trunk: 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/doc libs/log/src
From: andrey.semashev_at_[hidden]
Date: 2013-08-03 07:08:33
Author: andysem
Date: 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013)
New Revision: 85197
URL: http://svn.boost.org/trac/boost/changeset/85197
Log:
Removed some duplication with Boost.Config.
Deleted:
trunk/boost/log/detail/alignas.hpp
trunk/boost/log/detail/intptr_t.hpp
Text files modified:
trunk/boost/log/attributes.hpp | 2
trunk/boost/log/attributes/attribute.hpp | 6 +-
trunk/boost/log/attributes/attribute_cast.hpp | 2
trunk/boost/log/attributes/attribute_name.hpp | 2
trunk/boost/log/attributes/attribute_set.hpp | 6 +-
trunk/boost/log/attributes/attribute_value.hpp | 4 +-
trunk/boost/log/attributes/attribute_value_impl.hpp | 2
trunk/boost/log/attributes/attribute_value_set.hpp | 6 +-
trunk/boost/log/attributes/clock.hpp | 4 +-
trunk/boost/log/attributes/constant.hpp | 4 +-
trunk/boost/log/attributes/counter.hpp | 4 +-
trunk/boost/log/attributes/current_process_id.hpp | 2
trunk/boost/log/attributes/current_process_name.hpp | 2
trunk/boost/log/attributes/current_thread_id.hpp | 4 +-
trunk/boost/log/attributes/fallback_policy.hpp | 2
trunk/boost/log/attributes/fallback_policy_fwd.hpp | 2
trunk/boost/log/attributes/function.hpp | 4 +-
trunk/boost/log/attributes/mutable_constant.hpp | 6 +-
trunk/boost/log/attributes/named_scope.hpp | 8 ++--
trunk/boost/log/attributes/scoped_attribute.hpp | 14 ++++----
trunk/boost/log/attributes/time_traits.hpp | 2
trunk/boost/log/attributes/timer.hpp | 4 +-
trunk/boost/log/attributes/value_extraction.hpp | 8 ++--
trunk/boost/log/attributes/value_extraction_fwd.hpp | 2
trunk/boost/log/attributes/value_visitation.hpp | 4 +-
trunk/boost/log/attributes/value_visitation_fwd.hpp | 2
trunk/boost/log/common.hpp | 2
trunk/boost/log/core.hpp | 2
trunk/boost/log/core/core.hpp | 10 +++---
trunk/boost/log/core/record.hpp | 2
trunk/boost/log/core/record_view.hpp | 8 ++--
/dev/null | 45 ----------------------------
trunk/boost/log/detail/asio_fwd.hpp | 2
trunk/boost/log/detail/attachable_sstream_buf.hpp | 6 +-
trunk/boost/log/detail/attr_output_impl.hpp | 10 +++---
trunk/boost/log/detail/attr_output_terminal.hpp | 4 +-
trunk/boost/log/detail/attribute_get_value_impl.hpp | 2
trunk/boost/log/detail/attribute_predicate.hpp | 2
trunk/boost/log/detail/cleanup_scope_guard.hpp | 6 +-
trunk/boost/log/detail/code_conversion.hpp | 2
trunk/boost/log/detail/config.hpp | 63 +-------------------------------------
trunk/boost/log/detail/custom_terminal_spec.hpp | 2
trunk/boost/log/detail/date_time_fmt_gen_traits_fwd.hpp | 2
trunk/boost/log/detail/date_time_format_parser.hpp | 2
trunk/boost/log/detail/decomposed_time.hpp | 10 +++---
trunk/boost/log/detail/deduce_char_type.hpp | 2
trunk/boost/log/detail/default_attribute_names.hpp | 2
trunk/boost/log/detail/embedded_string_type.hpp | 2
trunk/boost/log/detail/event.hpp | 2
trunk/boost/log/detail/fake_mutex.hpp | 8 ++--
trunk/boost/log/detail/format.hpp | 8 ++--
trunk/boost/log/detail/function_traits.hpp | 2
trunk/boost/log/detail/id.hpp | 2
/dev/null | 64 ----------------------------------------
trunk/boost/log/detail/light_function.hpp | 2
trunk/boost/log/detail/light_rw_mutex.hpp | 14 ++++----
trunk/boost/log/detail/locking_ptr.hpp | 2
trunk/boost/log/detail/locks.hpp | 2
trunk/boost/log/detail/malloc_aligned.hpp | 2
trunk/boost/log/detail/named_scope_fmt_pp.hpp | 6 +-
trunk/boost/log/detail/native_typeof.hpp | 2
trunk/boost/log/detail/parameter_tools.hpp | 2
trunk/boost/log/detail/pp_identity.hpp | 2
trunk/boost/log/detail/process_id.hpp | 2
trunk/boost/log/detail/setup_config.hpp | 2
trunk/boost/log/detail/singleton.hpp | 8 ++--
trunk/boost/log/detail/sink_init_helpers.hpp | 2
trunk/boost/log/detail/snprintf.hpp | 2
trunk/boost/log/detail/spin_mutex.hpp | 14 ++++----
trunk/boost/log/detail/tagged_integer.hpp | 2
trunk/boost/log/detail/thread_id.hpp | 2
trunk/boost/log/detail/thread_specific.hpp | 8 ++--
trunk/boost/log/detail/threadsafe_queue.hpp | 7 +--
trunk/boost/log/detail/timestamp.hpp | 2
trunk/boost/log/detail/trivial_keyword.hpp | 2
trunk/boost/log/detail/unary_function_terminal.hpp | 4 +-
trunk/boost/log/detail/unhandled_exception_count.hpp | 2
trunk/boost/log/detail/value_ref_visitation.hpp | 4 +-
trunk/boost/log/detail/visible_type.hpp | 4 +-
trunk/boost/log/exceptions.hpp | 4 +-
trunk/boost/log/expressions.hpp | 2
trunk/boost/log/expressions/attr.hpp | 8 ++--
trunk/boost/log/expressions/attr_fwd.hpp | 2
trunk/boost/log/expressions/filter.hpp | 2
trunk/boost/log/expressions/formatter.hpp | 2
trunk/boost/log/expressions/formatters.hpp | 2
trunk/boost/log/expressions/formatters/c_decorator.hpp | 10 +++---
trunk/boost/log/expressions/formatters/char_decorator.hpp | 16 +++++-----
trunk/boost/log/expressions/formatters/csv_decorator.hpp | 6 +-
trunk/boost/log/expressions/formatters/date_time.hpp | 18 +++++-----
trunk/boost/log/expressions/formatters/format.hpp | 8 ++--
trunk/boost/log/expressions/formatters/if.hpp | 16 +++++-----
trunk/boost/log/expressions/formatters/named_scope.hpp | 20 ++++++------
trunk/boost/log/expressions/formatters/stream.hpp | 2
trunk/boost/log/expressions/formatters/wrap_formatter.hpp | 10 +++---
trunk/boost/log/expressions/formatters/xml_decorator.hpp | 6 +-
trunk/boost/log/expressions/is_keyword_descriptor.hpp | 2
trunk/boost/log/expressions/keyword.hpp | 2
trunk/boost/log/expressions/keyword_fwd.hpp | 2
trunk/boost/log/expressions/message.hpp | 2
trunk/boost/log/expressions/predicates.hpp | 2
trunk/boost/log/expressions/predicates/begins_with.hpp | 8 ++--
trunk/boost/log/expressions/predicates/channel_severity_filter.hpp | 44 +++++++++++++-------------
trunk/boost/log/expressions/predicates/contains.hpp | 8 ++--
trunk/boost/log/expressions/predicates/ends_with.hpp | 8 ++--
trunk/boost/log/expressions/predicates/has_attr.hpp | 8 ++--
trunk/boost/log/expressions/predicates/is_debugger_present.hpp | 2
trunk/boost/log/expressions/predicates/is_in_range.hpp | 8 ++--
trunk/boost/log/expressions/predicates/matches.hpp | 8 ++--
trunk/boost/log/expressions/record.hpp | 2
trunk/boost/log/keywords/auto_flush.hpp | 2
trunk/boost/log/keywords/channel.hpp | 2
trunk/boost/log/keywords/delimiter.hpp | 2
trunk/boost/log/keywords/depth.hpp | 2
trunk/boost/log/keywords/facility.hpp | 2
trunk/boost/log/keywords/file_name.hpp | 2
trunk/boost/log/keywords/filter.hpp | 2
trunk/boost/log/keywords/format.hpp | 2
trunk/boost/log/keywords/ident.hpp | 2
trunk/boost/log/keywords/ip_version.hpp | 2
trunk/boost/log/keywords/iteration.hpp | 2
trunk/boost/log/keywords/log_name.hpp | 2
trunk/boost/log/keywords/log_source.hpp | 2
trunk/boost/log/keywords/max_size.hpp | 2
trunk/boost/log/keywords/message_file.hpp | 2
trunk/boost/log/keywords/min_free_space.hpp | 2
trunk/boost/log/keywords/open_mode.hpp | 2
trunk/boost/log/keywords/order.hpp | 2
trunk/boost/log/keywords/ordering_window.hpp | 2
trunk/boost/log/keywords/registration.hpp | 2
trunk/boost/log/keywords/rotation_size.hpp | 2
trunk/boost/log/keywords/scan_method.hpp | 2
trunk/boost/log/keywords/severity.hpp | 2
trunk/boost/log/keywords/start_thread.hpp | 2
trunk/boost/log/keywords/target.hpp | 2
trunk/boost/log/keywords/time_based_rotation.hpp | 2
trunk/boost/log/keywords/use_impl.hpp | 2
trunk/boost/log/sinks.hpp | 2
trunk/boost/log/sinks/async_frontend.hpp | 2
trunk/boost/log/sinks/attribute_mapping.hpp | 2
trunk/boost/log/sinks/basic_sink_backend.hpp | 8 ++--
trunk/boost/log/sinks/basic_sink_frontend.hpp | 2
trunk/boost/log/sinks/block_on_overflow.hpp | 2
trunk/boost/log/sinks/bounded_fifo_queue.hpp | 2
trunk/boost/log/sinks/bounded_ordering_queue.hpp | 2
trunk/boost/log/sinks/debug_output_backend.hpp | 2
trunk/boost/log/sinks/drop_on_overflow.hpp | 2
trunk/boost/log/sinks/event_log_backend.hpp | 2
trunk/boost/log/sinks/event_log_constants.hpp | 2
trunk/boost/log/sinks/frontend_requirements.hpp | 2
trunk/boost/log/sinks/sink.hpp | 6 +-
trunk/boost/log/sinks/sync_frontend.hpp | 2
trunk/boost/log/sinks/syslog_backend.hpp | 2
trunk/boost/log/sinks/syslog_constants.hpp | 2
trunk/boost/log/sinks/text_file_backend.hpp | 8 ++--
trunk/boost/log/sinks/text_multifile_backend.hpp | 2
trunk/boost/log/sinks/text_ostream_backend.hpp | 2
trunk/boost/log/sinks/unbounded_fifo_queue.hpp | 2
trunk/boost/log/sinks/unbounded_ordering_queue.hpp | 2
trunk/boost/log/sinks/unlocked_frontend.hpp | 2
trunk/boost/log/sources/basic_logger.hpp | 6 +-
trunk/boost/log/sources/channel_feature.hpp | 2
trunk/boost/log/sources/channel_logger.hpp | 2
trunk/boost/log/sources/exception_handler_feature.hpp | 2
trunk/boost/log/sources/features.hpp | 2
trunk/boost/log/sources/global_logger_storage.hpp | 12 +++---
trunk/boost/log/sources/logger.hpp | 2
trunk/boost/log/sources/record_ostream.hpp | 14 ++++----
trunk/boost/log/sources/severity_channel_logger.hpp | 2
trunk/boost/log/sources/severity_feature.hpp | 4 +-
trunk/boost/log/sources/severity_logger.hpp | 2
trunk/boost/log/sources/threading_models.hpp | 2
trunk/boost/log/support/date_time.hpp | 12 +++---
trunk/boost/log/support/exception.hpp | 2
trunk/boost/log/support/regex.hpp | 2
trunk/boost/log/support/spirit_classic.hpp | 2
trunk/boost/log/support/spirit_qi.hpp | 2
trunk/boost/log/support/xpressive.hpp | 2
trunk/boost/log/trivial.hpp | 2
trunk/boost/log/utility/empty_deleter.hpp | 2
trunk/boost/log/utility/exception_handler.hpp | 2
trunk/boost/log/utility/explicit_operator_bool.hpp | 8 ++--
trunk/boost/log/utility/formatting_ostream.hpp | 10 +++---
trunk/boost/log/utility/formatting_ostream_fwd.hpp | 2
trunk/boost/log/utility/functional.hpp | 2
trunk/boost/log/utility/functional/as_action.hpp | 6 +-
trunk/boost/log/utility/functional/begins_with.hpp | 2
trunk/boost/log/utility/functional/bind.hpp | 14 ++++----
trunk/boost/log/utility/functional/bind_assign.hpp | 4 +-
trunk/boost/log/utility/functional/bind_output.hpp | 4 +-
trunk/boost/log/utility/functional/bind_to_log.hpp | 6 +-
trunk/boost/log/utility/functional/contains.hpp | 2
trunk/boost/log/utility/functional/ends_with.hpp | 2
trunk/boost/log/utility/functional/fun_ref.hpp | 4 +-
trunk/boost/log/utility/functional/in_range.hpp | 2
trunk/boost/log/utility/functional/logical.hpp | 2
trunk/boost/log/utility/functional/matches.hpp | 2
trunk/boost/log/utility/functional/nop.hpp | 2
trunk/boost/log/utility/functional/save_result.hpp | 4 +-
trunk/boost/log/utility/intrusive_ref_counter.hpp | 2
trunk/boost/log/utility/manipulators.hpp | 2
trunk/boost/log/utility/manipulators/add_value.hpp | 2
trunk/boost/log/utility/manipulators/dump.hpp | 10 +++---
trunk/boost/log/utility/manipulators/to_log.hpp | 2
trunk/boost/log/utility/once_block.hpp | 10 +++---
trunk/boost/log/utility/record_ordering.hpp | 2
trunk/boost/log/utility/setup.hpp | 2
trunk/boost/log/utility/setup/common_attributes.hpp | 2
trunk/boost/log/utility/setup/console.hpp | 2
trunk/boost/log/utility/setup/file.hpp | 2
trunk/boost/log/utility/setup/filter_parser.hpp | 8 ++--
trunk/boost/log/utility/setup/formatter_parser.hpp | 8 ++--
trunk/boost/log/utility/setup/from_settings.hpp | 8 ++--
trunk/boost/log/utility/setup/from_stream.hpp | 2
trunk/boost/log/utility/setup/settings.hpp | 8 ++--
trunk/boost/log/utility/setup/settings_parser.hpp | 2
trunk/boost/log/utility/strictest_lock.hpp | 2
trunk/boost/log/utility/string_literal.hpp | 2
trunk/boost/log/utility/string_literal_fwd.hpp | 2
trunk/boost/log/utility/type_dispatch/date_time_types.hpp | 2
trunk/boost/log/utility/type_dispatch/dynamic_type_dispatcher.hpp | 2
trunk/boost/log/utility/type_dispatch/standard_types.hpp | 2
trunk/boost/log/utility/type_dispatch/static_type_dispatcher.hpp | 20 ++++++------
trunk/boost/log/utility/type_dispatch/type_dispatcher.hpp | 8 ++--
trunk/boost/log/utility/type_info_wrapper.hpp | 4 +-
trunk/boost/log/utility/unique_identifier_name.hpp | 2
trunk/boost/log/utility/unused_variable.hpp | 4 +-
trunk/boost/log/utility/value_ref.hpp | 6 +-
trunk/boost/log/utility/value_ref_fwd.hpp | 2
trunk/libs/log/doc/Jamfile.v2 | 8 ++--
trunk/libs/log/src/attribute_value_set.cpp | 4 +-
trunk/libs/log/src/core.cpp | 6 +-
trunk/libs/log/src/default_sink.hpp | 2
trunk/libs/log/src/dump_avx2.cpp | 11 +++---
trunk/libs/log/src/dump_ssse3.cpp | 7 +--
trunk/libs/log/src/filter_parser.cpp | 4 +-
trunk/libs/log/src/formatter_parser.cpp | 4 +-
trunk/libs/log/src/named_scope.cpp | 6 +-
trunk/libs/log/src/named_scope_format_parser.cpp | 2
trunk/libs/log/src/parser_utils.hpp | 2
trunk/libs/log/src/settings_parser.cpp | 4 +-
trunk/libs/log/src/spirit_encoding.hpp | 2
trunk/libs/log/src/stateless_allocator.hpp | 2
trunk/libs/log/src/threadsafe_queue.cpp | 7 +--
trunk/libs/log/src/timer.cpp | 4 +-
trunk/libs/log/src/timestamp.cpp | 19 +++++------
246 files changed, 526 insertions(+), 697 deletions(-)
Modified: trunk/boost/log/attributes.hpp
==============================================================================
--- trunk/boost/log/attributes.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/attributes.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/attributes/attribute.hpp
==============================================================================
--- trunk/boost/log/attributes/attribute.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/attributes/attribute.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/attributes/attribute_cast.hpp
==============================================================================
--- trunk/boost/log/attributes/attribute_cast.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/attributes/attribute_cast.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/attributes/attribute_name.hpp
==============================================================================
--- trunk/boost/log/attributes/attribute_name.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/attributes/attribute_name.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/attributes/attribute_set.hpp
==============================================================================
--- trunk/boost/log/attributes/attribute_set.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/attributes/attribute_set.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/attributes/attribute_value.hpp
==============================================================================
--- trunk/boost/log/attributes/attribute_value.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/attributes/attribute_value.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/attributes/attribute_value_impl.hpp
==============================================================================
--- trunk/boost/log/attributes/attribute_value_impl.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/attributes/attribute_value_impl.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/attributes/attribute_value_set.hpp
==============================================================================
--- trunk/boost/log/attributes/attribute_value_set.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/attributes/attribute_value_set.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/attributes/clock.hpp
==============================================================================
--- trunk/boost/log/attributes/clock.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/attributes/clock.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/attributes/constant.hpp
==============================================================================
--- trunk/boost/log/attributes/constant.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/attributes/constant.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/attributes/counter.hpp
==============================================================================
--- trunk/boost/log/attributes/counter.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/attributes/counter.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/attributes/current_process_id.hpp
==============================================================================
--- trunk/boost/log/attributes/current_process_id.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/attributes/current_process_id.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/attributes/current_process_name.hpp
==============================================================================
--- trunk/boost/log/attributes/current_process_name.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/attributes/current_process_name.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/attributes/current_thread_id.hpp
==============================================================================
--- trunk/boost/log/attributes/current_thread_id.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/attributes/current_thread_id.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/attributes/fallback_policy.hpp
==============================================================================
--- trunk/boost/log/attributes/fallback_policy.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/attributes/fallback_policy.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/attributes/fallback_policy_fwd.hpp
==============================================================================
--- trunk/boost/log/attributes/fallback_policy_fwd.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/attributes/fallback_policy_fwd.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/attributes/function.hpp
==============================================================================
--- trunk/boost/log/attributes/function.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/attributes/function.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/attributes/mutable_constant.hpp
==============================================================================
--- trunk/boost/log/attributes/mutable_constant.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/attributes/mutable_constant.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/attributes/named_scope.hpp
==============================================================================
--- trunk/boost/log/attributes/named_scope.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/attributes/named_scope.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/attributes/scoped_attribute.hpp
==============================================================================
--- trunk/boost/log/attributes/scoped_attribute.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/attributes/scoped_attribute.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/attributes/time_traits.hpp
==============================================================================
--- trunk/boost/log/attributes/time_traits.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/attributes/time_traits.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/attributes/timer.hpp
==============================================================================
--- trunk/boost/log/attributes/timer.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/attributes/timer.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/attributes/value_extraction.hpp
==============================================================================
--- trunk/boost/log/attributes/value_extraction.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/attributes/value_extraction.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/attributes/value_extraction_fwd.hpp
==============================================================================
--- trunk/boost/log/attributes/value_extraction_fwd.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/attributes/value_extraction_fwd.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/attributes/value_visitation.hpp
==============================================================================
--- trunk/boost/log/attributes/value_visitation.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/attributes/value_visitation.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/attributes/value_visitation_fwd.hpp
==============================================================================
--- trunk/boost/log/attributes/value_visitation_fwd.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/attributes/value_visitation_fwd.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/common.hpp
==============================================================================
--- trunk/boost/log/common.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/common.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/core.hpp
==============================================================================
--- trunk/boost/log/core.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/core.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/core/core.hpp
==============================================================================
--- trunk/boost/log/core/core.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/core/core.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/core/record.hpp
==============================================================================
--- trunk/boost/log/core/record.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/core/record.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/core/record_view.hpp
==============================================================================
--- trunk/boost/log/core/record_view.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/core/record_view.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/alignas.hpp
==============================================================================
--- trunk/boost/log/detail/alignas.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85196)
+++ /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: trunk/boost/log/detail/asio_fwd.hpp
==============================================================================
--- trunk/boost/log/detail/asio_fwd.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/asio_fwd.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/attachable_sstream_buf.hpp
==============================================================================
--- trunk/boost/log/detail/attachable_sstream_buf.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/attachable_sstream_buf.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/attr_output_impl.hpp
==============================================================================
--- trunk/boost/log/detail/attr_output_impl.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/attr_output_impl.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/attr_output_terminal.hpp
==============================================================================
--- trunk/boost/log/detail/attr_output_terminal.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/attr_output_terminal.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/attribute_get_value_impl.hpp
==============================================================================
--- trunk/boost/log/detail/attribute_get_value_impl.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/attribute_get_value_impl.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/attribute_predicate.hpp
==============================================================================
--- trunk/boost/log/detail/attribute_predicate.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/attribute_predicate.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/cleanup_scope_guard.hpp
==============================================================================
--- trunk/boost/log/detail/cleanup_scope_guard.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/cleanup_scope_guard.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/code_conversion.hpp
==============================================================================
--- trunk/boost/log/detail/code_conversion.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/code_conversion.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/config.hpp
==============================================================================
--- trunk/boost/log/detail/config.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/config.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/custom_terminal_spec.hpp
==============================================================================
--- trunk/boost/log/detail/custom_terminal_spec.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/custom_terminal_spec.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/date_time_fmt_gen_traits_fwd.hpp
==============================================================================
--- trunk/boost/log/detail/date_time_fmt_gen_traits_fwd.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/date_time_fmt_gen_traits_fwd.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/date_time_format_parser.hpp
==============================================================================
--- trunk/boost/log/detail/date_time_format_parser.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/date_time_format_parser.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/decomposed_time.hpp
==============================================================================
--- trunk/boost/log/detail/decomposed_time.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/decomposed_time.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/deduce_char_type.hpp
==============================================================================
--- trunk/boost/log/detail/deduce_char_type.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/deduce_char_type.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/default_attribute_names.hpp
==============================================================================
--- trunk/boost/log/detail/default_attribute_names.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/default_attribute_names.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/embedded_string_type.hpp
==============================================================================
--- trunk/boost/log/detail/embedded_string_type.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/embedded_string_type.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/event.hpp
==============================================================================
--- trunk/boost/log/detail/event.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/event.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -15,7 +15,7 @@
#include <boost/log/detail/config.hpp>
-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif
Modified: trunk/boost/log/detail/fake_mutex.hpp
==============================================================================
--- trunk/boost/log/detail/fake_mutex.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/fake_mutex.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/format.hpp
==============================================================================
--- trunk/boost/log/detail/format.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/format.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/function_traits.hpp
==============================================================================
--- trunk/boost/log/detail/function_traits.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/function_traits.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/id.hpp
==============================================================================
--- trunk/boost/log/detail/id.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/id.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/intptr_t.hpp
==============================================================================
--- trunk/boost/log/detail/intptr_t.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85196)
+++ /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: trunk/boost/log/detail/light_function.hpp
==============================================================================
--- trunk/boost/log/detail/light_function.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/light_function.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/light_rw_mutex.hpp
==============================================================================
--- trunk/boost/log/detail/light_rw_mutex.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/light_rw_mutex.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/locking_ptr.hpp
==============================================================================
--- trunk/boost/log/detail/locking_ptr.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/locking_ptr.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/locks.hpp
==============================================================================
--- trunk/boost/log/detail/locks.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/locks.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/malloc_aligned.hpp
==============================================================================
--- trunk/boost/log/detail/malloc_aligned.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/malloc_aligned.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/named_scope_fmt_pp.hpp
==============================================================================
--- trunk/boost/log/detail/named_scope_fmt_pp.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/named_scope_fmt_pp.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/native_typeof.hpp
==============================================================================
--- trunk/boost/log/detail/native_typeof.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/native_typeof.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/parameter_tools.hpp
==============================================================================
--- trunk/boost/log/detail/parameter_tools.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/parameter_tools.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/pp_identity.hpp
==============================================================================
--- trunk/boost/log/detail/pp_identity.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/pp_identity.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/process_id.hpp
==============================================================================
--- trunk/boost/log/detail/process_id.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/process_id.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/setup_config.hpp
==============================================================================
--- trunk/boost/log/detail/setup_config.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/setup_config.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/singleton.hpp
==============================================================================
--- trunk/boost/log/detail/singleton.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/singleton.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/sink_init_helpers.hpp
==============================================================================
--- trunk/boost/log/detail/sink_init_helpers.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/sink_init_helpers.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/snprintf.hpp
==============================================================================
--- trunk/boost/log/detail/snprintf.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/snprintf.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/spin_mutex.hpp
==============================================================================
--- trunk/boost/log/detail/spin_mutex.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/spin_mutex.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -18,7 +18,7 @@
#include <boost/log/detail/config.hpp>
-#ifdef BOOST_LOG_HAS_PRAGMA_ONCE
+#ifdef BOOST_HAS_PRAGMA_ONCE
#pragma once
#endif
@@ -154,8 +154,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
@@ -212,8 +212,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&))
};
#else // defined(_POSIX_SPIN_LOCKS)
@@ -247,8 +247,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&))
};
#endif // defined(_POSIX_SPIN_LOCKS)
Modified: trunk/boost/log/detail/tagged_integer.hpp
==============================================================================
--- trunk/boost/log/detail/tagged_integer.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/tagged_integer.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/thread_id.hpp
==============================================================================
--- trunk/boost/log/detail/thread_id.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/thread_id.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/thread_specific.hpp
==============================================================================
--- trunk/boost/log/detail/thread_specific.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/thread_specific.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/threadsafe_queue.hpp
==============================================================================
--- trunk/boost/log/detail/threadsafe_queue.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/threadsafe_queue.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/timestamp.hpp
==============================================================================
--- trunk/boost/log/detail/timestamp.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/timestamp.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/trivial_keyword.hpp
==============================================================================
--- trunk/boost/log/detail/trivial_keyword.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/trivial_keyword.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/unary_function_terminal.hpp
==============================================================================
--- trunk/boost/log/detail/unary_function_terminal.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/unary_function_terminal.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/unhandled_exception_count.hpp
==============================================================================
--- trunk/boost/log/detail/unhandled_exception_count.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/unhandled_exception_count.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/value_ref_visitation.hpp
==============================================================================
--- trunk/boost/log/detail/value_ref_visitation.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/value_ref_visitation.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/detail/visible_type.hpp
==============================================================================
--- trunk/boost/log/detail/visible_type.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/detail/visible_type.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/exceptions.hpp
==============================================================================
--- trunk/boost/log/exceptions.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/exceptions.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/expressions.hpp
==============================================================================
--- trunk/boost/log/expressions.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/expressions.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/expressions/attr.hpp
==============================================================================
--- trunk/boost/log/expressions/attr.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/expressions/attr.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/expressions/attr_fwd.hpp
==============================================================================
--- trunk/boost/log/expressions/attr_fwd.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/expressions/attr_fwd.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/expressions/filter.hpp
==============================================================================
--- trunk/boost/log/expressions/filter.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/expressions/filter.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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
Modified: trunk/boost/log/expressions/formatter.hpp
==============================================================================
--- trunk/boost/log/expressions/formatter.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/expressions/formatter.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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
Modified: trunk/boost/log/expressions/formatters.hpp
==============================================================================
--- trunk/boost/log/expressions/formatters.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/expressions/formatters.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/expressions/formatters/c_decorator.hpp
==============================================================================
--- trunk/boost/log/expressions/formatters/c_decorator.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/expressions/formatters/c_decorator.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/expressions/formatters/char_decorator.hpp
==============================================================================
--- trunk/boost/log/expressions/formatters/char_decorator.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/expressions/formatters/char_decorator.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/expressions/formatters/csv_decorator.hpp
==============================================================================
--- trunk/boost/log/expressions/formatters/csv_decorator.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/expressions/formatters/csv_decorator.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/expressions/formatters/date_time.hpp
==============================================================================
--- trunk/boost/log/expressions/formatters/date_time.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/expressions/formatters/date_time.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/expressions/formatters/format.hpp
==============================================================================
--- trunk/boost/log/expressions/formatters/format.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/expressions/formatters/format.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/expressions/formatters/if.hpp
==============================================================================
--- trunk/boost/log/expressions/formatters/if.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/expressions/formatters/if.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/expressions/formatters/named_scope.hpp
==============================================================================
--- trunk/boost/log/expressions/formatters/named_scope.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/expressions/formatters/named_scope.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/expressions/formatters/stream.hpp
==============================================================================
--- trunk/boost/log/expressions/formatters/stream.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/expressions/formatters/stream.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/expressions/formatters/wrap_formatter.hpp
==============================================================================
--- trunk/boost/log/expressions/formatters/wrap_formatter.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/expressions/formatters/wrap_formatter.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/expressions/formatters/xml_decorator.hpp
==============================================================================
--- trunk/boost/log/expressions/formatters/xml_decorator.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/expressions/formatters/xml_decorator.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/expressions/is_keyword_descriptor.hpp
==============================================================================
--- trunk/boost/log/expressions/is_keyword_descriptor.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/expressions/is_keyword_descriptor.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/expressions/keyword.hpp
==============================================================================
--- trunk/boost/log/expressions/keyword.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/expressions/keyword.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/expressions/keyword_fwd.hpp
==============================================================================
--- trunk/boost/log/expressions/keyword_fwd.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/expressions/keyword_fwd.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/expressions/message.hpp
==============================================================================
--- trunk/boost/log/expressions/message.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/expressions/message.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/expressions/predicates.hpp
==============================================================================
--- trunk/boost/log/expressions/predicates.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/expressions/predicates.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/expressions/predicates/begins_with.hpp
==============================================================================
--- trunk/boost/log/expressions/predicates/begins_with.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/expressions/predicates/begins_with.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/expressions/predicates/channel_severity_filter.hpp
==============================================================================
--- trunk/boost/log/expressions/predicates/channel_severity_filter.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/expressions/predicates/channel_severity_filter.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/expressions/predicates/contains.hpp
==============================================================================
--- trunk/boost/log/expressions/predicates/contains.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/expressions/predicates/contains.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/expressions/predicates/ends_with.hpp
==============================================================================
--- trunk/boost/log/expressions/predicates/ends_with.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/expressions/predicates/ends_with.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/expressions/predicates/has_attr.hpp
==============================================================================
--- trunk/boost/log/expressions/predicates/has_attr.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/expressions/predicates/has_attr.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/expressions/predicates/is_debugger_present.hpp
==============================================================================
--- trunk/boost/log/expressions/predicates/is_debugger_present.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/expressions/predicates/is_debugger_present.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/expressions/predicates/is_in_range.hpp
==============================================================================
--- trunk/boost/log/expressions/predicates/is_in_range.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/expressions/predicates/is_in_range.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/expressions/predicates/matches.hpp
==============================================================================
--- trunk/boost/log/expressions/predicates/matches.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/expressions/predicates/matches.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/expressions/record.hpp
==============================================================================
--- trunk/boost/log/expressions/record.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/expressions/record.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/keywords/auto_flush.hpp
==============================================================================
--- trunk/boost/log/keywords/auto_flush.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/keywords/auto_flush.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/keywords/channel.hpp
==============================================================================
--- trunk/boost/log/keywords/channel.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/keywords/channel.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/keywords/delimiter.hpp
==============================================================================
--- trunk/boost/log/keywords/delimiter.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/keywords/delimiter.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/keywords/depth.hpp
==============================================================================
--- trunk/boost/log/keywords/depth.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/keywords/depth.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/keywords/facility.hpp
==============================================================================
--- trunk/boost/log/keywords/facility.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/keywords/facility.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/keywords/file_name.hpp
==============================================================================
--- trunk/boost/log/keywords/file_name.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/keywords/file_name.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/keywords/filter.hpp
==============================================================================
--- trunk/boost/log/keywords/filter.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/keywords/filter.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/keywords/format.hpp
==============================================================================
--- trunk/boost/log/keywords/format.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/keywords/format.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/keywords/ident.hpp
==============================================================================
--- trunk/boost/log/keywords/ident.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/keywords/ident.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/keywords/ip_version.hpp
==============================================================================
--- trunk/boost/log/keywords/ip_version.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/keywords/ip_version.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/keywords/iteration.hpp
==============================================================================
--- trunk/boost/log/keywords/iteration.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/keywords/iteration.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/keywords/log_name.hpp
==============================================================================
--- trunk/boost/log/keywords/log_name.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/keywords/log_name.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/keywords/log_source.hpp
==============================================================================
--- trunk/boost/log/keywords/log_source.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/keywords/log_source.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/keywords/max_size.hpp
==============================================================================
--- trunk/boost/log/keywords/max_size.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/keywords/max_size.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/keywords/message_file.hpp
==============================================================================
--- trunk/boost/log/keywords/message_file.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/keywords/message_file.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/keywords/min_free_space.hpp
==============================================================================
--- trunk/boost/log/keywords/min_free_space.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/keywords/min_free_space.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/keywords/open_mode.hpp
==============================================================================
--- trunk/boost/log/keywords/open_mode.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/keywords/open_mode.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/keywords/order.hpp
==============================================================================
--- trunk/boost/log/keywords/order.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/keywords/order.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/keywords/ordering_window.hpp
==============================================================================
--- trunk/boost/log/keywords/ordering_window.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/keywords/ordering_window.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/keywords/registration.hpp
==============================================================================
--- trunk/boost/log/keywords/registration.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/keywords/registration.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/keywords/rotation_size.hpp
==============================================================================
--- trunk/boost/log/keywords/rotation_size.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/keywords/rotation_size.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/keywords/scan_method.hpp
==============================================================================
--- trunk/boost/log/keywords/scan_method.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/keywords/scan_method.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/keywords/severity.hpp
==============================================================================
--- trunk/boost/log/keywords/severity.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/keywords/severity.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/keywords/start_thread.hpp
==============================================================================
--- trunk/boost/log/keywords/start_thread.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/keywords/start_thread.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/keywords/target.hpp
==============================================================================
--- trunk/boost/log/keywords/target.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/keywords/target.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/keywords/time_based_rotation.hpp
==============================================================================
--- trunk/boost/log/keywords/time_based_rotation.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/keywords/time_based_rotation.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/keywords/use_impl.hpp
==============================================================================
--- trunk/boost/log/keywords/use_impl.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/keywords/use_impl.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/sinks.hpp
==============================================================================
--- trunk/boost/log/sinks.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/sinks.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/sinks/async_frontend.hpp
==============================================================================
--- trunk/boost/log/sinks/async_frontend.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/sinks/async_frontend.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/sinks/attribute_mapping.hpp
==============================================================================
--- trunk/boost/log/sinks/attribute_mapping.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/sinks/attribute_mapping.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/sinks/basic_sink_backend.hpp
==============================================================================
--- trunk/boost/log/sinks/basic_sink_backend.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/sinks/basic_sink_backend.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/sinks/basic_sink_frontend.hpp
==============================================================================
--- trunk/boost/log/sinks/basic_sink_frontend.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/sinks/basic_sink_frontend.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/sinks/block_on_overflow.hpp
==============================================================================
--- trunk/boost/log/sinks/block_on_overflow.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/sinks/block_on_overflow.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/sinks/bounded_fifo_queue.hpp
==============================================================================
--- trunk/boost/log/sinks/bounded_fifo_queue.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/sinks/bounded_fifo_queue.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/sinks/bounded_ordering_queue.hpp
==============================================================================
--- trunk/boost/log/sinks/bounded_ordering_queue.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/sinks/bounded_ordering_queue.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/sinks/debug_output_backend.hpp
==============================================================================
--- trunk/boost/log/sinks/debug_output_backend.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/sinks/debug_output_backend.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/sinks/drop_on_overflow.hpp
==============================================================================
--- trunk/boost/log/sinks/drop_on_overflow.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/sinks/drop_on_overflow.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/sinks/event_log_backend.hpp
==============================================================================
--- trunk/boost/log/sinks/event_log_backend.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/sinks/event_log_backend.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/sinks/event_log_constants.hpp
==============================================================================
--- trunk/boost/log/sinks/event_log_constants.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/sinks/event_log_constants.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/sinks/frontend_requirements.hpp
==============================================================================
--- trunk/boost/log/sinks/frontend_requirements.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/sinks/frontend_requirements.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/sinks/sink.hpp
==============================================================================
--- trunk/boost/log/sinks/sink.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/sinks/sink.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/sinks/sync_frontend.hpp
==============================================================================
--- trunk/boost/log/sinks/sync_frontend.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/sinks/sync_frontend.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/sinks/syslog_backend.hpp
==============================================================================
--- trunk/boost/log/sinks/syslog_backend.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/sinks/syslog_backend.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/sinks/syslog_constants.hpp
==============================================================================
--- trunk/boost/log/sinks/syslog_constants.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/sinks/syslog_constants.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/sinks/text_file_backend.hpp
==============================================================================
--- trunk/boost/log/sinks/text_file_backend.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/sinks/text_file_backend.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/sinks/text_multifile_backend.hpp
==============================================================================
--- trunk/boost/log/sinks/text_multifile_backend.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/sinks/text_multifile_backend.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/sinks/text_ostream_backend.hpp
==============================================================================
--- trunk/boost/log/sinks/text_ostream_backend.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/sinks/text_ostream_backend.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/sinks/unbounded_fifo_queue.hpp
==============================================================================
--- trunk/boost/log/sinks/unbounded_fifo_queue.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/sinks/unbounded_fifo_queue.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/sinks/unbounded_ordering_queue.hpp
==============================================================================
--- trunk/boost/log/sinks/unbounded_ordering_queue.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/sinks/unbounded_ordering_queue.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/sinks/unlocked_frontend.hpp
==============================================================================
--- trunk/boost/log/sinks/unlocked_frontend.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/sinks/unlocked_frontend.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/sources/basic_logger.hpp
==============================================================================
--- trunk/boost/log/sources/basic_logger.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/sources/basic_logger.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/sources/channel_feature.hpp
==============================================================================
--- trunk/boost/log/sources/channel_feature.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/sources/channel_feature.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/sources/channel_logger.hpp
==============================================================================
--- trunk/boost/log/sources/channel_logger.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/sources/channel_logger.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/sources/exception_handler_feature.hpp
==============================================================================
--- trunk/boost/log/sources/exception_handler_feature.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/sources/exception_handler_feature.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/sources/features.hpp
==============================================================================
--- trunk/boost/log/sources/features.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/sources/features.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/sources/global_logger_storage.hpp
==============================================================================
--- trunk/boost/log/sources/global_logger_storage.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/sources/global_logger_storage.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/sources/logger.hpp
==============================================================================
--- trunk/boost/log/sources/logger.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/sources/logger.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/sources/record_ostream.hpp
==============================================================================
--- trunk/boost/log/sources/record_ostream.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/sources/record_ostream.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/sources/severity_channel_logger.hpp
==============================================================================
--- trunk/boost/log/sources/severity_channel_logger.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/sources/severity_channel_logger.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/sources/severity_feature.hpp
==============================================================================
--- trunk/boost/log/sources/severity_feature.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/sources/severity_feature.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/sources/severity_logger.hpp
==============================================================================
--- trunk/boost/log/sources/severity_logger.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/sources/severity_logger.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/sources/threading_models.hpp
==============================================================================
--- trunk/boost/log/sources/threading_models.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/sources/threading_models.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/support/date_time.hpp
==============================================================================
--- trunk/boost/log/support/date_time.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/support/date_time.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/support/exception.hpp
==============================================================================
--- trunk/boost/log/support/exception.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/support/exception.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/support/regex.hpp
==============================================================================
--- trunk/boost/log/support/regex.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/support/regex.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/support/spirit_classic.hpp
==============================================================================
--- trunk/boost/log/support/spirit_classic.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/support/spirit_classic.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/support/spirit_qi.hpp
==============================================================================
--- trunk/boost/log/support/spirit_qi.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/support/spirit_qi.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/support/xpressive.hpp
==============================================================================
--- trunk/boost/log/support/xpressive.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/support/xpressive.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/trivial.hpp
==============================================================================
--- trunk/boost/log/trivial.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/trivial.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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
Modified: trunk/boost/log/utility/empty_deleter.hpp
==============================================================================
--- trunk/boost/log/utility/empty_deleter.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/empty_deleter.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/exception_handler.hpp
==============================================================================
--- trunk/boost/log/utility/exception_handler.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/exception_handler.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/explicit_operator_bool.hpp
==============================================================================
--- trunk/boost/log/utility/explicit_operator_bool.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/explicit_operator_bool.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/formatting_ostream.hpp
==============================================================================
--- trunk/boost/log/utility/formatting_ostream.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/formatting_ostream.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/formatting_ostream_fwd.hpp
==============================================================================
--- trunk/boost/log/utility/formatting_ostream_fwd.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/formatting_ostream_fwd.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/functional.hpp
==============================================================================
--- trunk/boost/log/utility/functional.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/functional.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/functional/as_action.hpp
==============================================================================
--- trunk/boost/log/utility/functional/as_action.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/functional/as_action.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/functional/begins_with.hpp
==============================================================================
--- trunk/boost/log/utility/functional/begins_with.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/functional/begins_with.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/functional/bind.hpp
==============================================================================
--- trunk/boost/log/utility/functional/bind.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/functional/bind.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/functional/bind_assign.hpp
==============================================================================
--- trunk/boost/log/utility/functional/bind_assign.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/functional/bind_assign.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/functional/bind_output.hpp
==============================================================================
--- trunk/boost/log/utility/functional/bind_output.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/functional/bind_output.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/functional/bind_to_log.hpp
==============================================================================
--- trunk/boost/log/utility/functional/bind_to_log.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/functional/bind_to_log.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/functional/contains.hpp
==============================================================================
--- trunk/boost/log/utility/functional/contains.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/functional/contains.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/functional/ends_with.hpp
==============================================================================
--- trunk/boost/log/utility/functional/ends_with.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/functional/ends_with.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/functional/fun_ref.hpp
==============================================================================
--- trunk/boost/log/utility/functional/fun_ref.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/functional/fun_ref.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/functional/in_range.hpp
==============================================================================
--- trunk/boost/log/utility/functional/in_range.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/functional/in_range.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/functional/logical.hpp
==============================================================================
--- trunk/boost/log/utility/functional/logical.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/functional/logical.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/functional/matches.hpp
==============================================================================
--- trunk/boost/log/utility/functional/matches.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/functional/matches.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/functional/nop.hpp
==============================================================================
--- trunk/boost/log/utility/functional/nop.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/functional/nop.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/functional/save_result.hpp
==============================================================================
--- trunk/boost/log/utility/functional/save_result.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/functional/save_result.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/intrusive_ref_counter.hpp
==============================================================================
--- trunk/boost/log/utility/intrusive_ref_counter.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/intrusive_ref_counter.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/manipulators.hpp
==============================================================================
--- trunk/boost/log/utility/manipulators.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/manipulators.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/manipulators/add_value.hpp
==============================================================================
--- trunk/boost/log/utility/manipulators/add_value.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/manipulators/add_value.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/manipulators/dump.hpp
==============================================================================
--- trunk/boost/log/utility/manipulators/dump.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/manipulators/dump.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/manipulators/to_log.hpp
==============================================================================
--- trunk/boost/log/utility/manipulators/to_log.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/manipulators/to_log.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/once_block.hpp
==============================================================================
--- trunk/boost/log/utility/once_block.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/once_block.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/record_ordering.hpp
==============================================================================
--- trunk/boost/log/utility/record_ordering.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/record_ordering.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/setup.hpp
==============================================================================
--- trunk/boost/log/utility/setup.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/setup.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/setup/common_attributes.hpp
==============================================================================
--- trunk/boost/log/utility/setup/common_attributes.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/setup/common_attributes.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/setup/console.hpp
==============================================================================
--- trunk/boost/log/utility/setup/console.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/setup/console.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/setup/file.hpp
==============================================================================
--- trunk/boost/log/utility/setup/file.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/setup/file.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/setup/filter_parser.hpp
==============================================================================
--- trunk/boost/log/utility/setup/filter_parser.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/setup/filter_parser.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/setup/formatter_parser.hpp
==============================================================================
--- trunk/boost/log/utility/setup/formatter_parser.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/setup/formatter_parser.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/setup/from_settings.hpp
==============================================================================
--- trunk/boost/log/utility/setup/from_settings.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/setup/from_settings.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/setup/from_stream.hpp
==============================================================================
--- trunk/boost/log/utility/setup/from_stream.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/setup/from_stream.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/setup/settings.hpp
==============================================================================
--- trunk/boost/log/utility/setup/settings.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/setup/settings.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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) {}
Modified: trunk/boost/log/utility/setup/settings_parser.hpp
==============================================================================
--- trunk/boost/log/utility/setup/settings_parser.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/setup/settings_parser.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/strictest_lock.hpp
==============================================================================
--- trunk/boost/log/utility/strictest_lock.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/strictest_lock.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/string_literal.hpp
==============================================================================
--- trunk/boost/log/utility/string_literal.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/string_literal.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/string_literal_fwd.hpp
==============================================================================
--- trunk/boost/log/utility/string_literal_fwd.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/string_literal_fwd.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/type_dispatch/date_time_types.hpp
==============================================================================
--- trunk/boost/log/utility/type_dispatch/date_time_types.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/type_dispatch/date_time_types.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/type_dispatch/dynamic_type_dispatcher.hpp
==============================================================================
--- trunk/boost/log/utility/type_dispatch/dynamic_type_dispatcher.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/type_dispatch/dynamic_type_dispatcher.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/type_dispatch/standard_types.hpp
==============================================================================
--- trunk/boost/log/utility/type_dispatch/standard_types.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/type_dispatch/standard_types.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/type_dispatch/static_type_dispatcher.hpp
==============================================================================
--- trunk/boost/log/utility/type_dispatch/static_type_dispatcher.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/type_dispatch/static_type_dispatcher.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/type_dispatch/type_dispatcher.hpp
==============================================================================
--- trunk/boost/log/utility/type_dispatch/type_dispatcher.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/type_dispatch/type_dispatcher.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/type_info_wrapper.hpp
==============================================================================
--- trunk/boost/log/utility/type_info_wrapper.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/type_info_wrapper.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/unique_identifier_name.hpp
==============================================================================
--- trunk/boost/log/utility/unique_identifier_name.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/unique_identifier_name.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/unused_variable.hpp
==============================================================================
--- trunk/boost/log/utility/unused_variable.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/unused_variable.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/value_ref.hpp
==============================================================================
--- trunk/boost/log/utility/value_ref.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/value_ref.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/boost/log/utility/value_ref_fwd.hpp
==============================================================================
--- trunk/boost/log/utility/value_ref_fwd.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/boost/log/utility/value_ref_fwd.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/libs/log/doc/Jamfile.v2
==============================================================================
--- trunk/libs/log/doc/Jamfile.v2 Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/libs/log/doc/Jamfile.v2 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/libs/log/src/attribute_value_set.cpp
==============================================================================
--- trunk/libs/log/src/attribute_value_set.cpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/libs/log/src/attribute_value_set.cpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/libs/log/src/core.cpp
==============================================================================
--- trunk/libs/log/src/core.cpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/libs/log/src/core.cpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/libs/log/src/default_sink.hpp
==============================================================================
--- trunk/libs/log/src/default_sink.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/libs/log/src/default_sink.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/libs/log/src/dump_avx2.cpp
==============================================================================
--- trunk/libs/log/src/dump_avx2.cpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/libs/log/src/dump_avx2.cpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/libs/log/src/dump_ssse3.cpp
==============================================================================
--- trunk/libs/log/src/dump_ssse3.cpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/libs/log/src/dump_ssse3.cpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/libs/log/src/filter_parser.cpp
==============================================================================
--- trunk/libs/log/src/filter_parser.cpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/libs/log/src/filter_parser.cpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -401,8 +401,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_grammar(filter_grammar const&))
+ BOOST_DELETED_FUNCTION(filter_grammar& operator= (filter_grammar const&))
};
} // namespace
Modified: trunk/libs/log/src/formatter_parser.cpp
==============================================================================
--- trunk/libs/log/src/formatter_parser.cpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/libs/log/src/formatter_parser.cpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -369,8 +369,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_grammar(formatter_grammar const&))
+ BOOST_DELETED_FUNCTION(formatter_grammar& operator= (formatter_grammar const&))
};
} // namespace
Modified: trunk/libs/log/src/named_scope.cpp
==============================================================================
--- trunk/libs/log/src/named_scope.cpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/libs/log/src/named_scope.cpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/libs/log/src/named_scope_format_parser.cpp
==============================================================================
--- trunk/libs/log/src/named_scope_format_parser.cpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/libs/log/src/named_scope_format_parser.cpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/libs/log/src/parser_utils.hpp
==============================================================================
--- trunk/libs/log/src/parser_utils.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/libs/log/src/parser_utils.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/libs/log/src/settings_parser.cpp
==============================================================================
--- trunk/libs/log/src/settings_parser.cpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/libs/log/src/settings_parser.cpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -184,8 +184,8 @@
}
// 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_grammar(settings_grammar const&))
+ BOOST_DELETED_FUNCTION(settings_grammar& operator= (settings_grammar const&))
};
} // namespace
Modified: trunk/libs/log/src/spirit_encoding.hpp
==============================================================================
--- trunk/libs/log/src/spirit_encoding.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/libs/log/src/spirit_encoding.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/libs/log/src/stateless_allocator.hpp
==============================================================================
--- trunk/libs/log/src/stateless_allocator.hpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/libs/log/src/stateless_allocator.hpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/libs/log/src/threadsafe_queue.cpp
==============================================================================
--- trunk/libs/log/src/threadsafe_queue.cpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/libs/log/src/threadsafe_queue.cpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -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: trunk/libs/log/src/timer.cpp
==============================================================================
--- trunk/libs/log/src/timer.cpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/libs/log/src/timer.cpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -36,7 +36,7 @@
namespace attributes {
//! Factory implementation
-class BOOST_LOG_VISIBLE timer::impl :
+class BOOST_SYMBOL_VISIBLE timer::impl :
public attribute::impl
{
private:
@@ -138,7 +138,7 @@
namespace attributes {
//! Factory implementation
-class BOOST_LOG_VISIBLE timer::impl :
+class BOOST_SYMBOL_VISIBLE timer::impl :
public attribute::impl
{
public:
Modified: trunk/libs/log/src/timestamp.cpp
==============================================================================
--- trunk/libs/log/src/timestamp.cpp Sat Aug 3 05:08:32 2013 (r85196)
+++ trunk/libs/log/src/timestamp.cpp 2013-08-03 07:08:32 EDT (Sat, 03 Aug 2013) (r85197)
@@ -16,7 +16,6 @@
#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
{
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