commit 660c6b0fd795239c4ee2bf20b47b39cb1179f2cc
author Eric Fiselier <eric@efcs.ca> Wed Dec 30 21:52:00 2015 +0000
committer Eric Fiselier <eric@efcs.ca> Wed Dec 30 21:52:00 2015 +0000
tree ea9560df4d92ce60271d879165cc101a929ba6c5
parent 696b44f05680bdbed47bed552d7e0c91f74d0962

Use __rebind_pointer to avoid #ifdef block

llvm-svn: 256654
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: 934b092186b149b5ba2626badeb3bf7719a8e153

include/map

diff --git a/include/map b/include/map
index adfb4cd..2416205 100644
--- a/include/map
+++ b/include/map
@@ -704,13 +704,8 @@
     typedef pair<__key_type, __mapped_type>                      value_type;
     typedef typename _TreeIterator::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 __pointer_traits::pointer, value_type>::type
+        pointer;
 
     _LIBCPP_INLINE_VISIBILITY
     __map_iterator() _NOEXCEPT {}
@@ -770,13 +765,8 @@
     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
-#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind<const value_type>
-#else
-            rebind<const value_type>::other
-#endif
-                                                                 pointer;
+    typedef typename __rebind_pointer<typename __pointer_traits::pointer, const value_type>::type
+        pointer;
 
     _LIBCPP_INLINE_VISIBILITY
     __map_const_iterator() _NOEXCEPT {}