From d262b368d54b3e6deba47f345b7c8e8460b5f0a3 Mon Sep 17 00:00:00 2001
From: Eric Fiselier <eric@efcs.ca>
Date: Wed, 10 Feb 2016 21:58:36 +0000
Subject: [PATCH] Remove changes that snuck in within r260431

llvm-svn: 260443
---
 libcxx/include/unordered_map | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/libcxx/include/unordered_map b/libcxx/include/unordered_map
index a05c2b5..89407b0 100644
--- a/libcxx/include/unordered_map
+++ b/libcxx/include/unordered_map
@@ -384,7 +384,6 @@ template <class _Key, class _Cp, class _Hash,
 class __unordered_map_hasher
     : private _Hash
 {
-  typedef typename __key_value_types<_Cp>::__map_value_type _PairT;
 public:
     _LIBCPP_INLINE_VISIBILITY
     __unordered_map_hasher()
@@ -414,8 +413,6 @@ template <class _Key, class _Cp, class _Hash>
 class __unordered_map_hasher<_Key, _Cp, _Hash, false>
 {
     _Hash __hash_;
-
-    typedef typename __key_value_types<_Cp>::__map_value_type _PairT;
 public:
     _LIBCPP_INLINE_VISIBILITY
     __unordered_map_hasher()
@@ -457,7 +454,6 @@ template <class _Key, class _Cp, class _Pred,
 class __unordered_map_equal
     : private _Pred
 {
-   typedef typename __key_value_types<_Cp>::__map_value_type _PairT;
 public:
     _LIBCPP_INLINE_VISIBILITY
     __unordered_map_equal()
@@ -490,8 +486,6 @@ template <class _Key, class _Cp, class _Pred>
 class __unordered_map_equal<_Key, _Cp, _Pred, false>
 {
     _Pred __pred_;
-
-    typedef typename __key_value_types<_Cp>::__map_value_type _PairT;
 public:
     _LIBCPP_INLINE_VISIBILITY
     __unordered_map_equal()
@@ -512,9 +506,6 @@ public:
     _LIBCPP_INLINE_VISIBILITY
     bool operator()(const _Key& __x, const _Cp& __y) const
         {return __pred_(__x, __y.__cc.first);}
-  _LIBCPP_INLINE_VISIBILITY
-    bool operator()(const _Key& __x, const _PairT& __y) const
-        {return __pred_(__x, __y.first);}
     void swap(__unordered_map_equal&__y)
         _NOEXCEPT_(__is_nothrow_swappable<_Pred>::value)
     {
-- 
2.7.4