[cfe-commits] [libcxx] r122825 - in /libcxx/trunk: CREDITS.TXT include/map

[Howard Hinnant]

Author: hhinnant
Date: Tue Jan  4 13:21:05 2011
New Revision: 122825

URL: http://llvm.org/viewvc/llvm-project?rev=122825&view=rev
Log:
Marshall Clow's fix for Bug 8421.

Modified:
    libcxx/trunk/CREDITS.TXT
    libcxx/trunk/include/map

Modified: libcxx/trunk/CREDITS.TXT
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/CREDITS.TXT?rev=122825&r1=122824&r2=122825&view=diff
==============================================================================
--- libcxx/trunk/CREDITS.TXT (original)
+++ libcxx/trunk/CREDITS.TXT Tue Jan  4 13:21:05 2011
@@ -12,4 +12,7 @@
 E: hhinnant at apple.com
 D: Architect and primary author of libc++
 
-
+N: Marshall Clow
+E: marshall at idio.com
+E: mclow at qualcomm.com
+D: Minor patches and bug fixes.

Modified: libcxx/trunk/include/map
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/map?rev=122825&r1=122824&r2=122825&view=diff
==============================================================================
--- libcxx/trunk/include/map (original)
+++ libcxx/trunk/include/map Tue Jan  4 13:21:05 2011
@@ -350,7 +350,7 @@
 class __map_value_compare
     : private _Compare
 {
-    typedef pair<_Key, _Tp> _P;
+    typedef pair<typename std::remove_const<_Key>::type, _Tp> _P;
     typedef pair<const _Key, _Tp> _CP;
 public:
     _LIBCPP_INLINE_VISIBILITY
@@ -393,7 +393,7 @@
 {
     _Compare comp;
 
-    typedef pair<_Key, _Tp> _P;
+    typedef pair<typename std::remove_const<_Key>::type, _Tp> _P;
     typedef pair<const _Key, _Tp> _CP;
 
 public: