[libcxx] r244553 - Merging r244462:

[Hans Wennborg via cfe-commits]

Author: hans
Date: Mon Aug 10 19:55:30 2015
New Revision: 244553

URL: http://llvm.org/viewvc/llvm-project?rev=244553&view=rev
Log:
Merging r244462:
------------------------------------------------------------------------
r244462 | joerg | 2015-08-10 09:58:04 -0700 (Mon, 10 Aug 2015) | 2 lines

Protect template argument from user interference.

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

Modified:
    libcxx/branches/release_37/   (props changed)
    libcxx/branches/release_37/include/type_traits

Propchange: libcxx/branches/release_37/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug 10 19:55:30 2015
@@ -1,2 +1,2 @@
 /libcxx/branches/apple:136569-137939
-/libcxx/trunk:242377,242421,243530,243641
+/libcxx/trunk:242377,242421,243530,243641,244462

Modified: libcxx/branches/release_37/include/type_traits
URL: http://llvm.org/viewvc/llvm-project/libcxx/branches/release_37/include/type_traits?rev=244553&r1=244552&r2=244553&view=diff
==============================================================================
--- libcxx/branches/release_37/include/type_traits (original)
+++ libcxx/branches/release_37/include/type_traits Mon Aug 10 19:55:30 2015
@@ -219,8 +219,8 @@ _LIBCPP_BEGIN_NAMESPACE_STD
 template <class>
 struct __void_t { typedef void type; };
 
-template <class T>
-struct __identity { typedef T type; };
+template <class _Tp>
+struct __identity { typedef _Tp type; };
 
 template <class _Tp, bool>
 struct _LIBCPP_TYPE_VIS_ONLY __dependent_type : public _Tp {};