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

re PR libstdc++/46821 ([C++0x] swapping empty classes) 

2010-12-06  Paolo Carlini  <paolo.carlini@oracle.com>

	PR libstdc++/46821
	* include/std/tuple (_Head_base<,, true>::_M_swap_impl):
	Swap the empty bases.
	(_Head_base<,, false>::_M_swap_impl): Minor tweak.
	* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Adjust dg-error
	line number.

From-SVN: r167497
This commit is contained in:
Paolo Carlini 2010-12-06 14:44:38 +00:00 committed by Paolo Carlini
parent 1a23b86107
commit 258e15e073
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,12 @@
2010-12-06 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/46821
* include/std/tuple (_Head_base<,, true>::_M_swap_impl):
Swap the empty bases.
(_Head_base<,, false>::_M_swap_impl): Minor tweak.
* testsuite/20_util/weak_ptr/comparison/cmp_neg.cc: Adjust dg-error
line number.
2010-12-06 Dave Korn <dave.korn.cygwin@gmail.com> 2010-12-06 Dave Korn <dave.korn.cygwin@gmail.com>
PR target/40125 PR target/40125
@ -54,7 +63,7 @@
* testsuite/23_containers/deque/cons/2.cc: Fix to explicitly invoke * testsuite/23_containers/deque/cons/2.cc: Fix to explicitly invoke
the copy constructor with or without C++0x mode. the copy constructor with or without C++0x mode.
* testsuite/23_containers/vector/cons/4.cc: Likewise. * testsuite/23_containers/vector/cons/4.cc: Likewise.
2010-12-01 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> 2010-12-01 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* scripts/extract_symvers.pl: New file. * scripts/extract_symvers.pl: New file.

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

@ -78,7 +78,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
const _Head& _M_head() const { return *this; } const _Head& _M_head() const { return *this; }
void void
_M_swap_impl(_Head&) { /* no-op */ } _M_swap_impl(_Head& __h)
{
using std::swap;
swap(__h, _M_head());
}
}; };
template<std::size_t _Idx, typename _Head> template<std::size_t _Idx, typename _Head>
@ -101,7 +105,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
_M_swap_impl(_Head& __h) _M_swap_impl(_Head& __h)
{ {
using std::swap; using std::swap;
swap(__h, _M_head_impl); swap(__h, _M_head());
} }
_Head _M_head_impl; _Head _M_head_impl;

2
libstdc++-v3/testsuite/20_util/weak_ptr/comparison/cmp_neg.cc
View File

@ -44,7 +44,7 @@ main()
// { dg-warning "note" "" { target *-*-* } 350 } // { dg-warning "note" "" { target *-*-* } 350 }
// { dg-warning "note" "" { target *-*-* } 1082 } // { dg-warning "note" "" { target *-*-* } 1082 }
// { dg-warning "note" "" { target *-*-* } 465 } // { dg-warning "note" "" { target *-*-* } 465 }
// { dg-warning "note" "" { target *-*-* } 581 } // { dg-warning "note" "" { target *-*-* } 585 }
// { dg-warning "note" "" { target *-*-* } 1027 } // { dg-warning "note" "" { target *-*-* } 1027 }
// { dg-warning "note" "" { target *-*-* } 340 } // { dg-warning "note" "" { target *-*-* } 340 }
// { dg-warning "note" "" { target *-*-* } 290 } // { dg-warning "note" "" { target *-*-* } 290 }