From 2e14c340a8da5429af0d5699e1b8f675d43c5428 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Mon, 1 May 2017 21:03:11 +0100 Subject: [PATCH] Reformat --- include/boost/unordered/detail/implementation.hpp | 13 ++++++------- include/boost/unordered/detail/set.hpp | 6 ++---- include/boost/unordered/unordered_map.hpp | 8 ++++---- include/boost/unordered/unordered_set.hpp | 8 ++++---- test/unordered/merge_tests.cpp | 9 ++++----- 5 files changed, 20 insertions(+), 24 deletions(-) diff --git a/include/boost/unordered/detail/implementation.hpp b/include/boost/unordered/detail/implementation.hpp index f006a03b..c6aa43cf 100644 --- a/include/boost/unordered/detail/implementation.hpp +++ b/include/boost/unordered/detail/implementation.hpp @@ -13,13 +13,13 @@ #pragma once #endif -#include #include #include #include #include #include #include +#include #include #include #include @@ -114,7 +114,7 @@ // #if defined(BOOST_UNORDERED_TUPLE_ARGS) -#elif BOOST_COMP_SUNPRO && BOOST_COMP_SUNPRO < BOOST_VERSION_NUMBER(5,21,0) +#elif BOOST_COMP_SUNPRO && BOOST_COMP_SUNPRO < BOOST_VERSION_NUMBER(5, 21, 0) // I had problems with tuples on older versions of the sunpro. // Might be fixed in an earlier version than I specified here. #define BOOST_UNORDERED_TUPLE_ARGS 0 @@ -242,7 +242,7 @@ template struct prime_list_template { static std::size_t const value[]; -#if !(BOOST_COMP_SUNPRO && BOOST_COMP_SUNPRO < BOOST_VERSION_NUMBER(5,21,0)) +#if !(BOOST_COMP_SUNPRO && BOOST_COMP_SUNPRO < BOOST_VERSION_NUMBER(5, 21, 0)) static std::ptrdiff_t const length; #else static std::ptrdiff_t const length = @@ -254,7 +254,7 @@ template std::size_t const prime_list_template::value[] = { BOOST_PP_SEQ_ENUM(BOOST_UNORDERED_PRIMES)}; -#if !(BOOST_COMP_SUNPRO && BOOST_COMP_SUNPRO < BOOST_VERSION_NUMBER(5,21,0)) +#if !(BOOST_COMP_SUNPRO && BOOST_COMP_SUNPRO < BOOST_VERSION_NUMBER(5, 21, 0)) template std::ptrdiff_t const prime_list_template::length = BOOST_PP_SEQ_SIZE( BOOST_UNORDERED_PRIMES); @@ -1308,7 +1308,7 @@ inline void construct_value(T* address, BOOST_FWD_REF(A0) a0) // // Used to emulate piecewise construction. -#if !(BOOST_COMP_SUNPRO && BOOST_COMP_SUNPRO < BOOST_VERSION_NUMBER(5,21,0)) +#if !(BOOST_COMP_SUNPRO && BOOST_COMP_SUNPRO < BOOST_VERSION_NUMBER(5, 21, 0)) #define BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE(z, n, namespace_) \ template const& x) + cl_iterator(boost::unordered::iterator_detail::l_iterator const& x) BOOST_NOEXCEPT : ptr_(x.ptr_), bucket_(x.bucket_), bucket_count_(x.bucket_count_) diff --git a/include/boost/unordered/detail/set.hpp b/include/boost/unordered/detail/set.hpp index 634ebd46..a1649917 100644 --- a/include/boost/unordered/detail/set.hpp +++ b/include/boost/unordered/detail/set.hpp @@ -35,10 +35,8 @@ template struct set typedef boost::unordered::iterator_detail::c_iterator iterator; typedef boost::unordered::iterator_detail::c_iterator c_iterator; - typedef boost::unordered::iterator_detail::cl_iterator - l_iterator; - typedef boost::unordered::iterator_detail::cl_iterator - cl_iterator; + typedef boost::unordered::iterator_detail::cl_iterator l_iterator; + typedef boost::unordered::iterator_detail::cl_iterator cl_iterator; typedef boost::unordered::node_handle_set node_type; typedef boost::unordered::insert_return_type_set diff --git a/include/boost/unordered/unordered_map.hpp b/include/boost/unordered/unordered_map.hpp index 95e614ba..4a90d667 100644 --- a/include/boost/unordered/unordered_map.hpp +++ b/include/boost/unordered/unordered_map.hpp @@ -230,7 +230,7 @@ template class unordered_map #else -#if !(BOOST_COMP_SUNPRO && BOOST_COMP_SUNPRO < BOOST_VERSION_NUMBER(5,21,0)) +#if !(BOOST_COMP_SUNPRO && BOOST_COMP_SUNPRO < BOOST_VERSION_NUMBER(5, 21, 0)) // 0 argument emplace requires special treatment in case // the container is instantiated with a value type that @@ -292,7 +292,7 @@ template class unordered_map #else -#if !(BOOST_COMP_SUNPRO && BOOST_COMP_SUNPRO < BOOST_VERSION_NUMBER(5,21,0)) +#if !(BOOST_COMP_SUNPRO && BOOST_COMP_SUNPRO < BOOST_VERSION_NUMBER(5, 21, 0)) iterator emplace_hint(const_iterator hint, boost::unordered::detail::empty_emplace = @@ -1031,7 +1031,7 @@ template class unordered_multimap #else -#if !(BOOST_COMP_SUNPRO && BOOST_COMP_SUNPRO < BOOST_VERSION_NUMBER(5,21,0)) +#if !(BOOST_COMP_SUNPRO && BOOST_COMP_SUNPRO < BOOST_VERSION_NUMBER(5, 21, 0)) // 0 argument emplace requires special treatment in case // the container is instantiated with a value type that @@ -1091,7 +1091,7 @@ template class unordered_multimap #else -#if !(BOOST_COMP_SUNPRO && BOOST_COMP_SUNPRO < BOOST_VERSION_NUMBER(5,21,0)) +#if !(BOOST_COMP_SUNPRO && BOOST_COMP_SUNPRO < BOOST_VERSION_NUMBER(5, 21, 0)) iterator emplace_hint(const_iterator hint, boost::unordered::detail::empty_emplace = diff --git a/include/boost/unordered/unordered_set.hpp b/include/boost/unordered/unordered_set.hpp index de8b6ea7..4d6dd544 100644 --- a/include/boost/unordered/unordered_set.hpp +++ b/include/boost/unordered/unordered_set.hpp @@ -228,7 +228,7 @@ template class unordered_set #else -#if !(BOOST_COMP_SUNPRO && BOOST_COMP_SUNPRO < BOOST_VERSION_NUMBER(5,21,0)) +#if !(BOOST_COMP_SUNPRO && BOOST_COMP_SUNPRO < BOOST_VERSION_NUMBER(5, 21, 0)) // 0 argument emplace requires special treatment in case // the container is instantiated with a value type that @@ -290,7 +290,7 @@ template class unordered_set #else -#if !(BOOST_COMP_SUNPRO && BOOST_COMP_SUNPRO < BOOST_VERSION_NUMBER(5,21,0)) +#if !(BOOST_COMP_SUNPRO && BOOST_COMP_SUNPRO < BOOST_VERSION_NUMBER(5, 21, 0)) iterator emplace_hint(const_iterator hint, boost::unordered::detail::empty_emplace = @@ -737,7 +737,7 @@ template class unordered_multiset #else -#if !(BOOST_COMP_SUNPRO && BOOST_COMP_SUNPRO < BOOST_VERSION_NUMBER(5,21,0)) +#if !(BOOST_COMP_SUNPRO && BOOST_COMP_SUNPRO < BOOST_VERSION_NUMBER(5, 21, 0)) // 0 argument emplace requires special treatment in case // the container is instantiated with a value type that @@ -797,7 +797,7 @@ template class unordered_multiset #else -#if !(BOOST_COMP_SUNPRO && BOOST_COMP_SUNPRO < BOOST_VERSION_NUMBER(5,21,0)) +#if !(BOOST_COMP_SUNPRO && BOOST_COMP_SUNPRO < BOOST_VERSION_NUMBER(5, 21, 0)) iterator emplace_hint(const_iterator hint, boost::unordered::detail::empty_emplace = diff --git a/test/unordered/merge_tests.cpp b/test/unordered/merge_tests.cpp index 59b0b4a5..39f986f6 100644 --- a/test/unordered/merge_tests.cpp +++ b/test/unordered/merge_tests.cpp @@ -170,8 +170,8 @@ void merge_into_empty_test(X*, test::random_generator generator) } template -void merge_into_unique_keys_test( - X1*, X2*, int hash_equal1, int hash_equal2, test::random_generator generator) +void merge_into_unique_keys_test(X1*, X2*, int hash_equal1, int hash_equal2, + test::random_generator generator) { test::check_instances check_; @@ -206,8 +206,8 @@ void merge_into_unique_keys_test( } template -void merge_into_equiv_keys_test( - X1*, X2*, int hash_equal1, int hash_equal2, test::random_generator generator) +void merge_into_equiv_keys_test(X1*, X2*, int hash_equal1, int hash_equal2, + test::random_generator generator) { test::check_instances check_; @@ -339,7 +339,6 @@ UNORDERED_TEST(merge_into_equiv_keys_test, ((0)(1)(2)) ((default_generator)(generate_collisions))) // clang-format on - } RUN_TESTS()