From efe0484110b1fbaf576bdad6d3bdfc2ffbdd500d Mon Sep 17 00:00:00 2001
From: Bill Wendling <isanbard@gmail.com>
Date: Tue, 26 Nov 2013 10:55:08 +0000
Subject: [PATCH] Merging r195693:
 ------------------------------------------------------------------------
 r195693 | joerg | 2013-11-25 14:44:20 -0800 (Mon, 25 Nov 2013) | 3 lines

Don't use T as template argument, it is part of the application
namespace.

------------------------------------------------------------------------


git-svn-id: https://llvm.org/svn/llvm-project/libcxx/branches/release_34@195733 91177308-0d34-0410-b5e6-96231b3b80d8
---
 include/ext/__hash  | 2 +-
 include/type_traits | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/ext/__hash b/include/ext/__hash
index 04975bfd..c0523cce 100644
--- a/include/ext/__hash
+++ b/include/ext/__hash
@@ -19,7 +19,7 @@
 namespace __gnu_cxx {
 using namespace std;
 
-template <typename T> struct _LIBCPP_TYPE_VIS_ONLY hash : public std::hash<T>
+template <typename _Tp> struct _LIBCPP_TYPE_VIS_ONLY hash : public std::hash<_Tp>
     { };
 
 template <> struct _LIBCPP_TYPE_VIS_ONLY hash<const char*>
diff --git a/include/type_traits b/include/type_traits
index c4afe5e1..0ad7b7f2 100644
--- a/include/type_traits
+++ b/include/type_traits
@@ -1409,7 +1409,7 @@ template <class ..._Tp> using common_type_t = typename common_type<_Tp...>::type
 
 // is_assignable
 
-template<typename, typename T> struct __select_2nd { typedef T type; };
+template<typename, typename _Tp> struct __select_2nd { typedef _Tp type; };
 
 template <class _Tp, class _Arg>
 typename __select_2nd<decltype((_VSTD::declval<_Tp>() = _VSTD::declval<_Arg>())), true_type>::type