From c55d97b1f91291b6051da537e7a0344df9e0aad0 Mon Sep 17 00:00:00 2001
From: Joerg Sonnenberger <joerg@bec.de>
Date: Mon, 25 Nov 2013 22:44:20 +0000
Subject: Don't use T as template argument, it is part of the application
 namespace.

llvm-svn: 195693
---
 libcxx/include/ext/__hash  | 2 +-
 libcxx/include/type_traits | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'libcxx/include')

diff --git a/libcxx/include/ext/__hash b/libcxx/include/ext/__hash
index 04975bfd052..c0523cce4a2 100644
--- a/libcxx/include/ext/__hash
+++ b/libcxx/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/libcxx/include/type_traits b/libcxx/include/type_traits
index c4afe5e1042..0ad7b7f29d1 100644
--- a/libcxx/include/type_traits
+++ b/libcxx/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
-- 
cgit v1.2.3