aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3
diff options
context:
space:
mode:
authorFrançois Dumont <fdumont@gcc.gnu.org>2012-09-24 19:48:06 +0000
committerFrançois Dumont <fdumont@gcc.gnu.org>2012-09-24 19:48:06 +0000
commite6fa043b2d9cecafcedc5d1b090db5b636c9a0b4 (patch)
tree968002ca0b8beafb7cf29f8aba9676fa57e4fe3a /libstdc++-v3
parentf08d73d161d15ee7325dab2d6b793e5d05670ebb (diff)
downloadgcc-e6fa043b2d9cecafcedc5d1b090db5b636c9a0b4.zip
gcc-e6fa043b2d9cecafcedc5d1b090db5b636c9a0b4.tar.gz
gcc-e6fa043b2d9cecafcedc5d1b090db5b636c9a0b4.tar.bz2
41975.cc: Use __uset_hashtable rather than removed __unordered_set.
2012-09-24 François Dumont <fdumont@gcc.gnu.org> * testsuite/performance/23_containers/insert_erase/41975.cc: Use __uset_hashtable rather than removed __unordered_set. From-SVN: r191678
Diffstat (limited to 'libstdc++-v3')
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/testsuite/performance/23_containers/insert_erase/41975.cc12
2 files changed, 12 insertions, 5 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 70ee2a8..920bd33 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2012-09-24 François Dumont <fdumont@gcc.gnu.org>
+
+ * testsuite/performance/23_containers/insert_erase/41975.cc: Use
+ __uset_hashtable rather than removed __unordered_set.
+
2012-09-23 Paolo Carlini <paolo.carlini@oracle.com>
Revert:
diff --git a/libstdc++-v3/testsuite/performance/23_containers/insert_erase/41975.cc b/libstdc++-v3/testsuite/performance/23_containers/insert_erase/41975.cc
index a5dae41..286a045 100644
--- a/libstdc++-v3/testsuite/performance/23_containers/insert_erase/41975.cc
+++ b/libstdc++-v3/testsuite/performance/23_containers/insert_erase/41975.cc
@@ -40,8 +40,9 @@ namespace
const int nb = 200000;
start_counters(time, resource);
- std::__unordered_set<int, std::hash<int>, std::equal_to<int>,
- std::allocator<int>, use_cache> us;
+ std::__uset_hashtable<int, std::hash<int>, std::equal_to<int>,
+ std::allocator<int>,
+ std::__uset_traits<use_cache>> us;
for (int i = 0; i != nb; ++i)
us.insert(i);
@@ -125,9 +126,10 @@ namespace
start_counters(time, resource);
- std::__unordered_set<std::string, std::hash<std::string>,
- std::equal_to<std::string>,
- std::allocator<std::string>, use_cache> us;
+ std::__uset_hashtable<std::string, std::hash<std::string>,
+ std::equal_to<std::string>,
+ std::allocator<std::string>,
+ std::__uset_traits<use_cache>> us;
for (int i = 0; i != nb; ++i)
us.insert(strs[i]);