diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2011-02-27 21:02:02 +0300 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2011-02-27 21:02:02 +0300 |
| commit | 73736effce3ecc994f6c547912b752089f8887a9 (patch) | |
| tree | 34b38ca3314cda9d9c68639b33c32a9cf07b2794 /libcxx/include/map | |
| parent | f571290d1ef6a736c073d9f4a36c84b144b71fde (diff) | |
Fixed two problems found by Chris Jefferson: Made operator>> for char consistent with gcc. Opened an LWG issue on this one. 2) Renamed some private typedefs which are causing boost grief.
llvm-svn: 126576
Diffstat (limited to 'libcxx/include/map')
| -rw-r--r-- | libcxx/include/map | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libcxx/include/map b/libcxx/include/map index 85e10f613f58..fdd133847187 100644 --- a/libcxx/include/map +++ b/libcxx/include/map @@ -493,11 +493,11 @@ class _LIBCPP_VISIBLE __map_iterator _TreeIterator __i_; typedef typename _TreeIterator::__pointer_traits __pointer_traits; - typedef const typename _TreeIterator::value_type::first_type key_type; - typedef typename _TreeIterator::value_type::second_type mapped_type; + typedef const typename _TreeIterator::value_type::first_type __key_type; + typedef typename _TreeIterator::value_type::second_type __mapped_type; public: typedef bidirectional_iterator_tag iterator_category; - typedef pair<key_type, mapped_type> value_type; + typedef pair<__key_type, __mapped_type> value_type; typedef typename _TreeIterator::difference_type difference_type; typedef value_type& reference; typedef typename __pointer_traits::template @@ -558,11 +558,11 @@ class _LIBCPP_VISIBLE __map_const_iterator _TreeIterator __i_; typedef typename _TreeIterator::__pointer_traits __pointer_traits; - typedef const typename _TreeIterator::value_type::first_type key_type; - typedef typename _TreeIterator::value_type::second_type mapped_type; + typedef const typename _TreeIterator::value_type::first_type __key_type; + typedef typename _TreeIterator::value_type::second_type __mapped_type; public: typedef bidirectional_iterator_tag iterator_category; - typedef pair<key_type, mapped_type> value_type; + typedef pair<__key_type, __mapped_type> value_type; typedef typename _TreeIterator::difference_type difference_type; typedef const value_type& reference; typedef typename __pointer_traits::template |