2010-02-05 Paolo Carlini <paolo.carlini@oracle.com>

	* include/std/future (swap(packaged_task<>&, packaged_task<>&)): Fix
	typo in last commit.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@156525 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 5468a0e..410a15c 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,10 @@
 2010-02-05  Paolo Carlini  <paolo.carlini@oracle.com>
 
+       * include/std/future (swap(packaged_task<>&, packaged_task<>&)): Fix
+       typo in last commit.
+
+2010-02-05  Paolo Carlini  <paolo.carlini@oracle.com>
+
        * include/std/future (swap(packaged_task<>&, packaged_task<>&),
        swap(promise<>&, promise<>&)): Add; minor formatting fixes.
        * testsuite/30_threads/packaged_task/cons/assign_neg.cc: Adjust

diff --git a/libstdc++-v3/include/std/future b/libstdc++-v3/include/std/future
index b7b2449..2f1eedc 100644 (file)
--- a/libstdc++-v3/include/std/future
+++ b/libstdc++-v3/include/std/future
@@ -1262,7 +1262,7 @@ namespace std
     };
 
   template<typename _Res, typename... _ArgTypes>
-    void inline
+    inline void
     swap(packaged_task<_Res(_ArgTypes...)>& __x,
         packaged_task<_Res(_ArgTypes...)>& __y)
     { __x.swap(__y); }