Commit 6703f185 by Paolo Carlini Committed by Paolo Carlini

functional (function<>::swap): Use std::swap.

2010-10-04  Paolo Carlini  <paolo.carlini@oracle.com>

	* include/std/functional (function<>::swap): Use std::swap.
	* include/tr1/functional (function<>::swap): Likewise.

From-SVN: r164952
parent a90163e9
2010-10-04 Paolo Carlini <paolo.carlini@oracle.com>
* include/std/functional (function<>::swap): Use std::swap.
* include/tr1/functional (function<>::swap): Likewise.
2010-10-04 Andreas Schwab <schwab@redhat.com> 2010-10-04 Andreas Schwab <schwab@redhat.com>
* acinclude.m4 (GLIBCXX_ENABLE): Properly quote argument to * acinclude.m4 (GLIBCXX_ENABLE): Properly quote argument to
......
...@@ -1940,15 +1940,9 @@ namespace std ...@@ -1940,15 +1940,9 @@ namespace std
*/ */
void swap(function& __x) void swap(function& __x)
{ {
_Any_data __old_functor = _M_functor; std::swap(_M_functor, __x._M_functor);
_M_functor = __x._M_functor; std::swap(_M_manager, __x._M_manager);
__x._M_functor = __old_functor; std::swap(_M_invoker, __x._M_invoker);
_Manager_type __old_manager = _M_manager;
_M_manager = __x._M_manager;
__x._M_manager = __old_manager;
_Invoker_type __old_invoker = _M_invoker;
_M_invoker = __x._M_invoker;
__x._M_invoker = __old_invoker;
} }
// TODO: needs allocator_arg_t // TODO: needs allocator_arg_t
......
...@@ -1907,15 +1907,9 @@ namespace tr1 ...@@ -1907,15 +1907,9 @@ namespace tr1
*/ */
void swap(function& __x) void swap(function& __x)
{ {
_Any_data __old_functor = _M_functor; std::swap(_M_functor, __x._M_functor);
_M_functor = __x._M_functor; std::swap(_M_manager, __x._M_manager);
__x._M_functor = __old_functor; std::swap(_M_invoker, __x._M_invoker);
_Manager_type __old_manager = _M_manager;
_M_manager = __x._M_manager;
__x._M_manager = __old_manager;
_Invoker_type __old_invoker = _M_invoker;
_M_invoker = __x._M_invoker;
__x._M_invoker = __old_invoker;
} }
// [3.7.2.3] function capacity // [3.7.2.3] function capacity
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment