|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r83978 - in trunk: boost/log/attributes boost/log/detail boost/log/expressions boost/log/expressions/predicates boost/log/sources boost/log/utility boost/log/utility/functional libs/log/src
From: andrey.semashev_at_[hidden]
Date: 2013-04-20 07:42:29
Author: andysem
Date: 2013-04-20 07:42:26 EDT (Sat, 20 Apr 2013)
New Revision: 83978
URL: http://svn.boost.org/trac/boost/changeset/83978
Log:
Removed deprecated macros usage.
Text files modified:
trunk/boost/log/attributes/attribute_value.hpp | 4 ++--
trunk/boost/log/attributes/attribute_value_impl.hpp | 4 ++--
trunk/boost/log/detail/code_conversion.hpp | 4 ++--
trunk/boost/log/detail/config.hpp | 2 +-
trunk/boost/log/detail/deduce_char_type.hpp | 2 +-
trunk/boost/log/detail/embedded_string_type.hpp | 4 ++--
trunk/boost/log/detail/generate_overloads.hpp | 4 ++--
trunk/boost/log/detail/light_function.hpp | 38 +++++++++++++++++++-------------------
trunk/boost/log/detail/light_function_pp.hpp | 32 ++++++++++++++++----------------
trunk/boost/log/detail/native_typeof.hpp | 6 +++---
trunk/boost/log/expressions/filter.hpp | 4 ++--
trunk/boost/log/expressions/formatter.hpp | 4 ++--
trunk/boost/log/expressions/predicates/begins_with.hpp | 6 +++---
trunk/boost/log/expressions/predicates/contains.hpp | 6 +++---
trunk/boost/log/expressions/predicates/ends_with.hpp | 6 +++---
trunk/boost/log/expressions/predicates/is_in_range.hpp | 6 +++---
trunk/boost/log/expressions/predicates/matches.hpp | 6 +++---
trunk/boost/log/sources/features.hpp | 4 ++--
trunk/boost/log/utility/explicit_operator_bool.hpp | 2 +-
trunk/boost/log/utility/functional/nop.hpp | 2 +-
trunk/boost/log/utility/value_ref.hpp | 2 +-
trunk/libs/log/src/code_conversion.cpp | 4 ++--
trunk/libs/log/src/formatter_parser.cpp | 2 +-
trunk/libs/log/src/named_scope_format_parser.cpp | 2 +-
trunk/libs/log/src/stateless_allocator.hpp | 2 +-
25 files changed, 79 insertions(+), 79 deletions(-)
Modified: trunk/boost/log/attributes/attribute_value.hpp
==============================================================================
--- trunk/boost/log/attributes/attribute_value.hpp (original)
+++ trunk/boost/log/attributes/attribute_value.hpp 2013-04-20 07:42:26 EDT (Sat, 20 Apr 2013)
@@ -271,7 +271,7 @@
template< typename T, typename TagT BOOST_LOG_AUX_VOID_DEFAULT, typename DefaultT >
typename result_of::extract_or_default< T, DefaultT, TagT >::type extract_or_default(DefaultT const& def_value) const;
-#if defined(BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS) || defined(BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS)
+#if defined(BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS)
/*!
* The method attempts to extract the stored value, assuming the value has the specified type.
* One can specify either a single type or a MPL type sequence, in which case the stored value
@@ -331,7 +331,7 @@
*/
template< typename T, typename DefaultT >
typename result_of::extract_or_default< T, DefaultT >::type extract_or_default(DefaultT const& def_value) const;
-#endif // defined(BOOST_NO_FUNCTION_TEMPLATE_DEFAULT_ARGS) || defined(BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS)
+#endif // defined(BOOST_NO_CXX11_FUNCTION_TEMPLATE_DEFAULT_ARGS)
#undef BOOST_LOG_AUX_VOID_DEFAULT
Modified: trunk/boost/log/attributes/attribute_value_impl.hpp
==============================================================================
--- trunk/boost/log/attributes/attribute_value_impl.hpp (original)
+++ trunk/boost/log/attributes/attribute_value_impl.hpp 2013-04-20 07:42:26 EDT (Sat, 20 Apr 2013)
@@ -21,7 +21,7 @@
#include <boost/log/detail/config.hpp>
#include <boost/log/attributes/attribute_value.hpp>
#include <boost/log/utility/type_dispatch/type_dispatcher.hpp>
-#if !defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
#include <boost/type_traits/remove_reference.hpp>
#endif
#include <boost/log/detail/header.hpp>
@@ -107,7 +107,7 @@
return attribute_value(new attribute_value_impl< value_type >(boost::forward< T >(v)));
}
-#else // !defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+#else // !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
template< typename T >
inline attribute_value make_attribute_value(T const& v)
Modified: trunk/boost/log/detail/code_conversion.hpp
==============================================================================
--- trunk/boost/log/detail/code_conversion.hpp (original)
+++ trunk/boost/log/detail/code_conversion.hpp 2013-04-20 07:42:26 EDT (Sat, 20 Apr 2013)
@@ -35,13 +35,13 @@
BOOST_LOG_API void code_convert(const wchar_t* str1, std::size_t len, std::string& str2, std::locale const& loc = std::locale());
//! The function converts one string to the character type of another
BOOST_LOG_API void code_convert(const char* str1, std::size_t len, std::wstring& str2, std::locale const& loc = std::locale());
-#if !defined(BOOST_NO_CHAR16_T) && !defined(BOOST_NO_CXX11_CHAR16_T)
+#if !defined(BOOST_NO_CXX11_CHAR16_T)
//! The function converts one string to the character type of another
BOOST_LOG_API void code_convert(const char16_t* str1, std::size_t len, std::string& str2, std::locale const& loc = std::locale());
//! The function converts one string to the character type of another
BOOST_LOG_API void code_convert(const char* str1, std::size_t len, std::u16string& str2, std::locale const& loc = std::locale());
#endif
-#if !defined(BOOST_NO_CHAR32_T) && !defined(BOOST_NO_CXX11_CHAR32_T)
+#if !defined(BOOST_NO_CXX11_CHAR32_T)
//! The function converts one string to the character type of another
BOOST_LOG_API void code_convert(const char32_t* str1, std::size_t len, std::string& str2, std::locale const& loc = std::locale());
//! The function converts one string to the character type of another
Modified: trunk/boost/log/detail/config.hpp
==============================================================================
--- trunk/boost/log/detail/config.hpp (original)
+++ trunk/boost/log/detail/config.hpp 2013-04-20 07:42:26 EDT (Sat, 20 Apr 2013)
@@ -131,7 +131,7 @@
# endif
#endif
-#if defined(BOOST_NO_VARIADIC_TEMPLATES) || defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES) || (defined(__GNUC__) && (__GNUC__ == 4 && __GNUC_MINOR__ <= 6))
+#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
Modified: trunk/boost/log/detail/deduce_char_type.hpp
==============================================================================
--- trunk/boost/log/detail/deduce_char_type.hpp (original)
+++ trunk/boost/log/detail/deduce_char_type.hpp 2013-04-20 07:42:26 EDT (Sat, 20 Apr 2013)
@@ -87,7 +87,7 @@
{
};
-#if !defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
template< typename T >
struct deduce_char_type< T&& > :
Modified: trunk/boost/log/detail/embedded_string_type.hpp
==============================================================================
--- trunk/boost/log/detail/embedded_string_type.hpp (original)
+++ trunk/boost/log/detail/embedded_string_type.hpp 2013-04-20 07:42:26 EDT (Sat, 20 Apr 2013)
@@ -61,7 +61,7 @@
typedef std::basic_string< wchar_t > type;
};
-#if !defined(BOOST_NO_CHAR16_T) && !defined(BOOST_NO_CXX11_CHAR16_T)
+#if !defined(BOOST_NO_CXX11_CHAR16_T)
template< typename ArgT >
struct make_embedded_string_type_impl< char16_t, ArgT >
{
@@ -75,7 +75,7 @@
};
#endif
-#if !defined(BOOST_NO_CHAR32_T) && !defined(BOOST_NO_CXX11_CHAR32_T)
+#if !defined(BOOST_NO_CXX11_CHAR32_T)
template< typename ArgT >
struct make_embedded_string_type_impl< char32_t, ArgT >
{
Modified: trunk/boost/log/detail/generate_overloads.hpp
==============================================================================
--- trunk/boost/log/detail/generate_overloads.hpp (original)
+++ trunk/boost/log/detail/generate_overloads.hpp 2013-04-20 07:42:26 EDT (Sat, 20 Apr 2013)
@@ -10,7 +10,7 @@
BOOST_LOG_AUX_OVERLOAD(const&, &)
BOOST_LOG_AUX_OVERLOAD(&, &)
-#if !defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
BOOST_LOG_AUX_OVERLOAD(const&&, const&&)
BOOST_LOG_AUX_OVERLOAD(&&, const&&)
@@ -27,4 +27,4 @@
BOOST_LOG_AUX_OVERLOAD(const&, &&)
BOOST_LOG_AUX_OVERLOAD(&, &&)
-#endif // !defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+#endif // !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
Modified: trunk/boost/log/detail/light_function.hpp
==============================================================================
--- trunk/boost/log/detail/light_function.hpp (original)
+++ trunk/boost/log/detail/light_function.hpp 2013-04-20 07:42:26 EDT (Sat, 20 Apr 2013)
@@ -25,21 +25,21 @@
#include <boost/log/detail/config.hpp>
#include <boost/log/utility/explicit_operator_bool.hpp>
#include <boost/type_traits/remove_cv.hpp>
-#if defined(BOOST_NO_VARIADIC_TEMPLATES) || defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+#if defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
#include <boost/preprocessor/iteration/iterate.hpp>
#include <boost/preprocessor/repetition/enum_params.hpp>
#include <boost/preprocessor/repetition/enum_binary_params.hpp>
#include <boost/preprocessor/repetition/enum_trailing_params.hpp>
#include <boost/preprocessor/repetition/enum_trailing_binary_params.hpp>
#endif
-#if defined(BOOST_NO_RVALUE_REFERENCES) || defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+#if defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
#include <boost/utility/enable_if.hpp>
#include <boost/type_traits/is_same.hpp>
#include <boost/mpl/or.hpp>
#else
#include <boost/type_traits/remove_reference.hpp>
#endif
-#if defined(BOOST_NO_NULLPTR) || defined(BOOST_NO_CXX11_NULLPTR)
+#if defined(BOOST_NO_CXX11_NULLPTR)
#include <boost/assert.hpp>
#endif
#include <boost/log/detail/header.hpp>
@@ -61,7 +61,7 @@
template< typename SignatureT >
class light_function;
-#if !defined(BOOST_NO_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
template< typename ResultT, typename... ArgsT >
class light_function< ResultT (ArgsT...) >
@@ -111,13 +111,13 @@
{
}
-#if !defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
explicit impl(FunT&& fun) :
impl_base(&this_type::invoke_impl, &this_type::clone_impl, &this_type::destroy_impl),
m_Function(fun)
{
}
-#endif // !defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+#endif // !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
static void destroy_impl(impl_base* self)
{
@@ -160,7 +160,7 @@
((this_type&)that).m_pImpl = NULL;
}
-#if !defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
template< typename FunT >
light_function(FunT&& fun) :
m_pImpl(new impl< typename remove_cv< typename remove_reference< FunT >::type >::type >(boost::forward< FunT >(fun)))
@@ -180,14 +180,14 @@
#endif
//! Constructor from NULL
-#if !defined(BOOST_NO_NULLPTR) && !defined(BOOST_NO_CXX11_NULLPTR)
+#if !defined(BOOST_NO_CXX11_NULLPTR)
BOOST_CONSTEXPR light_function(std::nullptr_t) BOOST_NOEXCEPT
#else
BOOST_CONSTEXPR light_function(int p) BOOST_NOEXCEPT
#endif
: m_pImpl(NULL)
{
-#if defined(BOOST_NO_NULLPTR) || defined(BOOST_NO_CXX11_NULLPTR)
+#if defined(BOOST_NO_CXX11_NULLPTR)
BOOST_ASSERT(p == 0);
#endif
}
@@ -208,19 +208,19 @@
return *this;
}
//! Assignment of NULL
-#if !defined(BOOST_NO_NULLPTR) && !defined(BOOST_NO_CXX11_NULLPTR)
+#if !defined(BOOST_NO_CXX11_NULLPTR)
light_function& operator= (std::nullptr_t)
#else
light_function& operator= (int p)
#endif
{
-#if defined(BOOST_NO_NULLPTR) || defined(BOOST_NO_CXX11_NULLPTR)
+#if defined(BOOST_NO_CXX11_NULLPTR)
BOOST_ASSERT(p == 0);
#endif
clear();
return *this;
}
-#if !defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
template< typename FunT >
light_function& operator= (FunT&& fun)
{
@@ -312,13 +312,13 @@
{
}
-#if !defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
explicit impl(FunT&& fun) :
impl_base(&this_type::invoke_impl, &this_type::clone_impl, &this_type::destroy_impl),
m_Function(fun)
{
}
-#endif // !defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+#endif // !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
static void destroy_impl(impl_base* self)
{
@@ -380,14 +380,14 @@
#endif
//! Constructor from NULL
-#if !defined(BOOST_NO_NULLPTR) && !defined(BOOST_NO_CXX11_NULLPTR)
+#if !defined(BOOST_NO_CXX11_NULLPTR)
BOOST_CONSTEXPR light_function(std::nullptr_t) BOOST_NOEXCEPT
#else
BOOST_CONSTEXPR light_function(int p) BOOST_NOEXCEPT
#endif
: m_pImpl(NULL)
{
-#if defined(BOOST_NO_NULLPTR) || defined(BOOST_NO_CXX11_NULLPTR)
+#if defined(BOOST_NO_CXX11_NULLPTR)
BOOST_ASSERT(p == 0);
#endif
}
@@ -408,19 +408,19 @@
return *this;
}
//! Assignment of NULL
-#if !defined(BOOST_NO_NULLPTR) && !defined(BOOST_NO_CXX11_NULLPTR)
+#if !defined(BOOST_NO_CXX11_NULLPTR)
light_function& operator= (std::nullptr_t)
#else
light_function& operator= (int p)
#endif
{
-#if defined(BOOST_NO_NULLPTR) || defined(BOOST_NO_CXX11_NULLPTR)
+#if defined(BOOST_NO_CXX11_NULLPTR)
BOOST_ASSERT(p == 0);
#endif
clear();
return *this;
}
-#if !defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
template< typename FunT >
light_function& operator= (FunT&& fun)
{
Modified: trunk/boost/log/detail/light_function_pp.hpp
==============================================================================
--- trunk/boost/log/detail/light_function_pp.hpp (original)
+++ trunk/boost/log/detail/light_function_pp.hpp 2013-04-20 07:42:26 EDT (Sat, 20 Apr 2013)
@@ -56,13 +56,13 @@
{
}
-#if !defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
explicit impl(FunT&& fun) :
impl_base(&this_type::invoke_impl, &this_type::clone_impl, &this_type::destroy_impl),
m_Function(fun)
{
}
-#endif // !defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+#endif // !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
static void destroy_impl(impl_base* self)
{
@@ -105,7 +105,7 @@
((this_type&)that).m_pImpl = NULL;
}
-#if !defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
template< typename FunT >
light_function(FunT&& fun) :
m_pImpl(new impl< typename remove_cv< typename remove_reference< FunT >::type >::type >(boost::forward< FunT >(fun)))
@@ -125,14 +125,14 @@
#endif
//! Constructor from NULL
-#if !defined(BOOST_NO_NULLPTR) && !defined(BOOST_NO_CXX11_NULLPTR)
+#if !defined(BOOST_NO_CXX11_NULLPTR)
BOOST_CONSTEXPR light_function(std::nullptr_t) BOOST_NOEXCEPT
#else
BOOST_CONSTEXPR light_function(int p) BOOST_NOEXCEPT
#endif
: m_pImpl(NULL)
{
-#if defined(BOOST_NO_NULLPTR) || defined(BOOST_NO_CXX11_NULLPTR)
+#if defined(BOOST_NO_CXX11_NULLPTR)
BOOST_ASSERT(p == 0);
#endif
}
@@ -153,19 +153,19 @@
return *this;
}
//! Assignment of NULL
-#if !defined(BOOST_NO_NULLPTR) && !defined(BOOST_NO_CXX11_NULLPTR)
+#if !defined(BOOST_NO_CXX11_NULLPTR)
light_function& operator= (std::nullptr_t)
#else
light_function& operator= (int p)
#endif
{
-#if defined(BOOST_NO_NULLPTR) || defined(BOOST_NO_CXX11_NULLPTR)
+#if defined(BOOST_NO_CXX11_NULLPTR)
BOOST_ASSERT(p == 0);
#endif
clear();
return *this;
}
-#if !defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
template< typename FunT >
light_function& operator= (FunT&& fun)
{
@@ -259,13 +259,13 @@
{
}
-#if !defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
explicit impl(FunT&& fun) :
impl_base(&this_type::invoke_impl, &this_type::clone_impl, &this_type::destroy_impl),
m_Function(fun)
{
}
-#endif // !defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+#endif // !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
static void destroy_impl(impl_base* self)
{
@@ -307,7 +307,7 @@
((this_type&)that).m_pImpl = NULL;
}
-#if !defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
template< typename FunT >
light_function(FunT&& fun) :
m_pImpl(new impl< typename remove_cv< typename remove_reference< FunT >::type >::type >(boost::forward< FunT >(fun)))
@@ -327,14 +327,14 @@
#endif
//! Constructor from NULL
-#if !defined(BOOST_NO_NULLPTR) && !defined(BOOST_NO_CXX11_NULLPTR)
+#if !defined(BOOST_NO_CXX11_NULLPTR)
BOOST_CONSTEXPR light_function(std::nullptr_t) BOOST_NOEXCEPT
#else
BOOST_CONSTEXPR light_function(int p) BOOST_NOEXCEPT
#endif
: m_pImpl(NULL)
{
-#if defined(BOOST_NO_NULLPTR) || defined(BOOST_NO_CXX11_NULLPTR)
+#if defined(BOOST_NO_CXX11_NULLPTR)
BOOST_ASSERT(p == 0);
#endif
}
@@ -355,19 +355,19 @@
return *this;
}
//! Assignment of NULL
-#if !defined(BOOST_NO_NULLPTR) && !defined(BOOST_NO_CXX11_NULLPTR)
+#if !defined(BOOST_NO_CXX11_NULLPTR)
light_function& operator= (std::nullptr_t)
#else
light_function& operator= (int p)
#endif
{
-#if defined(BOOST_NO_NULLPTR) || defined(BOOST_NO_CXX11_NULLPTR)
+#if defined(BOOST_NO_CXX11_NULLPTR)
BOOST_ASSERT(p == 0);
#endif
clear();
return *this;
}
-#if !defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
template< typename FunT >
light_function& operator= (FunT&& fun)
{
Modified: trunk/boost/log/detail/native_typeof.hpp
==============================================================================
--- trunk/boost/log/detail/native_typeof.hpp (original)
+++ trunk/boost/log/detail/native_typeof.hpp 2013-04-20 07:42:26 EDT (Sat, 20 Apr 2013)
@@ -22,7 +22,7 @@
#pragma once
#endif
-#if !defined(BOOST_NO_DECLTYPE) && !defined(BOOST_NO_CXX11_DECLTYPE)
+#if !defined(BOOST_NO_CXX11_DECLTYPE)
namespace boost {
@@ -52,12 +52,12 @@
#endif
-#if !defined(BOOST_NO_AUTO_DECLARATIONS) && !defined(BOOST_NO_CXX11_AUTO_DECLARATIONS)
+#if !defined(BOOST_NO_CXX11_AUTO_DECLARATIONS)
#define BOOST_LOG_AUTO(var, expr) auto var = (expr)
#endif
#if !defined(BOOST_LOG_AUTO) && defined(BOOST_LOG_TYPEOF)
#define BOOST_LOG_AUTO(var, expr) BOOST_LOG_TYPEOF((expr)) var = (expr)
-#endif // defined(BOOST_LOG_TYPEOF)
+#endif
#endif // BOOST_LOG_DETAIL_NATIVE_TYPEOF_HPP_INCLUDED_
Modified: trunk/boost/log/expressions/filter.hpp
==============================================================================
--- trunk/boost/log/expressions/filter.hpp (original)
+++ trunk/boost/log/expressions/filter.hpp 2013-04-20 07:42:26 EDT (Sat, 20 Apr 2013)
@@ -80,7 +80,7 @@
/*!
* Initializing constructor. Creates a filter which will invoke the specified function object.
*/
-#if !defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
template< typename FunT >
filter(FunT const& fun)
#else
@@ -110,7 +110,7 @@
/*!
* Initializing assignment. Sets the specified function object to the filter.
*/
-#if !defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
template< typename FunT >
filter& operator= (FunT const& fun)
#else
Modified: trunk/boost/log/expressions/formatter.hpp
==============================================================================
--- trunk/boost/log/expressions/formatter.hpp (original)
+++ trunk/boost/log/expressions/formatter.hpp 2013-04-20 07:42:26 EDT (Sat, 20 Apr 2013)
@@ -103,7 +103,7 @@
/*!
* Initializing constructor. Creates a formatter which will invoke the specified function object.
*/
-#if !defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
template< typename FunT >
basic_formatter(FunT const& fun)
#else
@@ -133,7 +133,7 @@
/*!
* Initializing assignment. Sets the specified function object to the formatter.
*/
-#if !defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
template< typename FunT >
basic_formatter& operator= (FunT const& fun)
#else
Modified: trunk/boost/log/expressions/predicates/begins_with.hpp
==============================================================================
--- trunk/boost/log/expressions/predicates/begins_with.hpp (original)
+++ trunk/boost/log/expressions/predicates/begins_with.hpp 2013-04-20 07:42:26 EDT (Sat, 20 Apr 2013)
@@ -40,12 +40,12 @@
/*!
* The predicate checks if the attribute value begins with a substring. The attribute value is assumed to be of a string type.
*/
-#if !defined(BOOST_NO_TEMPLATE_ALIASES) && !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
+#if !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
template< typename T, typename SubstringT, typename FallbackPolicyT = fallback_to_none >
using attribute_begins_with = aux::attribute_predicate< T, SubstringT, begins_with_fun, FallbackPolicyT >;
-#else // !defined(BOOST_NO_TEMPLATE_ALIASES) && !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
+#else // !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
template< typename T, typename SubstringT, typename FallbackPolicyT = fallback_to_none >
class attribute_begins_with :
@@ -77,7 +77,7 @@
}
};
-#endif // !defined(BOOST_NO_TEMPLATE_ALIASES) && !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
+#endif // !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
/*!
* The function generates a terminal node in a template expression. The node will check if the attribute value,
Modified: trunk/boost/log/expressions/predicates/contains.hpp
==============================================================================
--- trunk/boost/log/expressions/predicates/contains.hpp (original)
+++ trunk/boost/log/expressions/predicates/contains.hpp 2013-04-20 07:42:26 EDT (Sat, 20 Apr 2013)
@@ -40,12 +40,12 @@
/*!
* The predicate checks if the attribute value contains a substring. The attribute value is assumed to be of a string type.
*/
-#if !defined(BOOST_NO_TEMPLATE_ALIASES) && !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
+#if !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
template< typename T, typename SubstringT, typename FallbackPolicyT = fallback_to_none >
using attribute_contains = aux::attribute_predicate< T, SubstringT, contains_fun, FallbackPolicyT >;
-#else // !defined(BOOST_NO_TEMPLATE_ALIASES) && !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
+#else // !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
template< typename T, typename SubstringT, typename FallbackPolicyT = fallback_to_none >
class attribute_contains :
@@ -77,7 +77,7 @@
}
};
-#endif // !defined(BOOST_NO_TEMPLATE_ALIASES) && !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
+#endif // !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
/*!
* The function generates a terminal node in a template expression. The node will check if the attribute value,
Modified: trunk/boost/log/expressions/predicates/ends_with.hpp
==============================================================================
--- trunk/boost/log/expressions/predicates/ends_with.hpp (original)
+++ trunk/boost/log/expressions/predicates/ends_with.hpp 2013-04-20 07:42:26 EDT (Sat, 20 Apr 2013)
@@ -40,12 +40,12 @@
/*!
* The predicate checks if the attribute value ends with a substring. The attribute value is assumed to be of a string type.
*/
-#if !defined(BOOST_NO_TEMPLATE_ALIASES) && !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
+#if !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
template< typename T, typename SubstringT, typename FallbackPolicyT = fallback_to_none >
using attribute_ends_with = aux::attribute_predicate< T, SubstringT, ends_with_fun, FallbackPolicyT >;
-#else // !defined(BOOST_NO_TEMPLATE_ALIASES) && !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
+#else // !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
template< typename T, typename SubstringT, typename FallbackPolicyT = fallback_to_none >
class attribute_ends_with :
@@ -77,7 +77,7 @@
}
};
-#endif // !defined(BOOST_NO_TEMPLATE_ALIASES) && !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
+#endif // !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
/*!
* The function generates a terminal node in a template expression. The node will check if the attribute value,
Modified: trunk/boost/log/expressions/predicates/is_in_range.hpp
==============================================================================
--- trunk/boost/log/expressions/predicates/is_in_range.hpp (original)
+++ trunk/boost/log/expressions/predicates/is_in_range.hpp 2013-04-20 07:42:26 EDT (Sat, 20 Apr 2013)
@@ -41,12 +41,12 @@
/*!
* The predicate checks if the attribute value contains a substring. The attribute value is assumed to be of a string type.
*/
-#if !defined(BOOST_NO_TEMPLATE_ALIASES) && !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
+#if !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
template< typename T, typename BoundaryT, typename FallbackPolicyT = fallback_to_none >
using attribute_is_in_range = aux::attribute_predicate< T, std::pair< BoundaryT, BoundaryT >, in_range_fun, FallbackPolicyT >;
-#else // !defined(BOOST_NO_TEMPLATE_ALIASES) && !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
+#else // !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
template< typename T, typename BoundaryT, typename FallbackPolicyT = fallback_to_none >
class attribute_is_in_range :
@@ -78,7 +78,7 @@
}
};
-#endif // !defined(BOOST_NO_TEMPLATE_ALIASES) && !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
+#endif // !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
/*!
* The function generates a terminal node in a template expression. The node will check if the attribute value
Modified: trunk/boost/log/expressions/predicates/matches.hpp
==============================================================================
--- trunk/boost/log/expressions/predicates/matches.hpp (original)
+++ trunk/boost/log/expressions/predicates/matches.hpp 2013-04-20 07:42:26 EDT (Sat, 20 Apr 2013)
@@ -39,12 +39,12 @@
/*!
* The predicate checks if the attribute value matches a regular expression. The attribute value is assumed to be of a string type.
*/
-#if !defined(BOOST_NO_TEMPLATE_ALIASES) && !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
+#if !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
template< typename T, typename RegexT, typename FallbackPolicyT = fallback_to_none >
using attribute_matches = aux::attribute_predicate< T, RegexT, matches_fun, FallbackPolicyT >;
-#else // !defined(BOOST_NO_TEMPLATE_ALIASES) && !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
+#else // !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
template< typename T, typename RegexT, typename FallbackPolicyT = fallback_to_none >
class attribute_matches :
@@ -76,7 +76,7 @@
}
};
-#endif // !defined(BOOST_NO_TEMPLATE_ALIASES) && !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
+#endif // !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
/*!
* The function generates a terminal node in a template expression. The node will check if the attribute value,
Modified: trunk/boost/log/sources/features.hpp
==============================================================================
--- trunk/boost/log/sources/features.hpp (original)
+++ trunk/boost/log/sources/features.hpp 2013-04-20 07:42:26 EDT (Sat, 20 Apr 2013)
@@ -22,7 +22,7 @@
#pragma once
#endif
-#if defined(BOOST_NO_VARIADIC_TEMPLATES) || defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+#if defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
#include <boost/preprocessor/repetition/enum_params.hpp>
#include <boost/preprocessor/repetition/enum_shifted_params.hpp>
@@ -44,7 +44,7 @@
namespace sources {
-#if defined(BOOST_LOG_DOXYGEN_PASS) || !(defined(BOOST_NO_VARIADIC_TEMPLATES) || defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES))
+#if defined(BOOST_LOG_DOXYGEN_PASS) || !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
/*!
* \brief A type sequence of logger features
Modified: trunk/boost/log/utility/explicit_operator_bool.hpp
==============================================================================
--- trunk/boost/log/utility/explicit_operator_bool.hpp (original)
+++ trunk/boost/log/utility/explicit_operator_bool.hpp 2013-04-20 07:42:26 EDT (Sat, 20 Apr 2013)
@@ -24,7 +24,7 @@
#pragma once
#endif
-#if defined(BOOST_LOG_DOXYGEN_PASS) || (!defined(BOOST_NO_EXPLICIT_CONVERSION_OPERATORS) && !defined(BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS))
+#if defined(BOOST_LOG_DOXYGEN_PASS) || !defined(BOOST_NO_CXX11_EXPLICIT_CONVERSION_OPERATORS)
/*!
* \brief The macro defines an explicit operator of conversion to \c bool
Modified: trunk/boost/log/utility/functional/nop.hpp
==============================================================================
--- trunk/boost/log/utility/functional/nop.hpp (original)
+++ trunk/boost/log/utility/functional/nop.hpp 2013-04-20 07:42:26 EDT (Sat, 20 Apr 2013)
@@ -33,7 +33,7 @@
void operator() () const {}
-#if !defined(BOOST_NO_VARIADIC_TEMPLATES) && !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
+#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
template< typename... ArgsT >
void operator() (ArgsT const&...) const {}
#else
Modified: trunk/boost/log/utility/value_ref.hpp
==============================================================================
--- trunk/boost/log/utility/value_ref.hpp (original)
+++ trunk/boost/log/utility/value_ref.hpp 2013-04-20 07:42:26 EDT (Sat, 20 Apr 2013)
@@ -90,7 +90,7 @@
protected:
//! The metafunction tests if the type is compatible with the reference wrapper
-#if !defined(BOOST_NO_TEMPLATE_ALIASES) && !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
+#if !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
template< typename U >
using is_compatible = is_same< U, value_type >;
#else
Modified: trunk/libs/log/src/code_conversion.cpp
==============================================================================
--- trunk/libs/log/src/code_conversion.cpp (original)
+++ trunk/libs/log/src/code_conversion.cpp 2013-04-20 07:42:26 EDT (Sat, 20 Apr 2013)
@@ -125,7 +125,7 @@
code_convert(str1, str1 + len, str2, std::use_facet< std::codecvt< wchar_t, char, std::mbstate_t > >(loc));
}
-#if !defined(BOOST_NO_CHAR16_T) && !defined(BOOST_NO_CXX11_CHAR16_T)
+#if !defined(BOOST_NO_CXX11_CHAR16_T)
//! The function converts one string to the character type of another
BOOST_LOG_API void code_convert(const char16_t* str1, std::size_t len, std::string& str2, std::locale const& loc)
@@ -141,7 +141,7 @@
#endif
-#if !defined(BOOST_NO_CHAR32_T) && !defined(BOOST_NO_CXX11_CHAR32_T)
+#if !defined(BOOST_NO_CXX11_CHAR32_T)
//! The function converts one string to the character type of another
BOOST_LOG_API void code_convert(const char32_t* str1, std::size_t len, std::string& str2, std::locale const& loc)
Modified: trunk/libs/log/src/formatter_parser.cpp
==============================================================================
--- trunk/libs/log/src/formatter_parser.cpp (original)
+++ trunk/libs/log/src/formatter_parser.cpp 2013-04-20 07:42:26 EDT (Sat, 20 Apr 2013)
@@ -128,7 +128,7 @@
typedef basic_formatter< CharT > formatter_type;
typedef typename formatter_type::stream_type stream_type;
-#if !defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
explicit chained_formatter(formatter_type&& first, SecondT&& second) :
#else
template< typename T >
Modified: trunk/libs/log/src/named_scope_format_parser.cpp
==============================================================================
--- trunk/libs/log/src/named_scope_format_parser.cpp (original)
+++ trunk/libs/log/src/named_scope_format_parser.cpp 2013-04-20 07:42:26 EDT (Sat, 20 Apr 2013)
@@ -131,7 +131,7 @@
}
}
-#if !defined(BOOST_NO_RVALUE_REFERENCES) && !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
+#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
template< typename FunT >
void add_formatter(FunT&& fun)
{
Modified: trunk/libs/log/src/stateless_allocator.hpp
==============================================================================
--- trunk/libs/log/src/stateless_allocator.hpp (original)
+++ trunk/libs/log/src/stateless_allocator.hpp 2013-04-20 07:42:26 EDT (Sat, 20 Apr 2013)
@@ -34,7 +34,7 @@
#if defined(_STLPORT_VERSION)
-#if !defined(BOOST_NO_TEMPLATE_ALIASES) && !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
+#if !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
template< typename T >
using stateless_allocator = std::allocator< T >;
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