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
commit9df8f6c4728254e55890c80cf5e351363b164d2e (patch)
tree666fcca2e37be2fecd9a33d2498a7b6247b089bc
parentc0c683509681763f93a7b50832fe668a4533812d (diff)
downloadbcm5719-llvm-9df8f6c4728254e55890c80cf5e351363b164d2e.tar.gz
bcm5719-llvm-9df8f6c4728254e55890c80cf5e351363b164d2e.zip
Found a couple bugs in the test suite. No functionality change.
llvm-svn: 272679
-rw-r--r--libcxx/test/std/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp2
-rw-r--r--libcxx/test/std/containers/unord/unord.set/unord.set.swap/swap_noexcept.pass.cpp2
-rw-r--r--libcxx/test/std/experimental/memory/memory.resource.aliases/header_unordered_set_synop.pass.cpp4
3 files changed, 6 insertions, 2 deletions
diff --git a/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp b/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp
index c9f26e6cd0b..df9f18b147e 100644
--- a/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.swap/swap_noexcept.pass.cpp
+++ b/libcxx/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/libcxx/test/std/containers/unord/unord.set/unord.set.swap/swap_noexcept.pass.cpp b/libcxx/test/std/containers/unord/unord.set/unord.set.swap/swap_noexcept.pass.cpp
index c84a18cf448..d35d79b3126 100644
--- a/libcxx/test/std/containers/unord/unord.set/unord.set.swap/swap_noexcept.pass.cpp
+++ b/libcxx/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/libcxx/test/std/experimental/memory/memory.resource.aliases/header_unordered_set_synop.pass.cpp b/libcxx/test/std/experimental/memory/memory.resource.aliases/header_unordered_set_synop.pass.cpp
index 697ed50eabe..d427fe7c4ab 100644
--- a/libcxx/test/std/experimental/memory/memory.resource.aliases/header_unordered_set_synop.pass.cpp
+++ b/libcxx/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());
}
}
OpenPOWER on IntegriCloud