summaryrefslogtreecommitdiffstats
path: root/libcxx/include
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2015-06-30 18:15:41 +0000
committerMarshall Clow <mclow.lists@gmail.com>2015-06-30 18:15:41 +0000
commitf8457a0735899ba71b7bb321cf88ff48b54c9d30 (patch)
treea1c8b315114dab918f4bb1f8a200aec9db9d475d /libcxx/include
parentd9f09858a45aaeb1e258e41b04d6f78c345fbd8d (diff)
downloadbcm5719-llvm-f8457a0735899ba71b7bb321cf88ff48b54c9d30.tar.gz
bcm5719-llvm-f8457a0735899ba71b7bb321cf88ff48b54c9d30.zip
Add tests for LWG#2299. While doing so, I noticed that the tests we have for the transparent comparators don't actually call them. Fix those tests, too. Now one of them is failing, due to a missing const in <map>. Add that (twice). Next step is to do the same for <unordered_map>
llvm-svn: 241091
Diffstat (limited to 'libcxx/include')
-rw-r--r--libcxx/include/map4
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/include/map b/libcxx/include/map
index 14eb4eb23d9..cdcf40569ba 100644
--- a/libcxx/include/map
+++ b/libcxx/include/map
@@ -1117,7 +1117,7 @@ public:
template <typename _K2>
_LIBCPP_INLINE_VISIBILITY
typename enable_if<__is_transparent<_Compare, _K2>::value,size_type>::type
- count(const _K2& __k) {return __tree_.__count_unique(__k);}
+ count(const _K2& __k) const {return __tree_.__count_unique(__k);}
#endif
_LIBCPP_INLINE_VISIBILITY
iterator lower_bound(const key_type& __k)
@@ -1850,7 +1850,7 @@ public:
template <typename _K2>
_LIBCPP_INLINE_VISIBILITY
typename enable_if<__is_transparent<_Compare, _K2>::value,size_type>::type
- count(const _K2& __k) {return __tree_.__count_multi(__k);}
+ count(const _K2& __k) const {return __tree_.__count_multi(__k);}
#endif
_LIBCPP_INLINE_VISIBILITY
iterator lower_bound(const key_type& __k)
OpenPOWER on IntegriCloud