From bfb365086b360b1fc02987b51a61235280aa4c6b Mon Sep 17 00:00:00 2001 From: paolo Date: Fri, 13 Aug 2010 13:08:09 +0000 Subject: [PATCH] 2010-08-13 Paolo Carlini * testsuite/23_containers/unordered_map/dr1189.cc: Move to... * testsuite/23_containers/unordered_map/hash_policy/dr1189.cc: ... here. * testsuite/23_containers/unordered_set/dr1189.cc: Move to... * testsuite/23_containers/unordered_set/hash_policy/dr1189.cc: ... here. * testsuite/23_containers/unordered_multimap/dr1189.cc: Move to... * testsuite/23_containers/unordered_multimap/hash_policy/dr1189.cc: ... here. * testsuite/23_containers/unordered_multiset/dr1189.cc: Move to... * testsuite/23_containers/unordered_multiset/hash_policy/dr1189.cc: ... here. * testsuite/23_containers/unordered_set/hash_policy/26132.cc: New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@163224 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 17 +++++++ .../unordered_map/{ => hash_policy}/dr1189.cc | 0 .../unordered_multimap/{ => hash_policy}/dr1189.cc | 0 .../unordered_multiset/{ => hash_policy}/dr1189.cc | 0 .../unordered_set/hash_policy/26132.cc | 57 ++++++++++++++++++++++ .../unordered_set/{ => hash_policy}/dr1189.cc | 0 6 files changed, 74 insertions(+) rename libstdc++-v3/testsuite/23_containers/unordered_map/{ => hash_policy}/dr1189.cc (100%) rename libstdc++-v3/testsuite/23_containers/unordered_multimap/{ => hash_policy}/dr1189.cc (100%) rename libstdc++-v3/testsuite/23_containers/unordered_multiset/{ => hash_policy}/dr1189.cc (100%) create mode 100644 libstdc++-v3/testsuite/23_containers/unordered_set/hash_policy/26132.cc rename libstdc++-v3/testsuite/23_containers/unordered_set/{ => hash_policy}/dr1189.cc (100%) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index f7d66a4ee78..16bbcc9a493 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,22 @@ 2010-08-13 Paolo Carlini + * testsuite/23_containers/unordered_map/dr1189.cc: Move to... + * testsuite/23_containers/unordered_map/hash_policy/dr1189.cc: + ... here. + * testsuite/23_containers/unordered_set/dr1189.cc: Move to... + * testsuite/23_containers/unordered_set/hash_policy/dr1189.cc: + ... here. + * testsuite/23_containers/unordered_multimap/dr1189.cc: Move to... + * testsuite/23_containers/unordered_multimap/hash_policy/dr1189.cc: + ... here. + * testsuite/23_containers/unordered_multiset/dr1189.cc: Move to... + * testsuite/23_containers/unordered_multiset/hash_policy/dr1189.cc: + ... here. + + * testsuite/23_containers/unordered_set/hash_policy/26132.cc: New. + +2010-08-13 Paolo Carlini + * src/ios_init.cc (ios_base::Init::~Init): Add back semicolon at the end of the _GLIBCXX_SYNCHRONIZATION_HAPPENS_* macros, removed by mistake. diff --git a/libstdc++-v3/testsuite/23_containers/unordered_map/dr1189.cc b/libstdc++-v3/testsuite/23_containers/unordered_map/hash_policy/dr1189.cc similarity index 100% rename from libstdc++-v3/testsuite/23_containers/unordered_map/dr1189.cc rename to libstdc++-v3/testsuite/23_containers/unordered_map/hash_policy/dr1189.cc diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multimap/dr1189.cc b/libstdc++-v3/testsuite/23_containers/unordered_multimap/hash_policy/dr1189.cc similarity index 100% rename from libstdc++-v3/testsuite/23_containers/unordered_multimap/dr1189.cc rename to libstdc++-v3/testsuite/23_containers/unordered_multimap/hash_policy/dr1189.cc diff --git a/libstdc++-v3/testsuite/23_containers/unordered_multiset/dr1189.cc b/libstdc++-v3/testsuite/23_containers/unordered_multiset/hash_policy/dr1189.cc similarity index 100% rename from libstdc++-v3/testsuite/23_containers/unordered_multiset/dr1189.cc rename to libstdc++-v3/testsuite/23_containers/unordered_multiset/hash_policy/dr1189.cc diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/hash_policy/26132.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/hash_policy/26132.cc new file mode 100644 index 00000000000..afa1ddd5d80 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/unordered_set/hash_policy/26132.cc @@ -0,0 +1,57 @@ +// { dg-options "-std=gnu++0x" } + +// 2010-08-13 Paolo Carlini +// +// Copyright (C) 2010 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +#include +#include + +// libstdc++/26132 +void test01() +{ + bool test __attribute__((unused)) = true; + + for (float lf = 1.0; lf < 101.0; lf *= 10.0) + for (int size = 1; size <= 6561; size *= 3) + { + std::unordered_set us1; + typedef std::unordered_set::size_type size_type; + + us1.max_load_factor(10.0); + + for (int i = 0; i < size; ++i) + us1.insert(i); + + us1.max_load_factor(lf); + + for (int i = 1; i <= 6561; i *= 81) + { + const size_type n = size * 81 / i; + us1.rehash(n); + VERIFY( us1.bucket_count() > us1.size() / us1.max_load_factor() ); + VERIFY( us1.bucket_count() >= n ); + } + } +} + +int main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/23_containers/unordered_set/dr1189.cc b/libstdc++-v3/testsuite/23_containers/unordered_set/hash_policy/dr1189.cc similarity index 100% rename from libstdc++-v3/testsuite/23_containers/unordered_set/dr1189.cc rename to libstdc++-v3/testsuite/23_containers/unordered_set/hash_policy/dr1189.cc -- 2.11.0