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

move.h (__is_nothrow_swappable): Add. 

2011-06-22  Daniel Krugler  <daniel.kruegler@googlemail.com>
	    Paolo Carlini  <paolo.carlini@oracle.com>

	* include/bits/move.h (__is_nothrow_swappable): Add.
	(swap(_Tp(&)[_Nm], _Tp(&)[_Nm])): Use noexcept.
	* include/bits/algorithmfwd.h: Adjust.
	* testsuite/25_algorithms/swap/noexcept.cc: New.


Co-Authored-By: Paolo Carlini <paolo.carlini@oracle.com>

From-SVN: r175277
This commit is contained in:
Daniel Krugler 2011-06-21 23:01:03 +00:00 committed by Paolo Carlini
parent 358bb337a5
commit ccb4f5a707
4 changed files with 50 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,11 @@
2011-06-22 Daniel Krugler <daniel.kruegler@googlemail.com>
Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/move.h (__is_nothrow_swappable): Add.
(swap(_Tp(&)[_Nm], _Tp(&)[_Nm])): Use noexcept.
* include/bits/algorithmfwd.h: Adjust.
* testsuite/25_algorithms/swap/noexcept.cc: New.
2011-06-21 Jakub Jelinek <jakub@redhat.com>
* testsuite/Makefile.am (check_DEJAGNU_normal_targets): Add

6
libstdc++-v3/include/bits/algorithmfwd.h
View File

@ -558,7 +558,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
template<typename _Tp, size_t _Nm>
void
swap(_Tp (&)[_Nm], _Tp (&)[_Nm]);
swap(_Tp (&)[_Nm], _Tp (&)[_Nm])
#ifdef __GXX_EXPERIMENTAL_CXX0X__
noexcept(__is_nothrow_swappable<_Tp>::value)
#endif
;
template<typename _FIter1, typename _FIter2>
_FIter2

12
libstdc++-v3/include/bits/move.h
View File

@ -152,12 +152,22 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
__b = _GLIBCXX_MOVE(__tmp);
}
#ifdef __GXX_EXPERIMENTAL_CXX0X__
// To work around c++/49045.
template<typename _Tp>
struct __is_nothrow_swappable
{ static const bool value = noexcept(swap(std::declval<_Tp&>(),
std::declval<_Tp&>())); };
#endif
// _GLIBCXX_RESOLVE_LIB_DEFECTS
// DR 809. std::swap should be overloaded for array types.
template<typename _Tp, size_t _Nm>
inline void
swap(_Tp (&__a)[_Nm], _Tp (&__b)[_Nm])
// noexcept waits for c++/49045
#ifdef __GXX_EXPERIMENTAL_CXX0X__
noexcept(__is_nothrow_swappable<_Tp>::value)
#endif
{
for (size_t __n = 0; __n < _Nm; ++__n)
swap(__a[__n], __b[__n]);

26
libstdc++-v3/testsuite/25_algorithms/swap/noexcept.cc Normal file
View File

@ -0,0 +1,26 @@
// { dg-do compile }
// { dg-options "-std=gnu++0x" }
// Copyright (C) 2011 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 <utility>
static_assert(noexcept(std::swap(std::declval<int&>(),
std::declval<int&>())), "Error");
static_assert(noexcept(std::swap(std::declval<int(&)[5]>(),
std::declval<int(&)[5]>())), "Error");