summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libcxx/test/std/containers/unord/unord.map/unord.map.modifiers/merge.pass.cpp5
-rw-r--r--libcxx/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/merge.pass.cpp5
-rw-r--r--libcxx/test/std/containers/unord/unord.multiset/merge.pass.cpp5
-rw-r--r--libcxx/test/std/containers/unord/unord.set/merge.pass.cpp5
4 files changed, 0 insertions, 20 deletions
diff --git a/libcxx/test/std/containers/unord/unord.map/unord.map.modifiers/merge.pass.cpp b/libcxx/test/std/containers/unord/unord.map/unord.map.modifiers/merge.pass.cpp
index 16fc85fd954..2d5e1843fd2 100644
--- a/libcxx/test/std/containers/unord/unord.map/unord.map.modifiers/merge.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.map/unord.map.modifiers/merge.pass.cpp
@@ -41,9 +41,6 @@ struct throw_hasher
throw_hasher(bool& should_throw) : should_throw_(should_throw) {}
- typedef size_t result_type;
- typedef T argument_type;
-
size_t operator()(const T& p) const
{
if (should_throw_)
@@ -99,8 +96,6 @@ int main()
struct hasher
{
hasher() = default;
- typedef Counter<int> argument_type;
- typedef size_t result_type;
size_t operator()(const Counter<int>& p) const
{
return std::hash<Counter<int>>()(p);
diff --git a/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/merge.pass.cpp b/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/merge.pass.cpp
index 5c75d7792ab..b7f61ca5adc 100644
--- a/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/merge.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/merge.pass.cpp
@@ -41,9 +41,6 @@ struct throw_hasher
throw_hasher(bool& should_throw) : should_throw_(should_throw) {}
- typedef size_t result_type;
- typedef T argument_type;
-
size_t operator()(const T& p) const
{
if (should_throw_)
@@ -99,8 +96,6 @@ int main()
struct hasher
{
hasher() = default;
- typedef Counter<int> argument_type;
- typedef size_t result_type;
size_t operator()(const Counter<int>& p) const
{
return std::hash<Counter<int>>()(p);
diff --git a/libcxx/test/std/containers/unord/unord.multiset/merge.pass.cpp b/libcxx/test/std/containers/unord/unord.multiset/merge.pass.cpp
index abf8aa57dc4..7913f956436 100644
--- a/libcxx/test/std/containers/unord/unord.multiset/merge.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.multiset/merge.pass.cpp
@@ -41,9 +41,6 @@ struct throw_hasher
throw_hasher(bool& should_throw) : should_throw_(should_throw) {}
- typedef size_t result_type;
- typedef T argument_type;
-
size_t operator()(const T& p) const
{
if (should_throw_)
@@ -99,8 +96,6 @@ int main()
struct hasher
{
hasher() = default;
- typedef Counter<int> argument_type;
- typedef size_t result_type;
size_t operator()(const Counter<int>& p) const { return std::hash<Counter<int>>()(p); }
};
{
diff --git a/libcxx/test/std/containers/unord/unord.set/merge.pass.cpp b/libcxx/test/std/containers/unord/unord.set/merge.pass.cpp
index 973d2d93ca7..519d7f13854 100644
--- a/libcxx/test/std/containers/unord/unord.set/merge.pass.cpp
+++ b/libcxx/test/std/containers/unord/unord.set/merge.pass.cpp
@@ -41,9 +41,6 @@ struct throw_hasher
throw_hasher(bool& should_throw) : should_throw_(should_throw) {}
- typedef size_t result_type;
- typedef T argument_type;
-
size_t operator()(const T& p) const
{
if (should_throw_)
@@ -99,8 +96,6 @@ int main()
struct hasher
{
hasher() = default;
- typedef Counter<int> argument_type;
- typedef size_t result_type;
size_t operator()(const Counter<int>& p) const { return std::hash<Counter<int>>()(p); }
};
{
OpenPOWER on IntegriCloud