diff --git a/include/boost/variant2/variant.hpp b/include/boost/variant2/variant.hpp index f3c9b3f..55f3559 100644 --- a/include/boost/variant2/variant.hpp +++ b/include/boost/variant2/variant.hpp @@ -13,16 +13,14 @@ # pragma warning( disable: 4521 4522 ) // multiple copy operators #endif -#ifndef BOOST_MP11_HPP_INCLUDED #include -#endif +#include #include #include #include #include #include #include -#include #include #include #include // std::hash @@ -857,7 +855,7 @@ template struct variant_base_impl { size_t const J = I+1; - assert( ix_ == J ); + BOOST_ASSERT( ix_ == J ); return st_.get( mp11::mp_size_t() ); } @@ -925,7 +923,7 @@ template struct variant_base_impl template BOOST_CXX14_CONSTEXPR mp11::mp_at_c, I>& _get_impl( mp11::mp_size_t ) noexcept { - assert( index() == I ); + BOOST_ASSERT( index() == I ); size_t const J = I+1; @@ -1013,7 +1011,7 @@ template struct variant_base_impl { size_t const J = I+1; - assert( ix_ == J ); + BOOST_ASSERT( ix_ == J ); return st_.get( mp11::mp_size_t() ); } @@ -1137,7 +1135,7 @@ template struct variant_base_impl template BOOST_CXX14_CONSTEXPR mp11::mp_at_c, I>& _get_impl( mp11::mp_size_t ) noexcept { - assert( index() == I ); + BOOST_ASSERT( index() == I ); size_t const J = I+1;