stl_deque.h (copy(_Deque_iterator, _Deque_iterator, _Deque_iterator), [...]): Declare.
2009-12-23 Paolo Carlini <paolo.carlini@oracle.com> * include/bits/stl_deque.h (copy(_Deque_iterator, _Deque_iterator, _Deque_iterator), move(_Deque_iterator, _Deque_iterator, _Deque_iterator)): Declare. * include/bits/deque.tcc: Implement the latter. * testsuite/performance/25_algorithms/copy_deque_iterators.cc: New. * testsuite/25_algorithms/move/2.cc: Likewise. * testsuite/25_algorithms/copy/5.cc: Likewise. * testsuite/23_containers/deque/requirements/dr438/assign_neg.cc: Adjust dg-error line number. * 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. From-SVN: r155432
This commit is contained in:
Paolo Carlini
Paolo Carlini
parent
7f7211fb3f
commit
e2bf200700
|
|
@ -1,3 +1,21 @@
|
|||
2009-12-23 Paolo Carlini <paolo.carlini@oracle.com>
|
||||
|
||||
* include/bits/stl_deque.h (copy(_Deque_iterator, _Deque_iterator,
|
||||
_Deque_iterator), move(_Deque_iterator, _Deque_iterator,
|
||||
_Deque_iterator)): Declare.
|
||||
* include/bits/deque.tcc: Implement the latter.
|
||||
* testsuite/performance/25_algorithms/copy_deque_iterators.cc: New.
|
||||
* testsuite/25_algorithms/move/2.cc: Likewise.
|
||||
* testsuite/25_algorithms/copy/5.cc: Likewise.
|
||||
* testsuite/23_containers/deque/requirements/dr438/assign_neg.cc:
|
||||
Adjust dg-error line number.
|
||||
* 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.
|
||||
|
||||
2009-12-22 Iain Sandoe <iain.sandoe@sandoe-acoustics.co.uk>
|
||||
|
||||
PR target/41605
|
||||
|
|
|
|||
|
|
@ -837,7 +837,7 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
|
|||
}
|
||||
|
||||
// Overload for deque::iterators, exploiting the "segmented-iterator
|
||||
// optimization". NB: leave const_iterators alone!
|
||||
// optimization".
|
||||
template<typename _Tp>
|
||||
void
|
||||
fill(const _Deque_iterator<_Tp, _Tp&, _Tp*>& __first,
|
||||
|
|
@ -858,6 +858,52 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
|
|||
std::fill(__first._M_cur, __last._M_cur, __value);
|
||||
}
|
||||
|
||||
template<typename _Tp>
|
||||
_Deque_iterator<_Tp, _Tp&, _Tp*>
|
||||
copy(_Deque_iterator<_Tp, const _Tp&, const _Tp*> __first,
|
||||
_Deque_iterator<_Tp, const _Tp&, const _Tp*> __last,
|
||||
_Deque_iterator<_Tp, _Tp&, _Tp*> __result)
|
||||
{
|
||||
typedef typename _Deque_iterator<_Tp, _Tp&, _Tp*>::_Self _Self;
|
||||
|
||||
typename _Self::difference_type __len = __last - __first;
|
||||
while (__len > 0)
|
||||
{
|
||||
typename _Self::difference_type __clen
|
||||
= std::min(__len, std::min(__first._M_last - __first._M_cur,
|
||||
__result._M_last - __result._M_cur));
|
||||
std::copy(__first._M_cur, __first._M_cur + __clen, __result._M_cur);
|
||||
__first += __clen;
|
||||
__result += __clen;
|
||||
__len -= __clen;
|
||||
}
|
||||
return __result;
|
||||
}
|
||||
|
||||
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
||||
template<typename _Tp>
|
||||
_Deque_iterator<_Tp, _Tp&, _Tp*>
|
||||
move(_Deque_iterator<_Tp, const _Tp&, const _Tp*> __first,
|
||||
_Deque_iterator<_Tp, const _Tp&, const _Tp*> __last,
|
||||
_Deque_iterator<_Tp, _Tp&, _Tp*> __result)
|
||||
{
|
||||
typedef typename _Deque_iterator<_Tp, _Tp&, _Tp*>::_Self _Self;
|
||||
|
||||
typename _Self::difference_type __len = __last - __first;
|
||||
while (__len > 0)
|
||||
{
|
||||
const typename _Self::difference_type __clen
|
||||
= std::min(__len, std::min(__first._M_last - __first._M_cur,
|
||||
__result._M_last - __result._M_cur));
|
||||
std::move(__first._M_cur, __first._M_cur + __clen, __result._M_cur);
|
||||
__first += __clen;
|
||||
__result += __clen;
|
||||
__len -= __clen;
|
||||
}
|
||||
return __result;
|
||||
}
|
||||
#endif
|
||||
|
||||
_GLIBCXX_END_NESTED_NAMESPACE
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -352,8 +352,40 @@ _GLIBCXX_BEGIN_NESTED_NAMESPACE(std, _GLIBCXX_STD_D)
|
|||
|
||||
template<typename _Tp>
|
||||
void
|
||||
fill(const _Deque_iterator<_Tp, _Tp&, _Tp*>& __first,
|
||||
const _Deque_iterator<_Tp, _Tp&, _Tp*>& __last, const _Tp& __value);
|
||||
fill(const _Deque_iterator<_Tp, _Tp&, _Tp*>&,
|
||||
const _Deque_iterator<_Tp, _Tp&, _Tp*>&, const _Tp&);
|
||||
|
||||
template<typename _Tp>
|
||||
_Deque_iterator<_Tp, _Tp&, _Tp*>
|
||||
copy(_Deque_iterator<_Tp, const _Tp&, const _Tp*>,
|
||||
_Deque_iterator<_Tp, const _Tp&, const _Tp*>,
|
||||
_Deque_iterator<_Tp, _Tp&, _Tp*>);
|
||||
|
||||
template<typename _Tp>
|
||||
inline _Deque_iterator<_Tp, _Tp&, _Tp*>
|
||||
copy(_Deque_iterator<_Tp, _Tp&, _Tp*> __first,
|
||||
_Deque_iterator<_Tp, _Tp&, _Tp*> __last,
|
||||
_Deque_iterator<_Tp, _Tp&, _Tp*> __result)
|
||||
{ return std::copy(_Deque_iterator<_Tp, const _Tp&, const _Tp*>(__first),
|
||||
_Deque_iterator<_Tp, const _Tp&, const _Tp*>(__last),
|
||||
__result); }
|
||||
|
||||
#ifdef __GXX_EXPERIMENTAL_CXX0X__
|
||||
template<typename _Tp>
|
||||
_Deque_iterator<_Tp, _Tp&, _Tp*>
|
||||
move(_Deque_iterator<_Tp, const _Tp&, const _Tp*>,
|
||||
_Deque_iterator<_Tp, const _Tp&, const _Tp*>,
|
||||
_Deque_iterator<_Tp, _Tp&, _Tp*>);
|
||||
|
||||
template<typename _Tp>
|
||||
inline _Deque_iterator<_Tp, _Tp&, _Tp*>
|
||||
move(_Deque_iterator<_Tp, _Tp&, _Tp*> __first,
|
||||
_Deque_iterator<_Tp, _Tp&, _Tp*> __last,
|
||||
_Deque_iterator<_Tp, _Tp&, _Tp*> __result)
|
||||
{ return std::move(_Deque_iterator<_Tp, const _Tp&, const _Tp*>(__first),
|
||||
_Deque_iterator<_Tp, const _Tp&, const _Tp*>(__last),
|
||||
__result); }
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Deque base class. This class provides the unified face for %deque's
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
// <http://www.gnu.org/licenses/>.
|
||||
|
||||
// { dg-do compile }
|
||||
// { dg-error "no matching" "" { target *-*-* } 1502 }
|
||||
// { dg-error "no matching" "" { target *-*-* } 1534 }
|
||||
// { dg-excess-errors "" }
|
||||
|
||||
#include <deque>
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
// <http://www.gnu.org/licenses/>.
|
||||
|
||||
// { dg-do compile }
|
||||
// { dg-error "no matching" "" { target *-*-* } 1441 }
|
||||
// { dg-error "no matching" "" { target *-*-* } 1473 }
|
||||
// { dg-excess-errors "" }
|
||||
|
||||
#include <deque>
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
// <http://www.gnu.org/licenses/>.
|
||||
|
||||
// { dg-do compile }
|
||||
// { dg-error "no matching" "" { target *-*-* } 1441 }
|
||||
// { dg-error "no matching" "" { target *-*-* } 1473 }
|
||||
// { dg-excess-errors "" }
|
||||
|
||||
#include <deque>
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
// <http://www.gnu.org/licenses/>.
|
||||
|
||||
// { dg-do compile }
|
||||
// { dg-error "no matching" "" { target *-*-* } 1586 }
|
||||
// { dg-error "no matching" "" { target *-*-* } 1618 }
|
||||
// { dg-excess-errors "" }
|
||||
|
||||
#include <deque>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,51 @@
|
|||
// 2009-12-23 Paolo Carlini <paolo.carlini@oracle.com>
|
||||
//
|
||||
// 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 Pred 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 <algorithm>
|
||||
#include <deque>
|
||||
#include <testsuite_hooks.h>
|
||||
|
||||
void test01()
|
||||
{
|
||||
bool test __attribute__((unused)) = true;
|
||||
using namespace std;
|
||||
|
||||
deque<long> data(200);
|
||||
for (unsigned i = 0; i < data.size(); ++i)
|
||||
data[i] = i;
|
||||
|
||||
const deque<long> data_1(data.size(), -1);
|
||||
|
||||
for (unsigned i = 0; i < data.size(); i += 2)
|
||||
for (unsigned j = i; j <= data.size(); j += 3)
|
||||
for (unsigned k = 0; k + (j - i) <= data.size(); k += 5)
|
||||
{
|
||||
deque<long> d(data.size(), -1);
|
||||
copy(data.begin() + i, data.begin() + j, d.begin() + k);
|
||||
|
||||
VERIFY( equal(data.begin() + i, data.begin() + j,
|
||||
d.begin() + k) );
|
||||
VERIFY( equal(d.begin(), d.begin() + k, data_1.begin()) );
|
||||
VERIFY( equal(d.begin() + k + (j - i), d.end(), data_1.begin()) );
|
||||
}
|
||||
}
|
||||
|
||||
int main()
|
||||
{
|
||||
test01();
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -0,0 +1,53 @@
|
|||
// { dg-options "-std=gnu++0x" }
|
||||
|
||||
// 2009-12-23 Paolo Carlini <paolo.carlini@oracle.com>
|
||||
//
|
||||
// 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 Pred 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 <algorithm>
|
||||
#include <deque>
|
||||
#include <testsuite_hooks.h>
|
||||
|
||||
void test01()
|
||||
{
|
||||
bool test __attribute__((unused)) = true;
|
||||
using namespace std;
|
||||
|
||||
deque<long> data(200);
|
||||
for (unsigned i = 0; i < data.size(); ++i)
|
||||
data[i] = i;
|
||||
|
||||
const deque<long> data_1(data.size(), -1);
|
||||
|
||||
for (unsigned i = 0; i < data.size(); i += 2)
|
||||
for (unsigned j = i; j <= data.size(); j += 3)
|
||||
for (unsigned k = 0; k + (j - i) <= data.size(); k += 5)
|
||||
{
|
||||
deque<long> d(data.size(), -1);
|
||||
move(data.begin() + i, data.begin() + j, d.begin() + k);
|
||||
|
||||
VERIFY( equal(data.begin() + i, data.begin() + j,
|
||||
d.begin() + k) );
|
||||
VERIFY( equal(d.begin(), d.begin() + k, data_1.begin()) );
|
||||
VERIFY( equal(d.begin() + k + (j - i), d.end(), data_1.begin()) );
|
||||
}
|
||||
}
|
||||
|
||||
int main()
|
||||
{
|
||||
test01();
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
// 2009-23-12 Paolo Carlini <paolo.carlini@oracle.com>
|
||||
//
|
||||
// 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 Pred 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 <deque>
|
||||
#include <testsuite_performance.h>
|
||||
|
||||
int main()
|
||||
{
|
||||
using namespace __gnu_test;
|
||||
|
||||
time_counter time;
|
||||
resource_counter resource;
|
||||
|
||||
const std::deque<int> data(3000, 3);
|
||||
|
||||
std::deque<int> d(3000, 1);
|
||||
|
||||
start_counters(time, resource);
|
||||
for (int i = 0; i < 1000; ++i)
|
||||
for (int j = 0; j < 3000; ++j)
|
||||
std::copy(data.begin(), data.begin() + j, d.begin());
|
||||
stop_counters(time, resource);
|
||||
report_performance(__FILE__, "", time, resource);
|
||||
|
||||
return 0;
|
||||
}
|
||||
Loading…
Reference in New Issue