feedc0de/boost_unordered
1
0
Fork 0
forked from boostorg/unordered
Code Pull Requests Activity

Reformat

Browse Source
This commit is contained in:
Daniel James
2017-05-01 21:03:11 +01:00
parent 35522d3ee0
commit 2e14c340a8
5 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/boost/unordered/detail/implementation.hpp
View File

@ -13,13 +13,13 @@
#pragma once #pragma once
#endif #endif
#include <boost/predef.h>
#include <boost/assert.hpp> #include <boost/assert.hpp>
#include <boost/detail/no_exceptions_support.hpp> #include <boost/detail/no_exceptions_support.hpp>
#include <boost/detail/select_type.hpp> #include <boost/detail/select_type.hpp>
#include <boost/iterator/iterator_categories.hpp> #include <boost/iterator/iterator_categories.hpp>
#include <boost/limits.hpp> #include <boost/limits.hpp>
#include <boost/move/move.hpp> #include <boost/move/move.hpp>
#include <boost/predef.h>
#include <boost/preprocessor/arithmetic/inc.hpp> #include <boost/preprocessor/arithmetic/inc.hpp>
#include <boost/preprocessor/cat.hpp> #include <boost/preprocessor/cat.hpp>
#include <boost/preprocessor/repetition/enum.hpp> #include <boost/preprocessor/repetition/enum.hpp>
@ -1965,8 +1965,7 @@ struct cl_iterator
{ {
} }
cl_iterator( cl_iterator(boost::unordered::iterator_detail::l_iterator<Node> const& x)
boost::unordered::iterator_detail::l_iterator<Node> const& x)
BOOST_NOEXCEPT : ptr_(x.ptr_), BOOST_NOEXCEPT : ptr_(x.ptr_),
bucket_(x.bucket_), bucket_(x.bucket_),
bucket_count_(x.bucket_count_) bucket_count_(x.bucket_count_)

6
include/boost/unordered/detail/set.hpp
View File

@ -35,10 +35,8 @@ template <typename A, typename T, typename H, typename P> struct set
typedef boost::unordered::iterator_detail::c_iterator<node> iterator; typedef boost::unordered::iterator_detail::c_iterator<node> iterator;
typedef boost::unordered::iterator_detail::c_iterator<node> c_iterator; typedef boost::unordered::iterator_detail::c_iterator<node> c_iterator;
typedef boost::unordered::iterator_detail::cl_iterator<node> typedef boost::unordered::iterator_detail::cl_iterator<node> l_iterator;
l_iterator; typedef boost::unordered::iterator_detail::cl_iterator<node> cl_iterator;
typedef boost::unordered::iterator_detail::cl_iterator<node>
cl_iterator;
typedef boost::unordered::node_handle_set<node, T, A> node_type; typedef boost::unordered::node_handle_set<node, T, A> node_type;
typedef boost::unordered::insert_return_type_set<node, T, A> typedef boost::unordered::insert_return_type_set<node, T, A>

9
test/unordered/merge_tests.cpp
View File

@ -170,8 +170,8 @@ void merge_into_empty_test(X*, test::random_generator generator)
} }
template <class X1, class X2> template <class X1, class X2>
void merge_into_unique_keys_test( void merge_into_unique_keys_test(X1*, X2*, int hash_equal1, int hash_equal2,
X1*, X2*, int hash_equal1, int hash_equal2, test::random_generator generator) test::random_generator generator)
{ {
test::check_instances check_; test::check_instances check_;
@ -206,8 +206,8 @@ void merge_into_unique_keys_test(
} }
template <class X1, class X2> template <class X1, class X2>
void merge_into_equiv_keys_test( void merge_into_equiv_keys_test(X1*, X2*, int hash_equal1, int hash_equal2,
X1*, X2*, int hash_equal1, int hash_equal2, test::random_generator generator) test::random_generator generator)
{ {
test::check_instances check_; test::check_instances check_;
@ -339,7 +339,6 @@ UNORDERED_TEST(merge_into_equiv_keys_test,
((0)(1)(2)) ((0)(1)(2))
((default_generator)(generate_collisions))) ((default_generator)(generate_collisions)))
// clang-format on // clang-format on
} }
RUN_TESTS() RUN_TESTS()