aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Carlini <paolo.carlini@oracle.com>2010-02-05 17:25:12 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2010-02-05 17:25:12 +0000
commit4e4d27aae5e823e2c443de54871a357fcf760861 (patch)
tree82ae2c9f37a2b4b6b61b7ffb23a78f9940b0bcdd
parent126edba2b7e1a6c8bd208fcacc9639e6320b4e2a (diff)
downloadgcc-4e4d27aae5e823e2c443de54871a357fcf760861.zip
gcc-4e4d27aae5e823e2c443de54871a357fcf760861.tar.gz
gcc-4e4d27aae5e823e2c443de54871a357fcf760861.tar.bz2
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<>&)): Fix typo in last commit. From-SVN: r156525
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/include/std/future2
2 files changed, 6 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 5468a0e..410a15c 100644
--- 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
--- 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); }