boost_mirror/iterator
1
0
Fork 0
mirror of https://github.com/boostorg/iterator.git synced 2025-05-10 07:33:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use BOOST_STATIC_ASSERT instead of BOOST_MPL_ASSERT (#78)

Browse Source 
The MPL version is slower to compile and `BOOST_STATIC_ASSERT` is
already used in some places. So unify that.

This also fixes `Wzero-as-null-pointer-constant` warnings, see https://github.com/boostorg/mpl/pull/75
This commit is contained in:
Alexander Grund 2023-05-07 14:23:16 +02:00 committed by GitHub
parent 7c9b4296a1
commit e8fbd92a61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/boost/iterator/detail/facade_iterator_category.hpp
View File

@ -13,15 +13,14 @@
# include <boost/mpl/if.hpp> # include <boost/mpl/if.hpp>
# include <boost/mpl/eval_if.hpp> # include <boost/mpl/eval_if.hpp>
# include <boost/mpl/identity.hpp> # include <boost/mpl/identity.hpp>
# include <boost/mpl/assert.hpp>
# include <boost/static_assert.hpp>
# include <boost/type_traits/is_same.hpp> # include <boost/type_traits/is_same.hpp>
# include <boost/type_traits/is_const.hpp> # include <boost/type_traits/is_const.hpp>
# include <boost/type_traits/is_reference.hpp> # include <boost/type_traits/is_reference.hpp>
# include <boost/type_traits/is_convertible.hpp> # include <boost/type_traits/is_convertible.hpp>
# include <boost/type_traits/is_same.hpp>
# include <boost/iterator/detail/config_def.hpp> // try to keep this last # include <boost/iterator/detail/config_def.hpp> // try to keep this last
# ifdef BOOST_ITERATOR_REF_CONSTNESS_KILLS_WRITABILITY # ifdef BOOST_ITERATOR_REF_CONSTNESS_KILLS_WRITABILITY
@ -139,17 +138,17 @@ struct iterator_category_with_traversal
// Make sure this isn't used to build any categories where // Make sure this isn't used to build any categories where
// convertibility to Traversal is redundant. Should just use the // convertibility to Traversal is redundant. Should just use the
// Category element in that case. // Category element in that case.
BOOST_MPL_ASSERT_NOT(( BOOST_STATIC_ASSERT((
is_convertible< !is_convertible<
typename iterator_category_to_traversal<Category>::type typename iterator_category_to_traversal<Category>::type
, Traversal , Traversal
>)); >::value));
BOOST_MPL_ASSERT((is_iterator_category<Category>)); BOOST_STATIC_ASSERT(is_iterator_category<Category>::value);
BOOST_MPL_ASSERT_NOT((is_iterator_category<Traversal>)); BOOST_STATIC_ASSERT(!is_iterator_category<Traversal>::value);
BOOST_MPL_ASSERT_NOT((is_iterator_traversal<Category>)); BOOST_STATIC_ASSERT(!is_iterator_traversal<Category>::value);
# if !BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1310)) # if !BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1310))
BOOST_MPL_ASSERT((is_iterator_traversal<Traversal>)); BOOST_STATIC_ASSERT(is_iterator_traversal<Traversal>::value);
# endif # endif
}; };
@ -158,7 +157,7 @@ struct iterator_category_with_traversal
template <class Traversal, class ValueParam, class Reference> template <class Traversal, class ValueParam, class Reference>
struct facade_iterator_category_impl struct facade_iterator_category_impl
{ {
BOOST_MPL_ASSERT_NOT((is_iterator_category<Traversal>)); BOOST_STATIC_ASSERT(!is_iterator_category<Traversal>::value);
typedef typename iterator_facade_default_category< typedef typename iterator_facade_default_category<
Traversal,ValueParam,Reference Traversal,ValueParam,Reference

4
include/boost/iterator/iterator_concepts.hpp
View File

@ -144,8 +144,8 @@ namespace boost_concepts
{ {
typedef typename std::iterator_traits<Iterator>::difference_type difference_type; typedef typename std::iterator_traits<Iterator>::difference_type difference_type;
BOOST_MPL_ASSERT((boost::is_integral<difference_type>)); BOOST_STATIC_ASSERT(boost::is_integral<difference_type>::value);
BOOST_MPL_ASSERT_RELATION(std::numeric_limits<difference_type>::is_signed, ==, true); BOOST_STATIC_ASSERT(std::numeric_limits<difference_type>::is_signed);
BOOST_CONCEPT_ASSERT(( BOOST_CONCEPT_ASSERT((
boost::Convertible< boost::Convertible<

2
test/iterator_facade.cpp
View File

@ -147,7 +147,7 @@ struct iterator_with_proxy_reference
template <class T, class U> template <class T, class U>
void same_type(U const&) void same_type(U const&)
{ BOOST_MPL_ASSERT((boost::is_same<T,U>)); } { BOOST_STATIC_ASSERT((boost::is_same<T,U>::value)); }
template <class I, class A> template <class I, class A>
struct abstract_iterator struct abstract_iterator

6
test/static_assert_same.hpp
View File

@ -5,15 +5,15 @@
#ifndef STATIC_ASSERT_SAME_DWA2003530_HPP #ifndef STATIC_ASSERT_SAME_DWA2003530_HPP
# define STATIC_ASSERT_SAME_DWA2003530_HPP # define STATIC_ASSERT_SAME_DWA2003530_HPP
#include <boost/mpl/assert.hpp> #include <boost/static_assert.hpp>
#include <boost/type_traits/is_same.hpp> #include <boost/type_traits/is_same.hpp>
#define STATIC_ASSERT_SAME( T1,T2 ) BOOST_MPL_ASSERT((::boost::is_same< T1, T2 >)) #define STATIC_ASSERT_SAME( T1,T2 ) BOOST_STATIC_ASSERT((::boost::is_same< T1, T2 >::value))
template <class T1, class T2> template <class T1, class T2>
struct static_assert_same struct static_assert_same
{ {
BOOST_MPL_ASSERT((::boost::is_same< T1, T2 >)); STATIC_ASSERT_SAME(T1, T2);
enum { value = 1 }; enum { value = 1 };
}; };