7ffec97f9e
2007-11-12 Chris Jefferson <chris@bubblescope.net> Paolo Carlini <pcarlini@suse.de> * include/bits/stl_deque.h (deque<>::push_back<>(_Args...), deque<>::push_front<>(_Args...), emplace<>(iterator, _Args...), insert(iterator, _Tp&&), _M_push_back_aux<>(_Args&&...), _M_push_front_aux<>(_Args&&...), _M_insert_aux<>(iterator, _Args&&...)): Add. * include/deque/deque.tcc (insert(iterator, value_type&&), emplace<>(iterator, _Args...), _M_push_back_aux<>(_Args&&...), _M_push_front_aux<>(_Args&&...), _M_insert_aux<>(iterator, _Args&&...)): Define. (_M_insert_aux(iterator, size_type, const value_type&), _M_insert_aux<>(iterator, _ForwardIterator, _ForwardIterator, size_type)): Use _GLIBCXX_MOVE3, _GLIBCXX_MOVE_BACKWARD3, __uninitialized_move*, __uninitialized_fill_move, __uninitialized_copy_move, when possible. * include/bits/stl_uninitialized.h (__uninitialized_copy_copy, __uninitialized_fill_copy, __uninitialized_copy_fill): Remove. (__uninitialized_copy_move, __uninitialized_move_copy, __uninitialized_move_fill, __uninitialized_fill_move): Add. * include/debug/deque (deque<>::push_back<>(_Args...), deque<>::push_front<>(_Args...), emplace<>(iterator, _Args...), insert(iterator, _Tp&&)): Add. * testsuite/23_containers/deque/modifiers/moveable.cc: Enable. * testsuite/23_containers/deque/capacity/moveable.cc: Likewise. * testsuite/23_containers/deque/cons/moveable.cc: Likewise. * testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: Adjust dg-error line numbers. * testsuite/23_containers/deque/requirements/dr438/insert_neg.cc: Likewise. * testsuite/23_containers/deque/requirements/dr438/ constructor_1_neg.cc: Likewise. * testsuite/23_containers/deque/requirements/dr438/ constructor_2_neg.cc: Likewise. * include/debug/vector (vector<>::insert(iterator, _Tp&&)): Minor tweak, prefer std::move. Co-Authored-By: Paolo Carlini <pcarlini@suse.de> From-SVN: r130102
437 lines
14 KiB
C++
437 lines
14 KiB
C++
// Raw memory manipulators -*- C++ -*-
|
|
|
|
// Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
|
|
// 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 2, 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 COPYING. If not, write to the Free
|
|
// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
|
// USA.
|
|
|
|
// As a special exception, you may use this file as part of a free software
|
|
// library without restriction. Specifically, if other files instantiate
|
|
// templates or use macros or inline functions from this file, or you compile
|
|
// this file and link it with other files to produce an executable, this
|
|
// file does not by itself cause the resulting executable to be covered by
|
|
// the GNU General Public License. This exception does not however
|
|
// invalidate any other reasons why the executable file might be covered by
|
|
// the GNU General Public License.
|
|
|
|
/*
|
|
*
|
|
* Copyright (c) 1994
|
|
* Hewlett-Packard Company
|
|
*
|
|
* Permission to use, copy, modify, distribute and sell this software
|
|
* and its documentation for any purpose is hereby granted without fee,
|
|
* provided that the above copyright notice appear in all copies and
|
|
* that both that copyright notice and this permission notice appear
|
|
* in supporting documentation. Hewlett-Packard Company makes no
|
|
* representations about the suitability of this software for any
|
|
* purpose. It is provided "as is" without express or implied warranty.
|
|
*
|
|
*
|
|
* Copyright (c) 1996,1997
|
|
* Silicon Graphics Computer Systems, Inc.
|
|
*
|
|
* Permission to use, copy, modify, distribute and sell this software
|
|
* and its documentation for any purpose is hereby granted without fee,
|
|
* provided that the above copyright notice appear in all copies and
|
|
* that both that copyright notice and this permission notice appear
|
|
* in supporting documentation. Silicon Graphics makes no
|
|
* representations about the suitability of this software for any
|
|
* purpose. It is provided "as is" without express or implied warranty.
|
|
*/
|
|
|
|
/** @file stl_uninitialized.h
|
|
* This is an internal header file, included by other library headers.
|
|
* You should not attempt to use it directly.
|
|
*/
|
|
|
|
#ifndef _STL_UNINITIALIZED_H
|
|
#define _STL_UNINITIALIZED_H 1
|
|
|
|
_GLIBCXX_BEGIN_NAMESPACE(std)
|
|
|
|
template<bool>
|
|
struct __uninitialized_copy
|
|
{
|
|
template<typename _InputIterator, typename _ForwardIterator>
|
|
static _ForwardIterator
|
|
uninitialized_copy(_InputIterator __first, _InputIterator __last,
|
|
_ForwardIterator __result)
|
|
{
|
|
_ForwardIterator __cur = __result;
|
|
try
|
|
{
|
|
for (; __first != __last; ++__first, ++__cur)
|
|
::new(static_cast<void*>(&*__cur)) typename
|
|
iterator_traits<_ForwardIterator>::value_type(*__first);
|
|
return __cur;
|
|
}
|
|
catch(...)
|
|
{
|
|
std::_Destroy(__result, __cur);
|
|
__throw_exception_again;
|
|
}
|
|
}
|
|
};
|
|
|
|
template<>
|
|
struct __uninitialized_copy<true>
|
|
{
|
|
template<typename _InputIterator, typename _ForwardIterator>
|
|
static _ForwardIterator
|
|
uninitialized_copy(_InputIterator __first, _InputIterator __last,
|
|
_ForwardIterator __result)
|
|
{ return std::copy(__first, __last, __result); }
|
|
};
|
|
|
|
/**
|
|
* @brief Copies the range [first,last) into result.
|
|
* @param first An input iterator.
|
|
* @param last An input iterator.
|
|
* @param result An output iterator.
|
|
* @return result + (first - last)
|
|
*
|
|
* Like copy(), but does not require an initialized output range.
|
|
*/
|
|
template<typename _InputIterator, typename _ForwardIterator>
|
|
inline _ForwardIterator
|
|
uninitialized_copy(_InputIterator __first, _InputIterator __last,
|
|
_ForwardIterator __result)
|
|
{
|
|
typedef typename iterator_traits<_InputIterator>::value_type
|
|
_ValueType1;
|
|
typedef typename iterator_traits<_ForwardIterator>::value_type
|
|
_ValueType2;
|
|
|
|
return std::__uninitialized_copy<(__is_pod(_ValueType1)
|
|
&& __is_pod(_ValueType2))>::
|
|
uninitialized_copy(__first, __last, __result);
|
|
}
|
|
|
|
|
|
template<bool>
|
|
struct __uninitialized_fill
|
|
{
|
|
template<typename _ForwardIterator, typename _Tp>
|
|
static void
|
|
uninitialized_fill(_ForwardIterator __first,
|
|
_ForwardIterator __last, const _Tp& __x)
|
|
{
|
|
_ForwardIterator __cur = __first;
|
|
try
|
|
{
|
|
for (; __cur != __last; ++__cur)
|
|
std::_Construct(&*__cur, __x);
|
|
}
|
|
catch(...)
|
|
{
|
|
std::_Destroy(__first, __cur);
|
|
__throw_exception_again;
|
|
}
|
|
}
|
|
};
|
|
|
|
template<>
|
|
struct __uninitialized_fill<true>
|
|
{
|
|
template<typename _ForwardIterator, typename _Tp>
|
|
static void
|
|
uninitialized_fill(_ForwardIterator __first,
|
|
_ForwardIterator __last, const _Tp& __x)
|
|
{ std::fill(__first, __last, __x); }
|
|
};
|
|
|
|
/**
|
|
* @brief Copies the value x into the range [first,last).
|
|
* @param first An input iterator.
|
|
* @param last An input iterator.
|
|
* @param x The source value.
|
|
* @return Nothing.
|
|
*
|
|
* Like fill(), but does not require an initialized output range.
|
|
*/
|
|
template<typename _ForwardIterator, typename _Tp>
|
|
inline void
|
|
uninitialized_fill(_ForwardIterator __first, _ForwardIterator __last,
|
|
const _Tp& __x)
|
|
{
|
|
typedef typename iterator_traits<_ForwardIterator>::value_type
|
|
_ValueType;
|
|
|
|
std::__uninitialized_fill<__is_pod(_ValueType)>::
|
|
uninitialized_fill(__first, __last, __x);
|
|
}
|
|
|
|
|
|
template<bool>
|
|
struct __uninitialized_fill_n
|
|
{
|
|
template<typename _ForwardIterator, typename _Size, typename _Tp>
|
|
static void
|
|
uninitialized_fill_n(_ForwardIterator __first, _Size __n,
|
|
const _Tp& __x)
|
|
{
|
|
_ForwardIterator __cur = __first;
|
|
try
|
|
{
|
|
for (; __n > 0; --__n, ++__cur)
|
|
std::_Construct(&*__cur, __x);
|
|
}
|
|
catch(...)
|
|
{
|
|
std::_Destroy(__first, __cur);
|
|
__throw_exception_again;
|
|
}
|
|
}
|
|
};
|
|
|
|
template<>
|
|
struct __uninitialized_fill_n<true>
|
|
{
|
|
template<typename _ForwardIterator, typename _Size, typename _Tp>
|
|
static void
|
|
uninitialized_fill_n(_ForwardIterator __first, _Size __n,
|
|
const _Tp& __x)
|
|
{ std::fill_n(__first, __n, __x); }
|
|
};
|
|
|
|
/**
|
|
* @brief Copies the value x into the range [first,first+n).
|
|
* @param first An input iterator.
|
|
* @param n The number of copies to make.
|
|
* @param x The source value.
|
|
* @return Nothing.
|
|
*
|
|
* Like fill_n(), but does not require an initialized output range.
|
|
*/
|
|
template<typename _ForwardIterator, typename _Size, typename _Tp>
|
|
inline void
|
|
uninitialized_fill_n(_ForwardIterator __first, _Size __n, const _Tp& __x)
|
|
{
|
|
typedef typename iterator_traits<_ForwardIterator>::value_type
|
|
_ValueType;
|
|
|
|
std::__uninitialized_fill_n<__is_pod(_ValueType)>::
|
|
uninitialized_fill_n(__first, __n, __x);
|
|
}
|
|
|
|
// Extensions: versions of uninitialized_copy, uninitialized_fill,
|
|
// and uninitialized_fill_n that take an allocator parameter.
|
|
// We dispatch back to the standard versions when we're given the
|
|
// default allocator. For nondefault allocators we do not use
|
|
// any of the POD optimizations.
|
|
|
|
template<typename _InputIterator, typename _ForwardIterator,
|
|
typename _Allocator>
|
|
_ForwardIterator
|
|
__uninitialized_copy_a(_InputIterator __first, _InputIterator __last,
|
|
_ForwardIterator __result, _Allocator& __alloc)
|
|
{
|
|
_ForwardIterator __cur = __result;
|
|
try
|
|
{
|
|
for (; __first != __last; ++__first, ++__cur)
|
|
__alloc.construct(&*__cur, *__first);
|
|
return __cur;
|
|
}
|
|
catch(...)
|
|
{
|
|
std::_Destroy(__result, __cur, __alloc);
|
|
__throw_exception_again;
|
|
}
|
|
}
|
|
|
|
template<typename _InputIterator, typename _ForwardIterator, typename _Tp>
|
|
inline _ForwardIterator
|
|
__uninitialized_copy_a(_InputIterator __first, _InputIterator __last,
|
|
_ForwardIterator __result, allocator<_Tp>&)
|
|
{ return std::uninitialized_copy(__first, __last, __result); }
|
|
|
|
template<typename _InputIterator, typename _ForwardIterator,
|
|
typename _Allocator>
|
|
inline _ForwardIterator
|
|
__uninitialized_move_a(_InputIterator __first, _InputIterator __last,
|
|
_ForwardIterator __result, _Allocator& __alloc)
|
|
{
|
|
return std::__uninitialized_copy_a(_GLIBCXX_MAKE_MOVE_ITERATOR(__first),
|
|
_GLIBCXX_MAKE_MOVE_ITERATOR(__last),
|
|
__result, __alloc);
|
|
}
|
|
|
|
template<typename _ForwardIterator, typename _Tp, typename _Allocator>
|
|
void
|
|
__uninitialized_fill_a(_ForwardIterator __first, _ForwardIterator __last,
|
|
const _Tp& __x, _Allocator& __alloc)
|
|
{
|
|
_ForwardIterator __cur = __first;
|
|
try
|
|
{
|
|
for (; __cur != __last; ++__cur)
|
|
__alloc.construct(&*__cur, __x);
|
|
}
|
|
catch(...)
|
|
{
|
|
std::_Destroy(__first, __cur, __alloc);
|
|
__throw_exception_again;
|
|
}
|
|
}
|
|
|
|
template<typename _ForwardIterator, typename _Tp, typename _Tp2>
|
|
inline void
|
|
__uninitialized_fill_a(_ForwardIterator __first, _ForwardIterator __last,
|
|
const _Tp& __x, allocator<_Tp2>&)
|
|
{ std::uninitialized_fill(__first, __last, __x); }
|
|
|
|
template<typename _ForwardIterator, typename _Size, typename _Tp,
|
|
typename _Allocator>
|
|
void
|
|
__uninitialized_fill_n_a(_ForwardIterator __first, _Size __n,
|
|
const _Tp& __x, _Allocator& __alloc)
|
|
{
|
|
_ForwardIterator __cur = __first;
|
|
try
|
|
{
|
|
for (; __n > 0; --__n, ++__cur)
|
|
__alloc.construct(&*__cur, __x);
|
|
}
|
|
catch(...)
|
|
{
|
|
std::_Destroy(__first, __cur, __alloc);
|
|
__throw_exception_again;
|
|
}
|
|
}
|
|
|
|
template<typename _ForwardIterator, typename _Size, typename _Tp,
|
|
typename _Tp2>
|
|
inline void
|
|
__uninitialized_fill_n_a(_ForwardIterator __first, _Size __n,
|
|
const _Tp& __x, allocator<_Tp2>&)
|
|
{ std::uninitialized_fill_n(__first, __n, __x); }
|
|
|
|
|
|
// Extensions: __uninitialized_copy_move, __uninitialized_move_copy,
|
|
// __uninitialized_fill_move, __uninitialized_move_fill.
|
|
// All of these algorithms take a user-supplied allocator, which is used
|
|
// for construction and destruction.
|
|
|
|
// __uninitialized_copy_move
|
|
// Copies [first1, last1) into [result, result + (last1 - first1)), and
|
|
// move [first2, last2) into
|
|
// [result, result + (last1 - first1) + (last2 - first2)).
|
|
template<typename _InputIterator1, typename _InputIterator2,
|
|
typename _ForwardIterator, typename _Allocator>
|
|
inline _ForwardIterator
|
|
__uninitialized_copy_move(_InputIterator1 __first1,
|
|
_InputIterator1 __last1,
|
|
_InputIterator2 __first2,
|
|
_InputIterator2 __last2,
|
|
_ForwardIterator __result,
|
|
_Allocator& __alloc)
|
|
{
|
|
_ForwardIterator __mid = std::__uninitialized_copy_a(__first1, __last1,
|
|
__result,
|
|
__alloc);
|
|
try
|
|
{
|
|
return std::__uninitialized_move_a(__first2, __last2, __mid, __alloc);
|
|
}
|
|
catch(...)
|
|
{
|
|
std::_Destroy(__result, __mid, __alloc);
|
|
__throw_exception_again;
|
|
}
|
|
}
|
|
|
|
// __uninitialized_move_copy
|
|
// Moves [first1, last1) into [result, result + (last1 - first1)), and
|
|
// copies [first2, last2) into
|
|
// [result, result + (last1 - first1) + (last2 - first2)).
|
|
template<typename _InputIterator1, typename _InputIterator2,
|
|
typename _ForwardIterator, typename _Allocator>
|
|
inline _ForwardIterator
|
|
__uninitialized_move_copy(_InputIterator1 __first1,
|
|
_InputIterator1 __last1,
|
|
_InputIterator2 __first2,
|
|
_InputIterator2 __last2,
|
|
_ForwardIterator __result,
|
|
_Allocator& __alloc)
|
|
{
|
|
_ForwardIterator __mid = std::__uninitialized_move_a(__first1, __last1,
|
|
__result,
|
|
__alloc);
|
|
try
|
|
{
|
|
return std::__uninitialized_copy_a(__first2, __last2, __mid, __alloc);
|
|
}
|
|
catch(...)
|
|
{
|
|
std::_Destroy(__result, __mid, __alloc);
|
|
__throw_exception_again;
|
|
}
|
|
}
|
|
|
|
// __uninitialized_fill_move
|
|
// Fills [result, mid) with x, and moves [first, last) into
|
|
// [mid, mid + (last - first)).
|
|
template<typename _ForwardIterator, typename _Tp, typename _InputIterator,
|
|
typename _Allocator>
|
|
inline _ForwardIterator
|
|
__uninitialized_fill_move(_ForwardIterator __result, _ForwardIterator __mid,
|
|
const _Tp& __x, _InputIterator __first,
|
|
_InputIterator __last, _Allocator& __alloc)
|
|
{
|
|
std::__uninitialized_fill_a(__result, __mid, __x, __alloc);
|
|
try
|
|
{
|
|
return std::__uninitialized_move_a(__first, __last, __mid, __alloc);
|
|
}
|
|
catch(...)
|
|
{
|
|
std::_Destroy(__result, __mid, __alloc);
|
|
__throw_exception_again;
|
|
}
|
|
}
|
|
|
|
// __uninitialized_move_fill
|
|
// Moves [first1, last1) into [first2, first2 + (last1 - first1)), and
|
|
// fills [first2 + (last1 - first1), last2) with x.
|
|
template<typename _InputIterator, typename _ForwardIterator, typename _Tp,
|
|
typename _Allocator>
|
|
inline void
|
|
__uninitialized_move_fill(_InputIterator __first1, _InputIterator __last1,
|
|
_ForwardIterator __first2,
|
|
_ForwardIterator __last2, const _Tp& __x,
|
|
_Allocator& __alloc)
|
|
{
|
|
_ForwardIterator __mid2 = std::__uninitialized_move_a(__first1, __last1,
|
|
__first2,
|
|
__alloc);
|
|
try
|
|
{
|
|
std::__uninitialized_fill_a(__mid2, __last2, __x, __alloc);
|
|
}
|
|
catch(...)
|
|
{
|
|
std::_Destroy(__first2, __mid2, __alloc);
|
|
__throw_exception_again;
|
|
}
|
|
}
|
|
|
|
_GLIBCXX_END_NAMESPACE
|
|
|
|
#endif /* _STL_UNINITIALIZED_H */
|