summaryrefslogtreecommitdiff
path: root/libstdc++-v3
diff options
context:
space:
mode:
authorredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>2009-06-24 07:13:17 +0000
committerredi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>2009-06-24 07:13:17 +0000
commit9c46747dbe57abdd26e0339d7f5a9710da0fc3d4 (patch)
tree25e5f67f201b83a98bccfd571807c6173ac58217 /libstdc++-v3
parentddfabca59c6cbf3e7b8862fd6ac57b6197c5d196 (diff)
downloadgcc-9c46747dbe57abdd26e0339d7f5a9710da0fc3d4.tar.gz
2009-06-24 Jonathan Wakely <jwakely.gcc@gmail.com>
* include/std/future (shared_future): Adjust doxygen comment. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@148895 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
-rw-r--r--libstdc++-v3/ChangeLog4
-rw-r--r--libstdc++-v3/include/std/future2
2 files changed, 5 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index db7c50f34e6..709b42c57da 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,9 @@
2009-06-24 Jonathan Wakely <jwakely.gcc@gmail.com>
+ * include/std/future (shared_future): Adjust doxygen comment.
+
+2009-06-24 Jonathan Wakely <jwakely.gcc@gmail.com>
+
PR libstdc++/40297
* include/bits/atomic_0.h: Reverse debug assertions.
* include/bits/atomic_2.h: Likewise.
diff --git a/libstdc++-v3/include/std/future b/libstdc++-v3/include/std/future
index d155822ac68..c5ece926463 100644
--- a/libstdc++-v3/include/std/future
+++ b/libstdc++-v3/include/std/future
@@ -459,7 +459,7 @@ namespace std
unique_future(const _State_ptr& __state) : _Base_type(__state) { }
};
- /// primary template for unique_future
+ /// primary template for shared_future
template<typename _Result>
class shared_future : public _Future_impl<_Result>
{