diff options
| author | Tor Egge <Tor.Egge@broadpark.no> | 2019-06-06 23:03:44 +0200 |
|---|---|---|
| committer | Tor Egge <Tor.Egge@broadpark.no> | 2019-06-06 23:03:44 +0200 |
| commit | 0c9a9e119605dddd51ebc7a8b760f705760996db (patch) | |
| tree | c8fab08923a069fdb401290628c154d848fc950d /vespalib | |
| parent | 842d1d79e6f429c13805207b7a516445abaa6446 (diff) | |
Use normal unordered set.
Diffstat (limited to 'vespalib')
| -rw-r--r-- | vespalib/src/tests/stllike/lookup_benchmark.cpp | 4 | ||||
| -rw-r--r-- | vespalib/src/tests/stllike/uniq_by_sort_map_hash.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/vespalib/src/tests/stllike/lookup_benchmark.cpp b/vespalib/src/tests/stllike/lookup_benchmark.cpp index 4f65bebe560..8ac895a3499 100644 --- a/vespalib/src/tests/stllike/lookup_benchmark.cpp +++ b/vespalib/src/tests/stllike/lookup_benchmark.cpp @@ -4,7 +4,7 @@ #include <cstdio> #include <map> #include <set> -#include <tr1/unordered_set> +#include <unordered_set> #include <vector> #include <algorithm> #include <vespa/vespalib/stllike/hash_set.hpp> @@ -67,7 +67,7 @@ size_t benchMap(size_t sz, size_t numLookups) size_t benchHashStl(size_t sz, size_t numLookups) { - std::tr1::unordered_set<uint32_t> set; + std::unordered_set<uint32_t> set; return bench(set, sz, numLookups); } diff --git a/vespalib/src/tests/stllike/uniq_by_sort_map_hash.cpp b/vespalib/src/tests/stllike/uniq_by_sort_map_hash.cpp index a070bcd15cf..3041627b2d0 100644 --- a/vespalib/src/tests/stllike/uniq_by_sort_map_hash.cpp +++ b/vespalib/src/tests/stllike/uniq_by_sort_map_hash.cpp @@ -4,7 +4,7 @@ #include <stdio.h> #include <map> #include <set> -#include <tr1/unordered_set> +#include <unordered_set> #include <vector> #include <algorithm> #include <vespa/vespalib/stllike/hash_set.hpp> @@ -130,7 +130,7 @@ size_t benchMapIntelligent(const std::vector<Slot *> & v) size_t benchHashStl(const std::vector<Slot *> & v) { size_t uniq(0); - typedef std::tr1::unordered_set< Gid, Gid::hash > M; + typedef std::unordered_set< Gid, Gid::hash > M; M set(v.size()); for(size_t i(0), m(v.size()); i < m; i++) { const Slot & s = *v[i]; @@ -145,7 +145,7 @@ size_t benchHashStl(const std::vector<Slot *> & v) size_t benchHashStlIntelligent(const std::vector<Slot *> & v) { size_t uniq(0); - typedef std::tr1::unordered_set< Gid, Gid::hash > M; + typedef std::unordered_set< Gid, Gid::hash > M; M set(v.size()); for(size_t i(0), m(v.size()); i < m; i++) { const Slot & s = *v[i]; @@ -160,7 +160,7 @@ size_t benchHashStlIntelligent(const std::vector<Slot *> & v) size_t benchHashStlFastAlloc(const std::vector<Slot *> & v) { size_t uniq(0); - std::tr1::unordered_set< Gid, Gid::hash, std::equal_to<Gid>, RoundRobinAllocator<Gid> > set(v.size()); + std::unordered_set< Gid, Gid::hash, std::equal_to<Gid>, RoundRobinAllocator<Gid> > set(v.size()); for(size_t i(0), m(v.size()); i < m; i++) { const Slot & s = *v[i]; if (set.find(s.getGid()) == set.end()) { |