From b2f2fdc2f385cf78c3b0aaed0a06a1b83d884be5 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Sun, 19 Feb 2017 13:05:17 +0000 Subject: [PATCH] Prevent clang-format sorting some test includes --- test/exception/assign_exception_tests.cpp | 1 + test/exception/constructor_exception_tests.cpp | 1 + test/exception/containers.hpp | 3 +++ test/exception/copy_exception_tests.cpp | 1 + test/exception/erase_exception_tests.cpp | 1 + test/exception/insert_exception_tests.cpp | 1 + test/exception/move_assign_exception_tests.cpp | 3 ++- test/exception/rehash_exception_tests.cpp | 1 + test/exception/swap_exception_tests.cpp | 1 + test/unordered/assign_tests.cpp | 3 +++ test/unordered/at_tests.cpp | 2 ++ test/unordered/bucket_tests.cpp | 2 ++ test/unordered/compile_map.cpp | 2 ++ test/unordered/compile_set.cpp | 2 ++ test/unordered/constructor_tests.cpp | 2 ++ test/unordered/copy_tests.cpp | 2 ++ test/unordered/emplace_tests.cpp | 2 ++ test/unordered/equality_tests.cpp | 2 ++ test/unordered/equivalent_keys_tests.cpp | 2 ++ test/unordered/erase_equiv_tests.cpp | 2 ++ test/unordered/erase_tests.cpp | 2 ++ test/unordered/find_tests.cpp | 2 ++ test/unordered/fwd_map_test.cpp | 2 ++ test/unordered/fwd_set_test.cpp | 2 ++ test/unordered/incomplete_test.cpp | 2 ++ test/unordered/insert_hint_tests.cpp | 2 ++ test/unordered/insert_stable_tests.cpp | 2 ++ test/unordered/insert_tests.cpp | 2 ++ test/unordered/link_test_1.cpp | 2 ++ test/unordered/link_test_2.cpp | 2 ++ test/unordered/load_factor_tests.cpp | 2 ++ test/unordered/move_tests.cpp | 2 ++ test/unordered/noexcept_tests.cpp | 2 ++ test/unordered/rehash_tests.cpp | 2 ++ test/unordered/simple_tests.cpp | 2 ++ test/unordered/swap_tests.cpp | 2 ++ test/unordered/unnecessary_copy_tests.cpp | 2 ++ 37 files changed, 69 insertions(+), 1 deletion(-) diff --git a/test/exception/assign_exception_tests.cpp b/test/exception/assign_exception_tests.cpp index e8304ee9..1831f808 100644 --- a/test/exception/assign_exception_tests.cpp +++ b/test/exception/assign_exception_tests.cpp @@ -4,6 +4,7 @@ // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) #include "./containers.hpp" + #include "../helpers/random_values.hpp" #include "../helpers/invariants.hpp" diff --git a/test/exception/constructor_exception_tests.cpp b/test/exception/constructor_exception_tests.cpp index abadd65a..eaa9ae58 100644 --- a/test/exception/constructor_exception_tests.cpp +++ b/test/exception/constructor_exception_tests.cpp @@ -4,6 +4,7 @@ // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) #include "./containers.hpp" + #include "../helpers/random_values.hpp" #include "../helpers/input_iterator.hpp" diff --git a/test/exception/containers.hpp b/test/exception/containers.hpp index ee938330..b1a873e4 100644 --- a/test/exception/containers.hpp +++ b/test/exception/containers.hpp @@ -3,10 +3,13 @@ // 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" #include #include #include "../helpers/postfix.hpp" +// clang-format on + #include "../objects/exception.hpp" typedef boost::unordered_set< diff --git a/test/exception/copy_exception_tests.cpp b/test/exception/copy_exception_tests.cpp index 15c7364d..564db33c 100644 --- a/test/exception/copy_exception_tests.cpp +++ b/test/exception/copy_exception_tests.cpp @@ -4,6 +4,7 @@ // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) #include "./containers.hpp" + #include "../helpers/random_values.hpp" template inline void avoid_unused_warning(T const&) {} diff --git a/test/exception/erase_exception_tests.cpp b/test/exception/erase_exception_tests.cpp index 18f333a8..11b8c3d4 100644 --- a/test/exception/erase_exception_tests.cpp +++ b/test/exception/erase_exception_tests.cpp @@ -4,6 +4,7 @@ // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) #include "./containers.hpp" + #include "../helpers/random_values.hpp" #include "../helpers/invariants.hpp" #include "../helpers/helpers.hpp" diff --git a/test/exception/insert_exception_tests.cpp b/test/exception/insert_exception_tests.cpp index d4c1e243..1b0cf6e3 100644 --- a/test/exception/insert_exception_tests.cpp +++ b/test/exception/insert_exception_tests.cpp @@ -4,6 +4,7 @@ // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) #include "./containers.hpp" + #include #include "../helpers/random_values.hpp" #include "../helpers/invariants.hpp" diff --git a/test/exception/move_assign_exception_tests.cpp b/test/exception/move_assign_exception_tests.cpp index d09b1b82..2a2f70ee 100644 --- a/test/exception/move_assign_exception_tests.cpp +++ b/test/exception/move_assign_exception_tests.cpp @@ -3,8 +3,9 @@ // 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 #include "./containers.hpp" + +#include #include "../helpers/random_values.hpp" #include "../helpers/invariants.hpp" diff --git a/test/exception/rehash_exception_tests.cpp b/test/exception/rehash_exception_tests.cpp index 0163bfec..46c70504 100644 --- a/test/exception/rehash_exception_tests.cpp +++ b/test/exception/rehash_exception_tests.cpp @@ -4,6 +4,7 @@ // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) #include "./containers.hpp" + #include #include "../helpers/random_values.hpp" #include "../helpers/invariants.hpp" diff --git a/test/exception/swap_exception_tests.cpp b/test/exception/swap_exception_tests.cpp index 0873093a..e6ec789e 100644 --- a/test/exception/swap_exception_tests.cpp +++ b/test/exception/swap_exception_tests.cpp @@ -4,6 +4,7 @@ // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) #include "./containers.hpp" + #include "../helpers/random_values.hpp" #include "../helpers/invariants.hpp" diff --git a/test/unordered/assign_tests.cpp b/test/unordered/assign_tests.cpp index 0e2f6fdd..8dc6786e 100644 --- a/test/unordered/assign_tests.cpp +++ b/test/unordered/assign_tests.cpp @@ -3,10 +3,13 @@ // 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" #include #include #include "../helpers/postfix.hpp" +// clang-format on + #include "../helpers/test.hpp" #include "../objects/test.hpp" #include "../objects/cxx11_allocator.hpp" diff --git a/test/unordered/at_tests.cpp b/test/unordered/at_tests.cpp index 8899efcb..824b6e88 100644 --- a/test/unordered/at_tests.cpp +++ b/test/unordered/at_tests.cpp @@ -3,9 +3,11 @@ // 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" #include #include "../helpers/postfix.hpp" +// clang-format on #include "../helpers/test.hpp" #include diff --git a/test/unordered/bucket_tests.cpp b/test/unordered/bucket_tests.cpp index 4417f2d5..d879ad41 100644 --- a/test/unordered/bucket_tests.cpp +++ b/test/unordered/bucket_tests.cpp @@ -3,10 +3,12 @@ // 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" #include #include #include "../helpers/postfix.hpp" +// clang-format on #include "../helpers/test.hpp" #include diff --git a/test/unordered/compile_map.cpp b/test/unordered/compile_map.cpp index f42da0de..6b33d8ae 100644 --- a/test/unordered/compile_map.cpp +++ b/test/unordered/compile_map.cpp @@ -6,9 +6,11 @@ // 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" #include #include "../helpers/postfix.hpp" +// clang-format on #include #include "../helpers/test.hpp" diff --git a/test/unordered/compile_set.cpp b/test/unordered/compile_set.cpp index a95ab007..ed5363d6 100644 --- a/test/unordered/compile_set.cpp +++ b/test/unordered/compile_set.cpp @@ -6,9 +6,11 @@ // 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" #include #include "../helpers/postfix.hpp" +// clang-format on #include #include "../helpers/test.hpp" diff --git a/test/unordered/constructor_tests.cpp b/test/unordered/constructor_tests.cpp index 84c63742..6ad3f273 100644 --- a/test/unordered/constructor_tests.cpp +++ b/test/unordered/constructor_tests.cpp @@ -3,10 +3,12 @@ // 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" #include #include #include "../helpers/postfix.hpp" +// clang-format on #include "../helpers/test.hpp" #include "../objects/test.hpp" diff --git a/test/unordered/copy_tests.cpp b/test/unordered/copy_tests.cpp index db687e79..14502ff2 100644 --- a/test/unordered/copy_tests.cpp +++ b/test/unordered/copy_tests.cpp @@ -3,10 +3,12 @@ // 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" #include #include #include "../helpers/postfix.hpp" +// clang-format on #include "../helpers/test.hpp" #include "../objects/test.hpp" diff --git a/test/unordered/emplace_tests.cpp b/test/unordered/emplace_tests.cpp index c08adc0b..b6682939 100644 --- a/test/unordered/emplace_tests.cpp +++ b/test/unordered/emplace_tests.cpp @@ -3,10 +3,12 @@ // 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" #include #include #include "../helpers/postfix.hpp" +// clang-format on #include #include "../helpers/test.hpp" diff --git a/test/unordered/equality_tests.cpp b/test/unordered/equality_tests.cpp index 4dc6bb1e..82b4ef27 100644 --- a/test/unordered/equality_tests.cpp +++ b/test/unordered/equality_tests.cpp @@ -3,10 +3,12 @@ // 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" #include #include #include "../helpers/postfix.hpp" +// clang-format on #include #include diff --git a/test/unordered/equivalent_keys_tests.cpp b/test/unordered/equivalent_keys_tests.cpp index 2d459a4b..cf3e792c 100644 --- a/test/unordered/equivalent_keys_tests.cpp +++ b/test/unordered/equivalent_keys_tests.cpp @@ -3,10 +3,12 @@ // 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" #include #include #include "../helpers/postfix.hpp" +// clang-format on #include "../helpers/test.hpp" #include diff --git a/test/unordered/erase_equiv_tests.cpp b/test/unordered/erase_equiv_tests.cpp index b55bc202..4a46ddf0 100644 --- a/test/unordered/erase_equiv_tests.cpp +++ b/test/unordered/erase_equiv_tests.cpp @@ -6,9 +6,11 @@ // The code for erasing elements from containers with equivalent keys is very // hairy with several tricky edge cases - so explicitly test each one. +// clang-format off #include "../helpers/prefix.hpp" #include #include "../helpers/postfix.hpp" +// clang-format on #include "../helpers/test.hpp" #include "../helpers/list.hpp" diff --git a/test/unordered/erase_tests.cpp b/test/unordered/erase_tests.cpp index 34d7ec9e..7e6a98ed 100644 --- a/test/unordered/erase_tests.cpp +++ b/test/unordered/erase_tests.cpp @@ -3,10 +3,12 @@ // 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" #include #include #include "../helpers/postfix.hpp" +// clang-format on #include "../helpers/test.hpp" #include "../objects/test.hpp" diff --git a/test/unordered/find_tests.cpp b/test/unordered/find_tests.cpp index 7073566a..38c7c09c 100644 --- a/test/unordered/find_tests.cpp +++ b/test/unordered/find_tests.cpp @@ -3,10 +3,12 @@ // 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" #include #include #include "../helpers/postfix.hpp" +// clang-format on #include "../helpers/test.hpp" #include "../objects/test.hpp" diff --git a/test/unordered/fwd_map_test.cpp b/test/unordered/fwd_map_test.cpp index 5a943657..1e656331 100644 --- a/test/unordered/fwd_map_test.cpp +++ b/test/unordered/fwd_map_test.cpp @@ -3,9 +3,11 @@ // 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" #include #include "../helpers/postfix.hpp" +// clang-format on template void call_swap(boost::unordered_map& x, diff --git a/test/unordered/fwd_set_test.cpp b/test/unordered/fwd_set_test.cpp index 62067f52..44cd1436 100644 --- a/test/unordered/fwd_set_test.cpp +++ b/test/unordered/fwd_set_test.cpp @@ -3,9 +3,11 @@ // 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" #include #include "../helpers/postfix.hpp" +// clang-format on struct true_type { char x[100]; }; struct false_type { char x; }; diff --git a/test/unordered/incomplete_test.cpp b/test/unordered/incomplete_test.cpp index 4300a8e6..8c3d2a53 100644 --- a/test/unordered/incomplete_test.cpp +++ b/test/unordered/incomplete_test.cpp @@ -3,10 +3,12 @@ // 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" #include #include #include "../helpers/postfix.hpp" +// clang-format on #include diff --git a/test/unordered/insert_hint_tests.cpp b/test/unordered/insert_hint_tests.cpp index add39024..90289f75 100644 --- a/test/unordered/insert_hint_tests.cpp +++ b/test/unordered/insert_hint_tests.cpp @@ -3,10 +3,12 @@ // 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" #include #include #include "../helpers/postfix.hpp" +// clang-format on #include "../helpers/test.hpp" #include "../helpers/invariants.hpp" diff --git a/test/unordered/insert_stable_tests.cpp b/test/unordered/insert_stable_tests.cpp index b4482764..5a22e267 100644 --- a/test/unordered/insert_stable_tests.cpp +++ b/test/unordered/insert_stable_tests.cpp @@ -3,10 +3,12 @@ // 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" #include #include #include "../helpers/postfix.hpp" +// clang-format on #include "../helpers/test.hpp" diff --git a/test/unordered/insert_tests.cpp b/test/unordered/insert_tests.cpp index a3384652..73c44873 100644 --- a/test/unordered/insert_tests.cpp +++ b/test/unordered/insert_tests.cpp @@ -3,10 +3,12 @@ // 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" #include #include #include "../helpers/postfix.hpp" +// clang-format on #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 8df5337e..f44c1116 100644 --- a/test/unordered/link_test_1.cpp +++ b/test/unordered/link_test_1.cpp @@ -3,10 +3,12 @@ // 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" #include #include #include "../helpers/postfix.hpp" +// clang-format on void foo(boost::unordered_set&, boost::unordered_map&, diff --git a/test/unordered/link_test_2.cpp b/test/unordered/link_test_2.cpp index 40ac9ebd..b052be17 100644 --- a/test/unordered/link_test_2.cpp +++ b/test/unordered/link_test_2.cpp @@ -3,10 +3,12 @@ // 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" #include #include #include "../helpers/postfix.hpp" +// clang-format on void foo(boost::unordered_set& x1, boost::unordered_map& x2, diff --git a/test/unordered/load_factor_tests.cpp b/test/unordered/load_factor_tests.cpp index 655cc883..dd4fbb1f 100644 --- a/test/unordered/load_factor_tests.cpp +++ b/test/unordered/load_factor_tests.cpp @@ -3,10 +3,12 @@ // 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" #include #include #include "../helpers/postfix.hpp" +// clang-format on #include "../helpers/test.hpp" #include diff --git a/test/unordered/move_tests.cpp b/test/unordered/move_tests.cpp index b04f33b0..ed5b4aa7 100644 --- a/test/unordered/move_tests.cpp +++ b/test/unordered/move_tests.cpp @@ -3,10 +3,12 @@ // 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" #include #include #include "../helpers/postfix.hpp" +// clang-format on #include "../helpers/test.hpp" #include "../objects/test.hpp" diff --git a/test/unordered/noexcept_tests.cpp b/test/unordered/noexcept_tests.cpp index 9ccc846c..bf4421a1 100644 --- a/test/unordered/noexcept_tests.cpp +++ b/test/unordered/noexcept_tests.cpp @@ -3,10 +3,12 @@ // 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" #include #include #include "../helpers/postfix.hpp" +// clang-format on #include "../helpers/test.hpp" diff --git a/test/unordered/rehash_tests.cpp b/test/unordered/rehash_tests.cpp index 01009b6d..0c3d5828 100644 --- a/test/unordered/rehash_tests.cpp +++ b/test/unordered/rehash_tests.cpp @@ -3,10 +3,12 @@ // 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" #include #include #include "../helpers/postfix.hpp" +// clang-format on #include "../helpers/test.hpp" #include "../helpers/random_values.hpp" diff --git a/test/unordered/simple_tests.cpp b/test/unordered/simple_tests.cpp index e3d0ebe1..940b031e 100644 --- a/test/unordered/simple_tests.cpp +++ b/test/unordered/simple_tests.cpp @@ -5,10 +5,12 @@ // This test checks the runtime requirements of containers. +// clang-format off #include "../helpers/prefix.hpp" #include #include #include "../helpers/postfix.hpp" +// clang-format on #include "../helpers/test.hpp" #include diff --git a/test/unordered/swap_tests.cpp b/test/unordered/swap_tests.cpp index 7814a26a..93a8f583 100644 --- a/test/unordered/swap_tests.cpp +++ b/test/unordered/swap_tests.cpp @@ -3,10 +3,12 @@ // 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" #include #include #include "../helpers/postfix.hpp" +// clang-format on #include #include diff --git a/test/unordered/unnecessary_copy_tests.cpp b/test/unordered/unnecessary_copy_tests.cpp index cb1346ba..5978b1a2 100644 --- a/test/unordered/unnecessary_copy_tests.cpp +++ b/test/unordered/unnecessary_copy_tests.cpp @@ -3,10 +3,12 @@ // 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" #include #include #include "../helpers/postfix.hpp" +// clang-format on #include #include "../helpers/test.hpp"