aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3/include
diff options
context:
space:
mode:
authorFrançois Dumont <fdumont@gcc.gnu.org>2012-11-08 20:16:04 +0000
committerFrançois Dumont <fdumont@gcc.gnu.org>2012-11-08 20:16:04 +0000
commitecf07a67d0e8cc33b780783d9996a0e91a6239a2 (patch)
tree1a19c993748ad806a6a8754863138e86283b4eca /libstdc++-v3/include
parent68a559809331d754474191b2272cc7e4a960b65c (diff)
downloadgcc-ecf07a67d0e8cc33b780783d9996a0e91a6239a2.zip
gcc-ecf07a67d0e8cc33b780783d9996a0e91a6239a2.tar.gz
gcc-ecf07a67d0e8cc33b780783d9996a0e91a6239a2.tar.bz2
re PR libstdc++/54075 ([4.7.1] unordered_map insert still slower than 4.6.2)
2012-11-08 François Dumont <fdumont@gcc.gnu.org> PR libstdc++/54075 * include/bits/hashtable.h (_Hashtable<>::rehash): Reset hash policy state if no rehash. * testsuite/23_containers/unordered_set/modifiers/reserve.cc (test02): New. From-SVN: r193339
Diffstat (limited to 'libstdc++-v3/include')
-rw-r--r--libstdc++-v3/include/bits/hashtable.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/libstdc++-v3/include/bits/hashtable.h b/libstdc++-v3/include/bits/hashtable.h
index 8ceacab..9b2677b 100644
--- a/libstdc++-v3/include/bits/hashtable.h
+++ b/libstdc++-v3/include/bits/hashtable.h
@@ -1654,6 +1654,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
// level.
_M_rehash_policy._M_prev_resize = 0;
}
+ else
+ // No rehash, restore previous state to keep a consistent state.
+ _M_rehash_policy._M_reset(__saved_state);
}
template<typename _Key, typename _Value,