aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely.gcc@gmail.com>2009-06-24 07:13:17 +0000
committerJonathan Wakely <redi@gcc.gnu.org>2009-06-24 08:13:17 +0100
commitc8ee2bfd797661c9607ccaff10cb2df6bc3410d2 (patch)
tree25e5f67f201b83a98bccfd571807c6173ac58217
parent27f41cfea599bae1acce055104ccefd715f71c9d (diff)
downloadgcc-c8ee2bfd797661c9607ccaff10cb2df6bc3410d2.zip
gcc-c8ee2bfd797661c9607ccaff10cb2df6bc3410d2.tar.gz
gcc-c8ee2bfd797661c9607ccaff10cb2df6bc3410d2.tar.bz2
future (shared_future): Adjust doxygen comment.
2009-06-24 Jonathan Wakely <jwakely.gcc@gmail.com> * include/std/future (shared_future): Adjust doxygen comment. From-SVN: r148895
-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 db7c50f..709b42c 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 d155822..c5ece92 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>
{