OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Paolo Carlini 2013-05-14 15:17:18 +00:00 committed by Paolo Carlini
parent fc21784dec
commit a5244b2ed5
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libstdc++-v3/ChangeLog
View File

@ -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,

16
libstdc++-v3/include/bits/stl_iterator.h
View File

@ -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