diff options
| author | Eric Fiselier <eric@efcs.ca> | 2015-12-30 21:52:00 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2015-12-30 21:52:00 +0000 |
| commit | 934b092186b149b5ba2626badeb3bf7719a8e153 (patch) | |
| tree | ee5731d744fe60a136f171ae475d0250ad062f3d /libcxx/include/unordered_map | |
| parent | 96f7f81aa35274a1944cfd5106a2f53010b232c0 (diff) | |
| download | bcm5719-llvm-934b092186b149b5ba2626badeb3bf7719a8e153.tar.gz bcm5719-llvm-934b092186b149b5ba2626badeb3bf7719a8e153.zip | |
Use __rebind_pointer to avoid #ifdef block
llvm-svn: 256654
Diffstat (limited to 'libcxx/include/unordered_map')
| -rw-r--r-- | libcxx/include/unordered_map | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/libcxx/include/unordered_map b/libcxx/include/unordered_map index 3c774d4094e..85a54a7b6dd 100644 --- a/libcxx/include/unordered_map +++ b/libcxx/include/unordered_map @@ -656,7 +656,6 @@ class _LIBCPP_TYPE_VIS_ONLY __hash_map_iterator { _HashIterator __i_; - typedef pointer_traits<typename _HashIterator::pointer> __pointer_traits; typedef const typename _HashIterator::value_type::value_type::first_type key_type; typedef typename _HashIterator::value_type::value_type::second_type mapped_type; public: @@ -664,13 +663,8 @@ public: typedef pair<key_type, mapped_type> value_type; typedef typename _HashIterator::difference_type difference_type; typedef value_type& reference; - typedef typename __pointer_traits::template -#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES - rebind<value_type> -#else - rebind<value_type>::other -#endif - pointer; + typedef typename __rebind_pointer<typename _HashIterator::pointer, value_type>::type + pointer; _LIBCPP_INLINE_VISIBILITY __hash_map_iterator() _NOEXCEPT {} @@ -712,7 +706,6 @@ class _LIBCPP_TYPE_VIS_ONLY __hash_map_const_iterator { _HashIterator __i_; - typedef pointer_traits<typename _HashIterator::pointer> __pointer_traits; typedef const typename _HashIterator::value_type::value_type::first_type key_type; typedef typename _HashIterator::value_type::value_type::second_type mapped_type; public: @@ -720,13 +713,8 @@ public: typedef pair<key_type, mapped_type> value_type; typedef typename _HashIterator::difference_type difference_type; typedef const value_type& reference; - typedef typename __pointer_traits::template -#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES - rebind<const value_type> -#else - rebind<const value_type>::other -#endif - pointer; + typedef typename __rebind_pointer<typename _HashIterator::pointer, const value_type>::type + pointer; _LIBCPP_INLINE_VISIBILITY __hash_map_const_iterator() _NOEXCEPT {} |
