From 440b160c9160decfde222fa5ad2643820e8b7c6a Mon Sep 17 00:00:00 2001 From: Andrey Semashev Date: Fri, 11 Oct 2024 00:07:47 +0300 Subject: [PATCH] Replaced leftover BOOST_STATIC_ASSERT_MSGs with static_assert. --- include/boost/log/detail/named_scope_fmt_pp.hpp | 4 ++-- .../log/utility/type_dispatch/dynamic_type_dispatcher.hpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/boost/log/detail/named_scope_fmt_pp.hpp b/include/boost/log/detail/named_scope_fmt_pp.hpp index 16e4508919..7c8966e9f7 100644 --- a/include/boost/log/detail/named_scope_fmt_pp.hpp +++ b/include/boost/log/detail/named_scope_fmt_pp.hpp @@ -41,7 +41,7 @@ BOOST_FORCEINLINE format_named_scope_actor< > format_named_scope(attribute_keyword< DescriptorT, ActorT > const& keyword, BOOST_PP_ENUM_BINARY_PARAMS(BOOST_PP_ITERATION(), ArgT, const& arg)) { - BOOST_STATIC_ASSERT_MSG((is_same< typename DescriptorT::value_type, attributes::named_scope::value_type >::value),\ + static_assert(is_same< typename DescriptorT::value_type, attributes::named_scope::value_type >::value, "Boost.Log: Named scope formatter only accepts attribute values of type attributes::named_scope::value_type."); typedef typename boost::log::aux::deduce_char_type< @@ -68,7 +68,7 @@ BOOST_FORCEINLINE format_named_scope_actor< > format_named_scope(attribute_actor< T, FallbackPolicyT, TagT, ActorT > const& placeholder, BOOST_PP_ENUM_BINARY_PARAMS(BOOST_PP_ITERATION(), ArgT, const& arg)) { - BOOST_STATIC_ASSERT_MSG((is_same< T, attributes::named_scope::value_type >::value),\ + static_assert(is_same< T, attributes::named_scope::value_type >::value, "Boost.Log: Named scope formatter only accepts attribute values of type attributes::named_scope::value_type."); typedef typename boost::log::aux::deduce_char_type< diff --git a/include/boost/log/utility/type_dispatch/dynamic_type_dispatcher.hpp b/include/boost/log/utility/type_dispatch/dynamic_type_dispatcher.hpp index 21428ff949..67c65ce56f 100644 --- a/include/boost/log/utility/type_dispatch/dynamic_type_dispatcher.hpp +++ b/include/boost/log/utility/type_dispatch/dynamic_type_dispatcher.hpp @@ -18,8 +18,8 @@ #include #include #include -#include #include +#include #include #include #include @@ -63,7 +63,7 @@ class dynamic_type_dispatcher : { this->m_pVisitor = (void*)boost::addressof(m_Visitor); typedef void (*trampoline_t)(void*, T const&); - BOOST_STATIC_ASSERT_MSG(sizeof(trampoline_t) == sizeof(void*), "Boost.Log: Unsupported platform, the size of a function pointer differs from the size of a pointer"); + static_assert(sizeof(trampoline_t) == sizeof(void*), "Boost.Log: Unsupported platform, the size of a function pointer differs from the size of a pointer"); union { void* as_pvoid;