stl_iterator.h (__normal_iterator<>::_M_const_cast): Use std::pointer_traits.

2013-05-14  Paolo Carlini  <paolo.carlini@oracle.com>

	* include/bits/stl_iterator.h (__normal_iterator<>::_M_const_cast):
	Use std::pointer_traits.

From-SVN: r198891

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index dc7d410e7bdcccafb1ff9f4b9b25583f674e8dd9..c8087386f9a4790b79eff1d5b6cc36a3e391a3ce 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-14  Paolo Carlini  <paolo.carlini@oracle.com>
+
+       * include/bits/stl_iterator.h (__normal_iterator<>::_M_const_cast):
+       Use std::pointer_traits.
+
 2013-05-13  Benjamin Kosnik  <bkoz@redhat.com>
 
        * libsupc++/Makefile.am (sources): Add bad_array_length.cc,

diff --git a/libstdc++-v3/include/bits/stl_iterator.h b/libstdc++-v3/include/bits/stl_iterator.h
index a2762305109ac41e42441d33c196697b1c446f98..50b55eb57b422262e91fac404644927dfc46717b 100644 (file)
--- a/libstdc++-v3/include/bits/stl_iterator.h
+++ b/libstdc++-v3/include/bits/stl_iterator.h
@@ -63,7 +63,7 @@
 #include <bits/cpp_type_traits.h>
 #include <ext/type_traits.h>
 #include <bits/move.h>
-#include <ext/cast.h>
+#include <bits/ptr_traits.h>
 
 namespace std _GLIBCXX_VISIBILITY(default)
 {
@@ -736,9 +736,17 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 
       __normal_iterator<typename _Container::pointer, _Container>
       _M_const_cast() const
-      { return __normal_iterator<typename _Container::pointer, _Container>
-         (__gnu_cxx::__const_pointer_cast<typename _Container::pointer>
-          (_M_current)); }
+      {
+#if __cplusplus >= 201103L
+       using _PTraits = std::pointer_traits<typename _Container::pointer>;
+       return __normal_iterator<typename _Container::pointer, _Container>
+         (_PTraits::pointer_to(const_cast<typename _PTraits::element_type&>
+                               (*_M_current)));
+#else
+        return __normal_iterator<typename _Container::pointer, _Container>
+         (const_cast<typename _Container::pointer>(_M_current));
+#endif
+      }
 
       // Forward iterator requirements
       reference