git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tuple (__is_tuple_like_impl): Disambiguate array in debug and profile modes. 

* include/std/tuple (__is_tuple_like_impl): Disambiguate array in
	debug and profile modes.
	* testsuite/25_algorithms/headers/algorithm/synopsis.cc: Adjust tests
	for swap in C++11 and later.

From-SVN: r224397
This commit is contained in:
Jonathan Wakely 2015-06-12 00:22:19 +01:00 committed by Jonathan Wakely
parent 3ab604d528
commit 7672ab25db
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,10 @@
2015-06-12 Jonathan Wakely <jwakely@redhat.com>
* include/std/tuple (__is_tuple_like_impl): Disambiguate array in
debug and profile modes.
* testsuite/25_algorithms/headers/algorithm/synopsis.cc: Adjust tests
for swap in C++11 and later.
2015-06-09 Jonathan Wakely <jwakely@redhat.com> 2015-06-09 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/66030 PR libstdc++/66030

2
libstdc++-v3/include/std/tuple
View File

@ -989,7 +989,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{ }; { };
template<typename _Tp, std::size_t _Nm> template<typename _Tp, std::size_t _Nm>
struct __is_tuple_like_impl<array<_Tp, _Nm>> : true_type struct __is_tuple_like_impl<_GLIBCXX_STD_C::array<_Tp, _Nm>> : true_type
{ }; { };
// Internal type trait that allows us to sfinae-protect tuple_cat. // Internal type trait that allows us to sfinae-protect tuple_cat.

6
libstdc++-v3/testsuite/25_algorithms/headers/algorithm/synopsis.cc
View File

@ -136,14 +136,18 @@ namespace std
copy_backward (_BIter1, _BIter1, _BIter2); copy_backward (_BIter1, _BIter1, _BIter2);
// 25.2.2, swap: // 25.2.2, swap:
#if __cplusplus < 201103L
template<typename _Tp> template<typename _Tp>
void void
swap(_Tp&, _Tp& b); swap(_Tp&, _Tp& b);
#if __cplusplus >= 201103L
template<typename _Tp, size_t _Nm> template<typename _Tp, size_t _Nm>
void void
swap(_Tp (&)[_Nm], _Tp (&)[_Nm]); swap(_Tp (&)[_Nm], _Tp (&)[_Nm]);
#else
// C++11 swap() has complicated SFINAE constraints, test signatures like so:
void (*swap_scalars)(int&, int&) = &swap;
void (*swap_arrays)(int(&)[5], int(&)[5]) = &swap;
#endif #endif
template<typename _FIter1, typename _FIter2> template<typename _FIter1, typename _FIter2>