From 95538bfdc270282dcc106da34f1106d0491fb63e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ion=20Gazta=C3=B1aga?= Date: Sat, 2 Jan 2021 22:47:19 +0100 Subject: [PATCH] Update static assert test and remove unneeded include. --- include/boost/container/string.hpp | 3 +-- test/string_test.cpp | 8 ++++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/include/boost/container/string.hpp b/include/boost/container/string.hpp index 2adb0eb..07c174b 100644 --- a/include/boost/container/string.hpp +++ b/include/boost/container/string.hpp @@ -38,7 +38,6 @@ #include #include #include -#include #include #include @@ -51,7 +50,7 @@ #include #include -#include //char_traits +#include // for char_traits #include #include // #include diff --git a/test/string_test.cpp b/test/string_test.cpp index cef5732..258085b 100644 --- a/test/string_test.cpp +++ b/test/string_test.cpp @@ -577,8 +577,8 @@ int main() typedef boost::container::allocator_traits::pointer pointer; BOOST_STATIC_ASSERT_MSG ( (boost::has_trivial_destructor_after_move::value == - boost::has_trivial_destructor_after_move::value || - boost::has_trivial_destructor_after_move::value), + (boost::has_trivial_destructor_after_move::value && + boost::has_trivial_destructor_after_move::value)), "has_trivial_destructor_after_move(default allocator) test failed"); } // std::allocator @@ -588,8 +588,8 @@ int main() typedef boost::container::allocator_traits::pointer pointer; BOOST_STATIC_ASSERT_MSG ( (boost::has_trivial_destructor_after_move::value == - boost::has_trivial_destructor_after_move::value || - boost::has_trivial_destructor_after_move::value), + (boost::has_trivial_destructor_after_move::value && + boost::has_trivial_destructor_after_move::value)), "has_trivial_destructor_after_move(std::allocator) test failed"); }