Simplify dependencies dropping Boost.Core

test/deque_test.cpp

@@ -28,7 +28,6 @@
 #include "propagate_allocator_test.hpp"
 #include "vector_test.hpp"
 #include "default_init_test.hpp"
-#include <boost/core/no_exceptions_support.hpp>
 #include "../../intrusive/test/iterator_test.hpp"
 
 using namespace boost::container;

test/devector_test.cpp

@@ -18,7 +18,6 @@
 #include <boost/container/list.hpp>
 #include <boost/container/allocator.hpp>
 #include <boost/container/vector.hpp>
-#include <boost/core/no_exceptions_support.hpp>
 #include <boost/type_traits/is_default_constructible.hpp>
 #include <boost/type_traits/is_nothrow_move_constructible.hpp>
 #include "dummy_test_allocator.hpp"
@@ -636,13 +635,13 @@ template <class Devector> void test_il_assignment()
 
       test_elem_throw::on_copy_after(3);
 
-      BOOST_TRY
+      BOOST_CONTAINER_TRY
       {
          a = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12};
          BOOST_TEST(false);
       }
-      BOOST_CATCH(const test_exception&) {}
-      BOOST_CATCH_END
+      BOOST_CONTAINER_CATCH(const test_exception&) {}
+      BOOST_CONTAINER_CATCH_END
       test_elem_throw::do_not_throw();
 
       test_equal_range(a, {1, 2, 3, 4, 5, 6});

test/global_resource_test.cpp

@@ -10,7 +10,6 @@
 #include <boost/container/pmr/global_resource.hpp>
 #include <boost/container/pmr/memory_resource.hpp>
 #include <boost/core/lightweight_test.hpp>
-#include <boost/core/no_exceptions_support.hpp>
 
 #include "derived_from_memory_resource.hpp"
 
@@ -91,15 +90,15 @@ void test_null_memory_resource()
    #if !defined(BOOST_NO_EXCEPTIONS)
    bool bad_allocexception_thrown = false;
 
-   BOOST_TRY{
+   BOOST_CONTAINER_TRY{
       mr->allocate(1, 1);
    }
-   BOOST_CATCH(std::bad_alloc&) {
+   BOOST_CONTAINER_CATCH(std::bad_alloc&) {
       bad_allocexception_thrown = true;
    }
-   BOOST_CATCH(...) {
+   BOOST_CONTAINER_CATCH(...) {
    }
-   BOOST_CATCH_END
+   BOOST_CONTAINER_CATCH_END
 
    BOOST_TEST(bad_allocexception_thrown == true);
    #endif   //BOOST_NO_EXCEPTIONS

test/memory_resource_test.cpp

@@ -9,7 +9,6 @@
 //////////////////////////////////////////////////////////////////////////////
 #include <boost/container/pmr/memory_resource.hpp>
 #include <boost/core/lightweight_test.hpp>
-#include <boost/core/no_exceptions_support.hpp>
 #include "derived_from_memory_resource.hpp"
 
 #include <cstdlib>

test/static_vector_options_test.cpp

@@ -10,7 +10,6 @@
 #define BOOST_ENABLE_ASSERT_HANDLER
 #include <boost/container/static_vector.hpp>
 #include <boost/core/lightweight_test.hpp>
-#include <boost/core/no_exceptions_support.hpp>
 #include <new> //for bad_alloc
 #include <boost/assert.hpp>
 #include <cstdlib>
@@ -87,16 +86,16 @@ void test_throw_on_overflow()
       v.resize(Capacity);
       bool expected_type_thrown = false;
 
-      BOOST_TRY{
+      BOOST_CONTAINER_TRY{
          v.push_back(0);
       }
-      BOOST_CATCH(bad_alloc_t&)
+      BOOST_CONTAINER_CATCH(bad_alloc_t&)
       {
          expected_type_thrown = true;
       }
-      BOOST_CATCH(...)
+      BOOST_CONTAINER_CATCH(...)
       {}
-      BOOST_CATCH_END
+      BOOST_CONTAINER_CATCH_END
 
       BOOST_TEST(expected_type_thrown == true);
       BOOST_TEST(v.capacity() == Capacity);
@@ -115,16 +114,16 @@ void test_throw_on_overflow()
       v.resize(Capacity);
       bool expected_type_thrown = false;
 
-      BOOST_TRY{
+      BOOST_CONTAINER_TRY{
          v.push_back(0);
       }
-      BOOST_CATCH(throw_on_overflow_off)
+      BOOST_CONTAINER_CATCH(throw_on_overflow_off)
       {
          expected_type_thrown = true;
       }
-      BOOST_CATCH(...)
+      BOOST_CONTAINER_CATCH(...)
       {}
-      BOOST_CATCH_END
+      BOOST_CONTAINER_CATCH_END
 
       BOOST_TEST(expected_type_thrown == true);
       BOOST_TEST(v.capacity() == Capacity);

test/static_vector_test.cpp

@@ -8,7 +8,6 @@
 // Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt)
 #include <boost/core/lightweight_test.hpp>
-#include <boost/core/no_exceptions_support.hpp>
 #include <boost/container/vector.hpp>
 #include <boost/container/list.hpp>
 #include <boost/container/detail/iterator.hpp>

test/vector_test.hpp

@@ -22,7 +22,6 @@
 #include <boost/move/utility_core.hpp>
 #include <boost/move/iterator.hpp>
 #include <boost/move/make_unique.hpp>
-#include <boost/core/no_exceptions_support.hpp>
 #include <boost/static_assert.hpp>
 
 #include "print_container.hpp"