Skip to content

Commit 440b160

Browse files
committed
Replaced leftover BOOST_STATIC_ASSERT_MSGs with static_assert.
1 parent c126392 commit 440b160

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

include/boost/log/detail/named_scope_fmt_pp.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ BOOST_FORCEINLINE format_named_scope_actor<
4141
>
4242
format_named_scope(attribute_keyword< DescriptorT, ActorT > const& keyword, BOOST_PP_ENUM_BINARY_PARAMS(BOOST_PP_ITERATION(), ArgT, const& arg))
4343
{
44-
BOOST_STATIC_ASSERT_MSG((is_same< typename DescriptorT::value_type, attributes::named_scope::value_type >::value),\
44+
static_assert(is_same< typename DescriptorT::value_type, attributes::named_scope::value_type >::value,
4545
"Boost.Log: Named scope formatter only accepts attribute values of type attributes::named_scope::value_type.");
4646

4747
typedef typename boost::log::aux::deduce_char_type<
@@ -68,7 +68,7 @@ BOOST_FORCEINLINE format_named_scope_actor<
6868
>
6969
format_named_scope(attribute_actor< T, FallbackPolicyT, TagT, ActorT > const& placeholder, BOOST_PP_ENUM_BINARY_PARAMS(BOOST_PP_ITERATION(), ArgT, const& arg))
7070
{
71-
BOOST_STATIC_ASSERT_MSG((is_same< T, attributes::named_scope::value_type >::value),\
71+
static_assert(is_same< T, attributes::named_scope::value_type >::value,
7272
"Boost.Log: Named scope formatter only accepts attribute values of type attributes::named_scope::value_type.");
7373

7474
typedef typename boost::log::aux::deduce_char_type<

include/boost/log/utility/type_dispatch/dynamic_type_dispatcher.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
#include <new>
1919
#include <memory>
2020
#include <map>
21-
#include <boost/ref.hpp>
2221
#include <boost/type_index.hpp>
22+
#include <boost/core/ref.hpp>
2323
#include <boost/smart_ptr/shared_ptr.hpp>
2424
#include <boost/smart_ptr/make_shared_object.hpp>
2525
#include <boost/log/detail/config.hpp>
@@ -63,7 +63,7 @@ class dynamic_type_dispatcher :
6363
{
6464
this->m_pVisitor = (void*)boost::addressof(m_Visitor);
6565
typedef void (*trampoline_t)(void*, T const&);
66-
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");
66+
static_assert(sizeof(trampoline_t) == sizeof(void*), "Boost.Log: Unsupported platform, the size of a function pointer differs from the size of a pointer");
6767
union
6868
{
6969
void* as_pvoid;

0 commit comments

Comments
 (0)