PR libstdc++/51960 * doc/xml/manual/intro.xml: Document DR 2127 change. * doc/html/*: Regenerate. * include/bits/stl_raw_storage_iter.h (operator=(_Tp&&)): Add. (operator++(), operator++(int)): Use injected class name. * testsuite/20_util/raw_storage_iterator/dr2127.cc: New test.
Tested x86_64-linux, committed to trunk.
commit 1cc0a6b33dfe6c304d4ab3506e7c65bd61f508b6 Author: Jonathan Wakely <jwak...@redhat.com> Date: Fri Aug 26 13:33:59 2016 +0100 libstdc++/51960 move-construction for raw_storage_iterator PR libstdc++/51960 * doc/xml/manual/intro.xml: Document DR 2127 change. * doc/html/*: Regenerate. * include/bits/stl_raw_storage_iter.h (operator=(_Tp&&)): Add. (operator++(), operator++(int)): Use injected class name. * testsuite/20_util/raw_storage_iterator/dr2127.cc: New test. diff --git a/libstdc++-v3/doc/xml/manual/intro.xml b/libstdc++-v3/doc/xml/manual/intro.xml index d02306e..238ab24 100644 --- a/libstdc++-v3/doc/xml/manual/intro.xml +++ b/libstdc++-v3/doc/xml/manual/intro.xml @@ -898,6 +898,12 @@ requirements of the license of GCC. <listitem><para>Adjust constraints to allow safe conversions. </para></listitem></varlistentry> + <varlistentry><term><link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="../ext/lwg-defects.html#2127">2127</link>: + <emphasis>Move-construction with <code>raw_storage_iterator</code></emphasis> + </term> + <listitem><para>Add assignment operator taking an rvalue. + </para></listitem></varlistentry> + <varlistentry><term><link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="../ext/lwg-defects.html#2132">2132</link>: <emphasis><code>std::function</code> ambiguity</emphasis> </term> diff --git a/libstdc++-v3/include/bits/stl_raw_storage_iter.h b/libstdc++-v3/include/bits/stl_raw_storage_iter.h index 8b5e793..2d29e7c 100644 --- a/libstdc++-v3/include/bits/stl_raw_storage_iter.h +++ b/libstdc++-v3/include/bits/stl_raw_storage_iter.h @@ -86,17 +86,28 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return *this; } - raw_storage_iterator<_OutputIterator, _Tp>& +#if __cplusplus >= 201103L + // _GLIBCXX_RESOLVE_LIB_DEFECTS + // 2127. Move-construction with raw_storage_iterator + raw_storage_iterator& + operator=(_Tp&& __element) + { + std::_Construct(std::__addressof(*_M_iter), std::move(__element)); + return *this; + } +#endif + + raw_storage_iterator& operator++() { ++_M_iter; return *this; } - raw_storage_iterator<_OutputIterator, _Tp> + raw_storage_iterator operator++(int) { - raw_storage_iterator<_OutputIterator, _Tp> __tmp = *this; + raw_storage_iterator __tmp = *this; ++_M_iter; return __tmp; } diff --git a/libstdc++-v3/testsuite/20_util/raw_storage_iterator/dr2127.cc b/libstdc++-v3/testsuite/20_util/raw_storage_iterator/dr2127.cc new file mode 100644 index 0000000..9a084f6 --- /dev/null +++ b/libstdc++-v3/testsuite/20_util/raw_storage_iterator/dr2127.cc @@ -0,0 +1,46 @@ +// Copyright (C) 2016 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/>. + +// { dg-do run { target c++11 } } + +#include <memory> +#include <testsuite_hooks.h> + +struct MoveOnly +{ + MoveOnly(int i) : i(i) { } + MoveOnly(MoveOnly&&) = default; + int i; +}; + +void +test01() +{ + char buf[sizeof(MoveOnly)*2]; + MoveOnly* addr = (MoveOnly*)buf; + std::raw_storage_iterator<MoveOnly*, MoveOnly> iter(addr); + *iter++ = MoveOnly{1}; + *iter++ = MoveOnly{2}; + VERIFY( addr[0].i == 1 ); + VERIFY( addr[1].i == 2 ); +} + +int +main() +{ + test01(); +}