From c6da5c57fead12d9bca40a08bbe6a29585ceeb47 Mon Sep 17 00:00:00 2001
From: "Stephan T. Lavavej" <stl@exchange.microsoft.com>
Date: Wed, 14 Nov 2018 23:23:55 +0000
Subject: [PATCH] [libcxx] [test] Fix Clang -Wunused-local-typedef warnings.

C++11's [hash.requirements] never required these typedefs from users.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@346912 91177308-0d34-0410-b5e6-96231b3b80d8
---
 .../unord/unord.map/unord.map.modifiers/merge.pass.cpp       | 5 -----
 .../unord.multimap/unord.multimap.modifiers/merge.pass.cpp   | 5 -----
 test/std/containers/unord/unord.multiset/merge.pass.cpp      | 5 -----
 test/std/containers/unord/unord.set/merge.pass.cpp           | 5 -----
 4 files changed, 20 deletions(-)

diff --git a/test/std/containers/unord/unord.map/unord.map.modifiers/merge.pass.cpp b/test/std/containers/unord/unord.map/unord.map.modifiers/merge.pass.cpp
index 16fc85fd9..2d5e1843f 100644
--- a/test/std/containers/unord/unord.map/unord.map.modifiers/merge.pass.cpp
+++ b/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/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/merge.pass.cpp b/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/merge.pass.cpp
index 5c75d7792..b7f61ca5a 100644
--- a/test/std/containers/unord/unord.multimap/unord.multimap.modifiers/merge.pass.cpp
+++ b/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/test/std/containers/unord/unord.multiset/merge.pass.cpp b/test/std/containers/unord/unord.multiset/merge.pass.cpp
index abf8aa57d..7913f9564 100644
--- a/test/std/containers/unord/unord.multiset/merge.pass.cpp
+++ b/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/test/std/containers/unord/unord.set/merge.pass.cpp b/test/std/containers/unord/unord.set/merge.pass.cpp
index 973d2d93c..519d7f138 100644
--- a/test/std/containers/unord/unord.set/merge.pass.cpp
+++ b/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); }
     };
     {