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

re PR libstdc++/59434 ([lwg/2106] move_iterator is broken for input iterators with an rvalue as reference type) 

2014-04-11  Marc Glisse  <marc.glisse@inria.fr>

	PR libstdc++/59434
	* include/bits/stl_iterator.h (move_iterator::reference,
	move_iterator::operator*): Implement LWG 2106.
	* testsuite/24_iterators/move_iterator/dr2106.cc: New file.

From-SVN: r209323
This commit is contained in:
Marc Glisse 2014-04-11 21:23:49 +02:00 committed by Marc Glisse
parent bbe281da97
commit 4de3afd972
3 changed files with 47 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,10 @@
2014-04-11 Marc Glisse <marc.glisse@inria.fr>
PR libstdc++/59434
* include/bits/stl_iterator.h (move_iterator::reference,
move_iterator::operator*): Implement LWG 2106.
* testsuite/24_iterators/move_iterator/dr2106.cc: New file.
2014-04-11 Marc Glisse <marc.glisse@inria.fr>
* include/std/complex (__complex_exp, pow): Specify the template

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

@ -965,6 +965,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_Iterator _M_current;
typedef iterator_traits<_Iterator> __traits_type;
typedef typename __traits_type::reference __base_ref;
public:
typedef _Iterator iterator_type;
@ -973,7 +974,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
typedef typename __traits_type::difference_type difference_type;
// NB: DR 680.
typedef _Iterator pointer;
typedef value_type&& reference;
// _GLIBCXX_RESOLVE_LIB_DEFECTS
// 2106. move_iterator wrapping iterators returning prvalues
typedef typename conditional<is_reference<__base_ref>::value,
typename remove_reference<__base_ref>::type&&,
__base_ref>::type reference;
move_iterator()
: _M_current() { }
@ -992,7 +997,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
reference
operator*() const
{ return std::move(*_M_current); }
{ return static_cast<reference>(*_M_current); }
pointer
operator->() const

33
libstdc++-v3/testsuite/24_iterators/move_iterator/dr2106.cc Normal file
View File

@ -0,0 +1,33 @@
// { dg-options "-std=gnu++11" }
// { dg-do compile }
// Copyright (C) 2014 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
// terms of the GNU General Public License as published by the
// Free Software Foundation; either version 3, or (at your option)
// any later version.
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License along
// with this library; see the file COPYING3. If not see
// <http://www.gnu.org/licenses/>.
#include <iterator>
#include <type_traits>
#include <vector>
typedef std::vector<bool> Vec;
typedef Vec::reference Ref;
typedef Vec::const_reference CRef;
typedef Vec::iterator It;
typedef Vec::const_iterator CIt;
typedef std::move_iterator<It> MIt;
typedef std::move_iterator<CIt> MCIt;
static_assert(std::is_same<MIt::reference, Ref>::value,"");
static_assert(std::is_same<MCIt::reference, CRef>::value,"");