From 703f8d106585bd72f3cfa32d050b8494494c8891 Mon Sep 17 00:00:00 2001 From: Christian Mazakas Date: Thu, 20 Oct 2022 15:25:40 -0700 Subject: [PATCH] Delete boost-level headers as they're no longer considered idiomatic and update all tests to use the test/helpers/unorderd.hpp header where applicable --- include/boost/unordered_flat_map.hpp | 18 ------------------ include/boost/unordered_flat_set.hpp | 18 ------------------ test/helpers/unordered.hpp | 4 ++-- test/unordered/assign_tests.cpp | 12 +----------- test/unordered/at_tests.cpp | 11 +---------- test/unordered/compile_map.cpp | 11 +---------- test/unordered/compile_set.cpp | 11 +---------- test/unordered/constructor_tests.cpp | 12 +----------- test/unordered/contains_tests.cpp | 13 +------------ test/unordered/copy_tests.cpp | 10 +--------- test/unordered/emplace_tests.cpp | 13 +------------ test/unordered/equality_tests.cpp | 13 +------------ test/unordered/equivalent_keys_tests.cpp | 13 +------------ test/unordered/erase_if.cpp | 13 +------------ test/unordered/erase_tests.cpp | 12 +----------- test/unordered/find_tests.cpp | 12 +----------- test/unordered/fwd_set_test.cpp | 2 +- test/unordered/incomplete_test.cpp | 13 +------------ test/unordered/init_type_insert_tests.cpp | 3 +-- test/unordered/insert_hint_tests.cpp | 13 +------------ test/unordered/insert_tests.cpp | 12 +----------- test/unordered/link_test_1.cpp | 13 +------------ test/unordered/link_test_2.cpp | 13 +------------ test/unordered/load_factor_tests.cpp | 13 +------------ test/unordered/merge_tests.cpp | 11 +---------- test/unordered/move_tests.cpp | 12 +----------- test/unordered/noexcept_tests.cpp | 13 +------------ test/unordered/rehash_tests.cpp | 12 +----------- test/unordered/reserve_tests.cpp | 13 +------------ test/unordered/scoped_allocator.cpp | 13 +------------ test/unordered/simple_tests.cpp | 13 +------------ test/unordered/swap_tests.cpp | 13 +------------ test/unordered/transparent_tests.cpp | 13 +------------ 33 files changed, 32 insertions(+), 359 deletions(-) delete mode 100644 include/boost/unordered_flat_map.hpp delete mode 100644 include/boost/unordered_flat_set.hpp diff --git a/include/boost/unordered_flat_map.hpp b/include/boost/unordered_flat_map.hpp deleted file mode 100644 index bed3bc05..00000000 --- a/include/boost/unordered_flat_map.hpp +++ /dev/null @@ -1,18 +0,0 @@ - -// Copyright (C) 2022 Christian Mazakas -// Distributed under the Boost Software License, Version 1.0. (See accompanying -// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - -// See http://www.boost.org/libs/unordered for documentation - -#ifndef BOOST_UNORDERED_FLAT_MAP_HPP_INCLUDED -#define BOOST_UNORDERED_FLAT_MAP_HPP_INCLUDED - -#include -#if defined(BOOST_HAS_PRAGMA_ONCE) -#pragma once -#endif - -#include - -#endif // BOOST_UNORDERED_FLAT_MAP_HPP_INCLUDED \ No newline at end of file diff --git a/include/boost/unordered_flat_set.hpp b/include/boost/unordered_flat_set.hpp deleted file mode 100644 index 6e2067f8..00000000 --- a/include/boost/unordered_flat_set.hpp +++ /dev/null @@ -1,18 +0,0 @@ - -// Copyright (C) 2022 Christian Mazakas -// Distributed under the Boost Software License, Version 1.0. (See accompanying -// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) - -// See http://www.boost.org/libs/unordered for documentation - -#ifndef BOOST_UNORDERED_FLAT_SET_HPP_INCLUDED -#define BOOST_UNORDERED_FLAT_SET_HPP_INCLUDED - -#include -#if defined(BOOST_HAS_PRAGMA_ONCE) -#pragma once -#endif - -#include - -#endif // BOOST_UNORDERED_FLAT_SET_HPP_INCLUDED \ No newline at end of file diff --git a/test/helpers/unordered.hpp b/test/helpers/unordered.hpp index 289e79b7..5a2361ea 100644 --- a/test/helpers/unordered.hpp +++ b/test/helpers/unordered.hpp @@ -9,8 +9,8 @@ // clang-format off #include "prefix.hpp" #ifdef BOOST_UNORDERED_FOA_TESTS -#include -#include +#include +#include #include #else #include diff --git a/test/unordered/assign_tests.cpp b/test/unordered/assign_tests.cpp index e38f6e87..b937c57e 100644 --- a/test/unordered/assign_tests.cpp +++ b/test/unordered/assign_tests.cpp @@ -3,17 +3,7 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// clang-format off -#include "../helpers/prefix.hpp" -#ifdef BOOST_UNORDERED_FOA_TESTS -#include -#include -#else -#include -#include -#endif -#include "../helpers/postfix.hpp" -// clang-format on +#include "../helpers/unordered.hpp" #include "../helpers/test.hpp" #include "../objects/test.hpp" diff --git a/test/unordered/at_tests.cpp b/test/unordered/at_tests.cpp index 921bb8ee..bc5ad921 100644 --- a/test/unordered/at_tests.cpp +++ b/test/unordered/at_tests.cpp @@ -3,16 +3,7 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// clang-format off -#include "../helpers/prefix.hpp" -#ifdef BOOST_UNORDERED_FOA_TESTS -#include -#include -#else -#include -#endif -#include "../helpers/postfix.hpp" -// clang-format on +#include "../helpers/unordered.hpp" #include "../helpers/test.hpp" #include diff --git a/test/unordered/compile_map.cpp b/test/unordered/compile_map.cpp index 272f7de5..f43476c0 100644 --- a/test/unordered/compile_map.cpp +++ b/test/unordered/compile_map.cpp @@ -6,16 +6,7 @@ // This test creates the containers with members that meet their minimum // requirements. Makes sure everything compiles and is defined correctly. -// clang-format off -#include "../helpers/prefix.hpp" -#ifdef BOOST_UNORDERED_FOA_TESTS -#include -#include -#else -#include -#endif -#include "../helpers/postfix.hpp" -// clang-format on +#include "../helpers/unordered.hpp" #include "../helpers/test.hpp" #include "../objects/minimal.hpp" diff --git a/test/unordered/compile_set.cpp b/test/unordered/compile_set.cpp index dfd40d53..d51bc11e 100644 --- a/test/unordered/compile_set.cpp +++ b/test/unordered/compile_set.cpp @@ -6,16 +6,7 @@ // This test creates the containers with members that meet their minimum // requirements. Makes sure everything compiles and is defined correctly. -// clang-format off -#include "../helpers/prefix.hpp" -#ifdef BOOST_UNORDERED_FOA_TESTS -#include -#include -#else -#include -#endif -#include "../helpers/postfix.hpp" -// clang-format on +#include "../helpers/unordered.hpp" #include "../helpers/test.hpp" #include "../objects/minimal.hpp" diff --git a/test/unordered/constructor_tests.cpp b/test/unordered/constructor_tests.cpp index 2b9d3d17..b68a7eb5 100644 --- a/test/unordered/constructor_tests.cpp +++ b/test/unordered/constructor_tests.cpp @@ -4,17 +4,7 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -#ifdef BOOST_UNORDERED_FOA_TESTS -#include -#include -#else -// clang-format off -#include "../helpers/prefix.hpp" -#include -#include -#include "../helpers/postfix.hpp" -// clang-format on -#endif +#include "../helpers/unordered.hpp" #include "../helpers/test.hpp" #include "../objects/test.hpp" diff --git a/test/unordered/contains_tests.cpp b/test/unordered/contains_tests.cpp index 39302e17..782e1915 100644 --- a/test/unordered/contains_tests.cpp +++ b/test/unordered/contains_tests.cpp @@ -2,18 +2,7 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// clang-format off -#include "../helpers/prefix.hpp" -#ifdef BOOST_UNORDERED_FOA_TESTS -#include -#include -#include -#else -#include -#include -#endif -#include "../helpers/postfix.hpp" -// clang-format on +#include "../helpers/unordered.hpp" #include "../helpers/test.hpp" diff --git a/test/unordered/copy_tests.cpp b/test/unordered/copy_tests.cpp index f8be49b7..05c0f97a 100644 --- a/test/unordered/copy_tests.cpp +++ b/test/unordered/copy_tests.cpp @@ -4,15 +4,7 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -#include "../helpers/prefix.hpp" -#ifdef BOOST_UNORDERED_FOA_TESTS -#include -#include -#else -#include -#include -#endif -#include "../helpers/postfix.hpp" +#include "../helpers/unordered.hpp" #include "../helpers/test.hpp" #include "../objects/test.hpp" diff --git a/test/unordered/emplace_tests.cpp b/test/unordered/emplace_tests.cpp index ad1245d3..bf79e2c2 100644 --- a/test/unordered/emplace_tests.cpp +++ b/test/unordered/emplace_tests.cpp @@ -3,18 +3,7 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// clang-format off -#include "../helpers/prefix.hpp" -#ifdef BOOST_UNORDERED_FOA_TESTS -#include -#include -#include -#else -#include -#include -#endif -#include "../helpers/postfix.hpp" -// clang-format on +#include "../helpers/unordered.hpp" #include #include "../helpers/test.hpp" diff --git a/test/unordered/equality_tests.cpp b/test/unordered/equality_tests.cpp index c1f0f561..68e021ca 100644 --- a/test/unordered/equality_tests.cpp +++ b/test/unordered/equality_tests.cpp @@ -3,18 +3,7 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// clang-format off -#include "../helpers/prefix.hpp" -#ifdef BOOST_UNORDERED_FOA_TESTS -#include -#include -#include -#else -#include -#include -#endif -#include "../helpers/postfix.hpp" -// clang-format on +#include "../helpers/unordered.hpp" #include #include diff --git a/test/unordered/equivalent_keys_tests.cpp b/test/unordered/equivalent_keys_tests.cpp index fe365b66..0a67b768 100644 --- a/test/unordered/equivalent_keys_tests.cpp +++ b/test/unordered/equivalent_keys_tests.cpp @@ -3,18 +3,7 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// clang-format off -#include "../helpers/prefix.hpp" -#ifdef BOOST_UNORDERED_FOA_TESTS -#include -#include -#include -#else -#include -#include -#endif -#include "../helpers/postfix.hpp" -// clang-format on +#include "../helpers/unordered.hpp" #include "../helpers/test.hpp" #include diff --git a/test/unordered/erase_if.cpp b/test/unordered/erase_if.cpp index cc4bcd5c..6033b752 100644 --- a/test/unordered/erase_if.cpp +++ b/test/unordered/erase_if.cpp @@ -2,18 +2,7 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// clang-format off -#include "../helpers/prefix.hpp" -#ifdef BOOST_UNORDERED_FOA_TESTS -#include -#include -#include -#else -#include -#include -#endif -#include "../helpers/postfix.hpp" -// clang-format on +#include "../helpers/unordered.hpp" #include "../helpers/test.hpp" diff --git a/test/unordered/erase_tests.cpp b/test/unordered/erase_tests.cpp index e79d83e9..ff02856a 100644 --- a/test/unordered/erase_tests.cpp +++ b/test/unordered/erase_tests.cpp @@ -3,17 +3,7 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// clang-format off -#include "../helpers/prefix.hpp" -#ifdef BOOST_UNORDERED_FOA_TESTS -#include -#include -#else -#include -#include -#endif -#include "../helpers/postfix.hpp" -// clang-format on +#include "../helpers/unordered.hpp" #include "../helpers/test.hpp" #include "../objects/test.hpp" diff --git a/test/unordered/find_tests.cpp b/test/unordered/find_tests.cpp index f33e9a5e..50dfd79e 100644 --- a/test/unordered/find_tests.cpp +++ b/test/unordered/find_tests.cpp @@ -4,17 +4,7 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -#ifdef BOOST_UNORDERED_FOA_TESTS -#include -#include -#else -// clang-format off -#include "../helpers/prefix.hpp" -#include -#include -#include "../helpers/postfix.hpp" -// clang-format on -#endif +#include "../helpers/unordered.hpp" #include "../helpers/test.hpp" #include "../objects/test.hpp" diff --git a/test/unordered/fwd_set_test.cpp b/test/unordered/fwd_set_test.cpp index 58de82d5..ecaaa3b1 100644 --- a/test/unordered/fwd_set_test.cpp +++ b/test/unordered/fwd_set_test.cpp @@ -109,7 +109,7 @@ UNORDERED_AUTO_TEST (use_fwd_declared_trait_without_definition) { } #ifdef BOOST_UNORDERED_FOA_TESTS -#include +#include #else #include #endif diff --git a/test/unordered/incomplete_test.cpp b/test/unordered/incomplete_test.cpp index 76e8c7f5..63058f03 100644 --- a/test/unordered/incomplete_test.cpp +++ b/test/unordered/incomplete_test.cpp @@ -3,18 +3,7 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// clang-format off -#include "../helpers/prefix.hpp" -#ifdef BOOST_UNORDERED_FOA_TESTS -#include -#include -#include -#else -#include -#include -#endif -#include "../helpers/postfix.hpp" -// clang-format on +#include "../helpers/unordered.hpp" #include diff --git a/test/unordered/init_type_insert_tests.cpp b/test/unordered/init_type_insert_tests.cpp index 3bdeb78e..2de991fb 100644 --- a/test/unordered/init_type_insert_tests.cpp +++ b/test/unordered/init_type_insert_tests.cpp @@ -2,8 +2,7 @@ #error "This test is only for the FOA-style conatiners" #endif -#include -#include +#include "../helpers/unordered.hpp" #include "../helpers/test.hpp" diff --git a/test/unordered/insert_hint_tests.cpp b/test/unordered/insert_hint_tests.cpp index c3a51c7e..17cfd7ff 100644 --- a/test/unordered/insert_hint_tests.cpp +++ b/test/unordered/insert_hint_tests.cpp @@ -3,18 +3,7 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// clang-format off -#include "../helpers/prefix.hpp" -#ifdef BOOST_UNORDERED_FOA_TESTS -#include -#include -#include -#else -#include -#include -#endif -#include "../helpers/postfix.hpp" -// clang-format on +#include "../helpers/unordered.hpp" #include "../helpers/test.hpp" #include "../helpers/invariants.hpp" diff --git a/test/unordered/insert_tests.cpp b/test/unordered/insert_tests.cpp index e60be128..b37b20ca 100644 --- a/test/unordered/insert_tests.cpp +++ b/test/unordered/insert_tests.cpp @@ -6,17 +6,7 @@ #if !defined(PIECEWISE_TEST_NAME) -#ifdef BOOST_UNORDERED_FOA_TESTS -#include -#include -#else -// clang-format off -#include "../helpers/prefix.hpp" -#include -#include -#include "../helpers/postfix.hpp" -// clang-format on -#endif +#include "../helpers/unordered.hpp" #include "../helpers/test.hpp" #include "../objects/test.hpp" diff --git a/test/unordered/link_test_1.cpp b/test/unordered/link_test_1.cpp index 2e9b3631..1d1daae7 100644 --- a/test/unordered/link_test_1.cpp +++ b/test/unordered/link_test_1.cpp @@ -3,18 +3,7 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// clang-format off -#include "../helpers/prefix.hpp" -#ifdef BOOST_UNORDERED_FOA_TESTS -#include -#include -#include -#else -#include -#include -#endif -#include "../helpers/postfix.hpp" -// clang-format on +#include "../helpers/unordered.hpp" #ifdef BOOST_UNORDERED_FOA_TESTS void foo(boost::unordered_flat_set&, boost::unordered_flat_map&); diff --git a/test/unordered/link_test_2.cpp b/test/unordered/link_test_2.cpp index fb42ba0d..fdeb529d 100644 --- a/test/unordered/link_test_2.cpp +++ b/test/unordered/link_test_2.cpp @@ -3,18 +3,7 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// clang-format off -#include "../helpers/prefix.hpp" -#ifdef BOOST_UNORDERED_FOA_TESTS -#include -#include -#include -#else -#include -#include -#endif -#include "../helpers/postfix.hpp" -// clang-format on +#include "../helpers/unordered.hpp" #ifdef BOOST_UNORDERED_FOA_TESTS void foo( diff --git a/test/unordered/load_factor_tests.cpp b/test/unordered/load_factor_tests.cpp index bee0b1e0..26a12e36 100644 --- a/test/unordered/load_factor_tests.cpp +++ b/test/unordered/load_factor_tests.cpp @@ -3,18 +3,7 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// clang-format off -#include "../helpers/prefix.hpp" -#ifdef BOOST_UNORDERED_FOA_TESTS -#include -#include -#include -#else -#include -#include -#endif -#include "../helpers/postfix.hpp" -// clang-format on +#include "../helpers/unordered.hpp" #include "../helpers/test.hpp" #include diff --git a/test/unordered/merge_tests.cpp b/test/unordered/merge_tests.cpp index 1d169373..2f1f4302 100644 --- a/test/unordered/merge_tests.cpp +++ b/test/unordered/merge_tests.cpp @@ -3,16 +3,7 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -#include "../helpers/postfix.hpp" -#ifdef BOOST_UNORDERED_FOA_TESTS -#include -#include -#include -#else -#include -#include -#endif -#include "../helpers/prefix.hpp" +#include "../helpers/unordered.hpp" #include "../helpers/count.hpp" #include "../helpers/helpers.hpp" diff --git a/test/unordered/move_tests.cpp b/test/unordered/move_tests.cpp index 31b78f81..9e899c19 100644 --- a/test/unordered/move_tests.cpp +++ b/test/unordered/move_tests.cpp @@ -3,17 +3,7 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or move at http://www.boost.org/LICENSE_1_0.txt) -// clang-format off -#include "../helpers/prefix.hpp" -#ifdef BOOST_UNORDERED_FOA_TESTS -#include -#include -#else -#include -#include -#endif -#include "../helpers/postfix.hpp" -// clang-format on +#include "../helpers/unordered.hpp" #include "../helpers/test.hpp" #include "../objects/test.hpp" diff --git a/test/unordered/noexcept_tests.cpp b/test/unordered/noexcept_tests.cpp index 26a189f6..d4bed53f 100644 --- a/test/unordered/noexcept_tests.cpp +++ b/test/unordered/noexcept_tests.cpp @@ -3,18 +3,7 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// clang-format off -#include "../helpers/prefix.hpp" -#ifdef BOOST_UNORDERED_FOA_TESTS -#include -#include -#include -#else -#include -#include -#endif -#include "../helpers/postfix.hpp" -// clang-format on +#include "../helpers/unordered.hpp" #include "../helpers/test.hpp" #include "../helpers/fwd.hpp" diff --git a/test/unordered/rehash_tests.cpp b/test/unordered/rehash_tests.cpp index 6258e08c..fb122c03 100644 --- a/test/unordered/rehash_tests.cpp +++ b/test/unordered/rehash_tests.cpp @@ -3,17 +3,7 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// clang-format off -#include "../helpers/prefix.hpp" -#ifdef BOOST_UNORDERED_FOA_TESTS -#include -#include -#else -#include -#include -#endif -#include "../helpers/postfix.hpp" -// clang-format on +#include "../helpers/unordered.hpp" #include "../helpers/test.hpp" #include "../helpers/random_values.hpp" diff --git a/test/unordered/reserve_tests.cpp b/test/unordered/reserve_tests.cpp index a67bd39f..ca7f9809 100644 --- a/test/unordered/reserve_tests.cpp +++ b/test/unordered/reserve_tests.cpp @@ -2,18 +2,7 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// clang-format off -#include "../helpers/prefix.hpp" -#ifdef BOOST_UNORDERED_FOA_TESTS -#include -#include -#include -#else -#include -#include -#endif -#include "../helpers/postfix.hpp" -// clang-format on +#include "../helpers/unordered.hpp" #include "../helpers/test.hpp" diff --git a/test/unordered/scoped_allocator.cpp b/test/unordered/scoped_allocator.cpp index cde1f96e..f554deff 100644 --- a/test/unordered/scoped_allocator.cpp +++ b/test/unordered/scoped_allocator.cpp @@ -19,18 +19,7 @@ int main() {} // https://github.com/boostorg/unordered/issues/22 // -// clang-format off -#include "../helpers/prefix.hpp" -#ifdef BOOST_UNORDERED_FOA_TESTS -#include -#include -#include -#else -#include -#include -#endif -#include "../helpers/postfix.hpp" -// clang-format on +#include "../helpers/unordered.hpp" #include "../helpers/test.hpp" diff --git a/test/unordered/simple_tests.cpp b/test/unordered/simple_tests.cpp index 7c00fdc8..e22f6db6 100644 --- a/test/unordered/simple_tests.cpp +++ b/test/unordered/simple_tests.cpp @@ -5,18 +5,7 @@ // This test checks the runtime requirements of containers. -// clang-format off -#include "../helpers/prefix.hpp" -#ifdef BOOST_UNORDERED_FOA_TESTS -#include -#include -#include -#else -#include -#include -#endif -#include "../helpers/postfix.hpp" -// clang-format on +#include "../helpers/unordered.hpp" #include "../helpers/test.hpp" #include diff --git a/test/unordered/swap_tests.cpp b/test/unordered/swap_tests.cpp index ed7feade..cee0a42f 100644 --- a/test/unordered/swap_tests.cpp +++ b/test/unordered/swap_tests.cpp @@ -3,18 +3,7 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// clang-format off -#include "../helpers/prefix.hpp" -#ifdef BOOST_UNORDERED_FOA_TESTS -#include -#include -#include -#else -#include -#include -#endif -#include "../helpers/postfix.hpp" -// clang-format on +#include "../helpers/unordered.hpp" #include #include diff --git a/test/unordered/transparent_tests.cpp b/test/unordered/transparent_tests.cpp index 9d230a18..9852fa84 100644 --- a/test/unordered/transparent_tests.cpp +++ b/test/unordered/transparent_tests.cpp @@ -2,18 +2,7 @@ // Distributed under the Boost Software License, Version 1.0. (See accompanying // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) -// clang-format off -#include "../helpers/prefix.hpp" -#ifdef BOOST_UNORDERED_FOA_TESTS -#include -#include -#include -#else -#include -#include -#endif -#include "../helpers/postfix.hpp" -// clang-format on +#include "../helpers/unordered.hpp" #include "../helpers/test.hpp"