summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2016-06-14 15:25:46 +0000
committerMarshall Clow <mclow.lists@gmail.com>2016-06-14 15:25:46 +0000
commit174432dbd52dddcb683ef14b3c8de083cad9d28c (patch)
tree03ea50d60d8fbf71085204f6e369b0bda83c2ffc
parentd9e1819ef45a53776ff5def3ab6f8c94445fef06 (diff)
downloadexternal_libcxx-174432dbd52dddcb683ef14b3c8de083cad9d28c.tar.gz
external_libcxx-174432dbd52dddcb683ef14b3c8de083cad9d28c.tar.bz2
external_libcxx-174432dbd52dddcb683ef14b3c8de083cad9d28c.zip
Found a couple bugs in the test suite. No functionality change.
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@272679 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--test/std/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp2
-rw-r--r--test/std/containers/unord/unord.set/unord.set.swap/swap_noexcept.pass.cpp2
-rw-r--r--test/std/experimental/memory/memory.resource.aliases/header_unordered_set_synop.pass.cpp4
3 files changed, 6 insertions, 2 deletions
diff --git a/test/std/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp b/test/std/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp
index c9f26e6cd..df9f18b14 100644
--- a/test/std/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp
+++ b/test/std/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp
@@ -63,6 +63,7 @@ struct some_hash
typedef T value_type;
some_hash() {}
some_hash(const some_hash&);
+ std::size_t operator()(const T&) const { return 0; }
};
template <class T>
@@ -71,6 +72,7 @@ struct some_hash2
typedef T value_type;
some_hash2() {}
some_hash2(const some_hash2&);
+ std::size_t operator()(const T&) const { return 0; }
};
#if TEST_STD_VER >= 14
diff --git a/test/std/containers/unord/unord.set/unord.set.swap/swap_noexcept.pass.cpp b/test/std/containers/unord/unord.set/unord.set.swap/swap_noexcept.pass.cpp
index c84a18cf4..d35d79b31 100644
--- a/test/std/containers/unord/unord.set/unord.set.swap/swap_noexcept.pass.cpp
+++ b/test/std/containers/unord/unord.set/unord.set.swap/swap_noexcept.pass.cpp
@@ -63,6 +63,7 @@ struct some_hash
typedef T value_type;
some_hash() {}
some_hash(const some_hash&);
+ std::size_t operator()(const T&) const { return 0; }
};
template <class T>
@@ -71,6 +72,7 @@ struct some_hash2
typedef T value_type;
some_hash2() {}
some_hash2(const some_hash2&);
+ std::size_t operator()(const T&) const { return 0; }
};
#if TEST_STD_VER >= 14
diff --git a/test/std/experimental/memory/memory.resource.aliases/header_unordered_set_synop.pass.cpp b/test/std/experimental/memory/memory.resource.aliases/header_unordered_set_synop.pass.cpp
index 697ed50ea..d427fe7c4 100644
--- a/test/std/experimental/memory/memory.resource.aliases/header_unordered_set_synop.pass.cpp
+++ b/test/std/experimental/memory/memory.resource.aliases/header_unordered_set_synop.pass.cpp
@@ -60,7 +60,7 @@ int main()
static_assert(std::is_same<StdSet, PmrSet>::value, "");
}
{
- pmr::unordered_set<int, int> m;
+ pmr::unordered_set<int> m;
assert(m.get_allocator().resource() == pmr::get_default_resource());
}
{
@@ -79,7 +79,7 @@ int main()
static_assert(std::is_same<StdSet, PmrSet>::value, "");
}
{
- pmr::unordered_multiset<int, int> m;
+ pmr::unordered_multiset<int> m;
assert(m.get_allocator().resource() == pmr::get_default_resource());
}
}