[libcxx] r195733 - Merging r195693:

[Bill Wendling]

Author: void
Date: Tue Nov 26 04:55:08 2013
New Revision: 195733

URL: http://llvm.org/viewvc/llvm-project?rev=195733&view=rev
Log:
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.

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

Modified:
    libcxx/branches/release_34/   (props changed)
    libcxx/branches/release_34/include/ext/__hash
    libcxx/branches/release_34/include/type_traits

Propchange: libcxx/branches/release_34/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 26 04:55:08 2013
@@ -1,2 +1,2 @@
 /libcxx/branches/apple:136569-137939
-/libcxx/trunk:195136,195143
+/libcxx/trunk:195136,195143,195693

Modified: libcxx/branches/release_34/include/ext/__hash
URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_34/include/ext/__hash?rev=195733&r1=195732&r2=195733&view=diff
==============================================================================
--- libcxx/branches/release_34/include/ext/__hash (original)
+++ libcxx/branches/release_34/include/ext/__hash Tue Nov 26 04:55:08 2013
@@ -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*>

Modified: libcxx/branches/release_34/include/type_traits
URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_34/include/type_traits?rev=195733&r1=195732&r2=195733&view=diff
==============================================================================
--- libcxx/branches/release_34/include/type_traits (original)
+++ libcxx/branches/release_34/include/type_traits Tue Nov 26 04:55:08 2013
@@ -1409,7 +1409,7 @@ template <class ..._Tp> using common_typ
 
 // 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