summaryrefslogtreecommitdiffstats
path: root/libcxx/include/map
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2011-01-04 19:21:05 +0000
committerHoward Hinnant <hhinnant@apple.com>2011-01-04 19:21:05 +0000
commitab061a656dcae92dadb874a872b7c90bac7d13ca (patch)
tree91ef5094411ccabdeebb25cec90ec851fc78f044 /libcxx/include/map
parent0caac444fa210130e61156a4441f1c9aad814046 (diff)
downloadbcm5719-llvm-ab061a656dcae92dadb874a872b7c90bac7d13ca.tar.gz
bcm5719-llvm-ab061a656dcae92dadb874a872b7c90bac7d13ca.zip
Marshall Clow's fix for Bug 8421.
llvm-svn: 122825
Diffstat (limited to 'libcxx/include/map')
-rw-r--r--libcxx/include/map4
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/include/map b/libcxx/include/map
index 64c2808757e..387c6b501b5 100644
--- a/libcxx/include/map
+++ b/libcxx/include/map
@@ -350,7 +350,7 @@ template <class _Key, class _Tp, class _Compare, bool = is_empty<_Compare>::valu
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 @@ class __map_value_compare<_Key, _Tp, _Compare, false>
{
_Compare comp;
- typedef pair<_Key, _Tp> _P;
+ typedef pair<typename std::remove_const<_Key>::type, _Tp> _P;
typedef pair<const _Key, _Tp> _CP;
public:
OpenPOWER on IntegriCloud