diff --git a/test/sv_types_test.cpp b/test/sv_types_test.cpp index 184a49f..9f2592a 100644 --- a/test/sv_types_test.cpp +++ b/test/sv_types_test.cpp @@ -14,35 +14,33 @@ struct Ch int main() { - using boost::core::is_same; - typedef boost::core::basic_string_view ch_string_view; - BOOST_TEST_TRAIT_TRUE((is_same< ch_string_view::traits_type, std::char_traits >)); - BOOST_TEST_TRAIT_TRUE((is_same< ch_string_view::value_type, Ch >)); - BOOST_TEST_TRAIT_TRUE((is_same< ch_string_view::pointer, Ch* >)); - BOOST_TEST_TRAIT_TRUE((is_same< ch_string_view::const_pointer, Ch const* >)); - BOOST_TEST_TRAIT_TRUE((is_same< ch_string_view::reference, Ch& >)); - BOOST_TEST_TRAIT_TRUE((is_same< ch_string_view::const_reference, Ch const& >)); - BOOST_TEST_TRAIT_TRUE((is_same< ch_string_view::iterator, ch_string_view::const_iterator >)); - BOOST_TEST_TRAIT_TRUE((is_same< std::iterator_traits::iterator_category, std::random_access_iterator_tag >)); - BOOST_TEST_TRAIT_TRUE((is_same< ch_string_view::reverse_iterator, ch_string_view::const_reverse_iterator >)); - BOOST_TEST_TRAIT_TRUE((is_same< ch_string_view::reverse_iterator, std::reverse_iterator >)); - BOOST_TEST_TRAIT_TRUE((is_same< ch_string_view::size_type, std::size_t >)); - BOOST_TEST_TRAIT_TRUE((is_same< ch_string_view::difference_type, std::ptrdiff_t >)); + BOOST_TEST_TRAIT_SAME(ch_string_view::traits_type, std::char_traits); + BOOST_TEST_TRAIT_SAME(ch_string_view::value_type, Ch); + BOOST_TEST_TRAIT_SAME(ch_string_view::pointer, Ch*); + BOOST_TEST_TRAIT_SAME(ch_string_view::const_pointer, Ch const*); + BOOST_TEST_TRAIT_SAME(ch_string_view::reference, Ch&); + BOOST_TEST_TRAIT_SAME(ch_string_view::const_reference, Ch const&); + BOOST_TEST_TRAIT_SAME(ch_string_view::iterator, ch_string_view::const_iterator); + BOOST_TEST_TRAIT_SAME(std::iterator_traits::iterator_category, std::random_access_iterator_tag); + BOOST_TEST_TRAIT_SAME(ch_string_view::reverse_iterator, ch_string_view::const_reverse_iterator); + BOOST_TEST_TRAIT_SAME(ch_string_view::reverse_iterator, std::reverse_iterator); + BOOST_TEST_TRAIT_SAME(ch_string_view::size_type, std::size_t); + BOOST_TEST_TRAIT_SAME(ch_string_view::difference_type, std::ptrdiff_t); BOOST_TEST_EQ(ch_string_view::npos, static_cast(-1)); - BOOST_TEST_TRAIT_TRUE((is_same< boost::core::string_view, boost::core::basic_string_view >)); - BOOST_TEST_TRAIT_TRUE((is_same< boost::core::wstring_view, boost::core::basic_string_view >)); + BOOST_TEST_TRAIT_SAME(boost::core::string_view, boost::core::basic_string_view); + BOOST_TEST_TRAIT_SAME(boost::core::wstring_view, boost::core::basic_string_view); #if !defined(BOOST_NO_CXX11_CHAR16_T) - BOOST_TEST_TRAIT_TRUE((is_same< boost::core::u16string_view, boost::core::basic_string_view >)); + BOOST_TEST_TRAIT_SAME(boost::core::u16string_view, boost::core::basic_string_view); #endif #if !defined(BOOST_NO_CXX11_CHAR32_T) - BOOST_TEST_TRAIT_TRUE((is_same< boost::core::u32string_view, boost::core::basic_string_view >)); + BOOST_TEST_TRAIT_SAME(boost::core::u32string_view, boost::core::basic_string_view); #endif #if defined(__cpp_char8_t) && __cpp_char8_t >= 201811L - BOOST_TEST_TRAIT_TRUE((is_same< boost::core::u8string_view, boost::core::basic_string_view >)); + BOOST_TEST_TRAIT_SAME(boost::core::u8string_view, boost::core::basic_string_view); #endif return boost::report_errors();