From 549b93e629afdc258a62b701f5bbf4dd43f40331 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Mon, 17 Sep 2012 18:58:28 +0000 Subject: [PATCH] Unordered: `delete_buckets` works when `buckets_` is null. [SVN r80560] --- include/boost/unordered/detail/table.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/boost/unordered/detail/table.hpp b/include/boost/unordered/detail/table.hpp index 5ce391d6..d80760f2 100644 --- a/include/boost/unordered/detail/table.hpp +++ b/include/boost/unordered/detail/table.hpp @@ -712,7 +712,7 @@ namespace boost { namespace unordered { namespace detail { // Delete everything with current allocators before assigning // the new ones. - if (buckets_) delete_buckets(); + delete_buckets(); allocators_.assign(x.allocators_); // Copy over other data, all no throw. @@ -743,7 +743,7 @@ namespace boost { namespace unordered { namespace detail { void move_assign(table& x, true_type) { - if(buckets_) delete_buckets(); + delete_buckets(); allocators_.move_assign(x.allocators_); move_assign_no_alloc(x); } @@ -751,7 +751,7 @@ namespace boost { namespace unordered { namespace detail { void move_assign(table& x, false_type) { if (node_alloc() == x.node_alloc()) { - if(buckets_) delete_buckets(); + delete_buckets(); move_assign_no_alloc(x); } else { @@ -881,7 +881,7 @@ namespace boost { namespace unordered { namespace detail { using namespace std; if(!size_) { - if(buckets_) delete_buckets(); + delete_buckets(); bucket_count_ = policy::new_bucket_count(min_buckets); } else {