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

Do not assume allocator is assignable. 

* include/bits/stl_deque.h (_Deque_base(_Deque_base&&)): Copy
	allocator instead of moving.
	* testsuite/23_containers/deque/allocator/move-2.cc: New.

From-SVN: r217068
This commit is contained in:
Jonathan Wakely 2014-11-04 03:41:12 +00:00 committed by Jonathan Wakely
parent 565115eaaf
commit d3cf41899e
3 changed files with 60 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libstdc++-v3/ChangeLog
View File

@ -16,6 +16,10 @@
* testsuite/20_util/bind/ref_neg.cc: Adjust dg-error.
* testsuite/20_util/reference_wrapper/requirements.cc: New.
* include/bits/stl_deque.h (_Deque_base(_Deque_base&&)): Copy
allocator instead of moving.
* testsuite/23_containers/deque/allocator/move-2.cc: New.
2014-11-03 Paolo Carlini <paolo.carlini@oracle.com>
* include/parallel/algo.h: Do not use default arguments in function

18
libstdc++-v3/include/bits/stl_deque.h
View File

@ -503,23 +503,11 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER
#if __cplusplus >= 201103L
_Deque_base(_Deque_base&& __x)
: _M_impl(std::move(__x._M_get_Tp_allocator()))
: _M_impl(__x._M_get_Tp_allocator())
{
_M_initialize_map(0);
if (__x._M_impl._M_map)
{
this->_M_impl._M_swap_data(__x._M_impl);
__try
{
// Re-initialize __x using its moved-from allocator.
__x._M_initialize_map(0);
}
__catch (...)
{
this->_M_impl._M_swap_data(__x._M_impl);
__x._M_get_Tp_allocator() = std::move(_M_get_Tp_allocator());
__throw_exception_again;
}
}
this->_M_impl._M_swap_data(__x._M_impl);
}
_Deque_base(_Deque_base&& __x, const allocator_type& __a, size_type __n)

53
libstdc++-v3/testsuite/23_containers/deque/allocator/move-2.cc Normal file
View File

@ -0,0 +1,53 @@
// 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/>.
// { dg-options "-std=gnu++11" }
// { dg-do compile }
#include <deque>
template<typename T>
struct Alloc
{
using value_type = T;
Alloc() = default;
template<typename U>
Alloc(const Alloc<U>&) { }
Alloc& operator=(const Alloc&) = delete;
T* allocate(std::size_t n)
{ return std::allocator<T>{}.allocate(n); }
void deallocate(T* p, std::size_t n)
{ std::allocator<T>{}.deallocate(p, n); }
};
template<typename T>
bool operator==(const Alloc<T>&, const Alloc<T>&) { return true; }
template<typename T>
bool operator!=(const Alloc<T>&, const Alloc<T>&) { return false; }
void
test01()
{
std::deque<int, Alloc<int>> d;
auto d2 = std::move(d);
}