From c40cb50fe56087c211a488b7ede03720500061ff Mon Sep 17 00:00:00 2001 From: Daniel James Date: Mon, 31 Aug 2009 10:39:25 +0000 Subject: [PATCH] Detab. [SVN r55901] --- include/boost/unordered/detail/insert.hpp | 34 +++++++++++----------- include/boost/unordered/detail/manager.hpp | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/include/boost/unordered/detail/insert.hpp b/include/boost/unordered/detail/insert.hpp index 26520015..74702429 100644 --- a/include/boost/unordered/detail/insert.hpp +++ b/include/boost/unordered/detail/insert.hpp @@ -67,13 +67,13 @@ namespace boost { namespace unordered_detail { static bool group_equals(node_ptr it1, node_ptr it2, set_extractor*); static bool group_equals(node_ptr it1, node_ptr it2, map_extractor*); - inline node_ptr add_node(node_constructor& a, bucket_ptr bucket) - { - node_ptr n = a.release(); - this->link_node_in_bucket(n, bucket); - return n; - } - + inline node_ptr add_node(node_constructor& a, bucket_ptr bucket) + { + node_ptr n = a.release(); + this->link_node_in_bucket(n, bucket); + return n; + } + #if defined(BOOST_UNORDERED_STD_FORWARD) // Emplace (unique keys) @@ -325,15 +325,15 @@ namespace boost { namespace unordered_detail { static bool group_equals(node_ptr it1, node_ptr it2, set_extractor*); static bool group_equals(node_ptr it1, node_ptr it2, map_extractor*); - inline node_ptr add_node(node_constructor& a, bucket_ptr bucket, node_ptr pos) - { - node_ptr n = a.release(); - if(BOOST_UNORDERED_BORLAND_BOOL(pos)) - this->link_node(n, pos); - else - this->link_node_in_bucket(n, bucket); - return n; - } + inline node_ptr add_node(node_constructor& a, bucket_ptr bucket, node_ptr pos) + { + node_ptr n = a.release(); + if(BOOST_UNORDERED_BORLAND_BOOL(pos)) + this->link_node(n, pos); + else + this->link_node_in_bucket(n, bucket); + return n; + } public: @@ -585,7 +585,7 @@ namespace boost { namespace unordered_detail { { key_type const& k = extractor::extract(a.get()->value()); bucket_ptr bucket = this->get_bucket(this->bucket_index(k)); - add_node(a, bucket, find_iterator(bucket, k)); + add_node(a, bucket, find_iterator(bucket, k)); } //////////////////////////////////////////////////////////////////////////// diff --git a/include/boost/unordered/detail/manager.hpp b/include/boost/unordered/detail/manager.hpp index 0da4c674..36775f75 100644 --- a/include/boost/unordered/detail/manager.hpp +++ b/include/boost/unordered/detail/manager.hpp @@ -120,7 +120,7 @@ namespace boost { namespace unordered_detail { void hash_table_manager::destruct_node(node_ptr b) { node* raw_ptr = static_cast(&*b); - BOOST_UNORDERED_DESTRUCT(&raw_ptr->value(), value_type); + BOOST_UNORDERED_DESTRUCT(&raw_ptr->value(), value_type); real_node_ptr n(node_alloc().address(*raw_ptr)); node_alloc().destroy(n); node_alloc().deallocate(n, 1);