This is the mail archive of the
libstdc++@gcc.gnu.org
mailing list for the libstdc++ project.
[v3] doxygen tweaks
- From: Benjamin Kosnik <bkoz at redhat dot com>
- To: libstdc++ at gcc dot gnu dot org, gcc-patches at gcc dot gnu dot org
- Date: Tue, 23 Jun 2009 16:28:18 -0700
- Subject: [v3] doxygen tweaks
Adjusts doxygen for recent futures work, then updates gcc.gnu.org
latest-doxygen.
tested x86/linux
-benjamin
2009-06-23 Benjamin Kosnik <bkoz@redhat.com>
* doc/doxygen/user.cfg.in (PREDEFINED): Add _GLIBCXX_ATOMIC_BUILTINS_*.
(INPUT): Add future.
* include/std/future: Adjust markup.
* testsuite/30_threads/shared_future/cons/assign_neg.cc: Adjust
line numbers.
* testsuite/30_threads/unique_future/cons/assign_neg.cc: Same.
* testsuite/30_threads/unique_future/cons/copy_neg.cc: Same.
* testsuite/30_threads/promise/cons/assign_neg.cc: Same.
* testsuite/30_threads/promise/cons/copy_neg.cc: Same.
Index: doc/doxygen/user.cfg.in
===================================================================
--- doc/doxygen/user.cfg.in (revision 148871)
+++ doc/doxygen/user.cfg.in (working copy)
@@ -590,6 +590,7 @@
include/deque \
include/fstream \
include/functional \
+ include/future \
include/iomanip \
include/ios \
include/iosfwd \
@@ -1427,6 +1428,10 @@
_GLIBCXX_USE_WCHAR_T \
_GLIBCXX_USE_LONG_LONG \
_GLIBCXX_USE_C99_STDINT_TR1 \
+ _GLIBCXX_ATOMIC_BUILTINS_1 \
+ _GLIBCXX_ATOMIC_BUILTINS_2 \
+ _GLIBCXX_ATOMIC_BUILTINS_4 \
+ _GLIBCXX_ATOMIC_BUILTINS_8 \
_GLIBCXX_USE_SCHED_YIELD \
_GLIBCXX_USE_NANOSLEEP \
__glibcxx_function_requires=// \
Index: include/std/future
===================================================================
--- include/std/future (revision 148871)
+++ include/std/future (working copy)
@@ -92,6 +92,19 @@
error_code _M_code;
};
+ // Forward declarations.
+ template<typename _Result>
+ class unique_future;
+
+ template<typename _Result>
+ class shared_future;
+
+ template<typename>
+ class packaged_task;
+
+ template<typename _Result>
+ class promise;
+
// Holds the result of a future
struct _Future_result_base
{
@@ -304,14 +317,6 @@
void _M_destroy() { delete this; }
};
- /// unique_future
- template<typename _Result>
- class unique_future;
-
- /// shared_future
- template<typename _Result>
- class shared_future;
-
// common implementation for unique_future and shared_future
template<typename _Result>
class _Future_impl
@@ -375,12 +380,8 @@
_State_ptr _M_state;
};
- /// promise
+ /// primary template for unique_future
template<typename _Result>
- class promise;
-
- // primary template for unique_future
- template<typename _Result>
class unique_future : public _Future_impl<_Result>
{
typedef _Move_future_result<_Result> _Mover;
@@ -458,7 +459,7 @@
unique_future(const _State_ptr& __state) : _Base_type(__state) { }
};
- // primary template for unique_future
+ /// primary template for unique_future
template<typename _Result>
class shared_future : public _Future_impl<_Result>
{
@@ -538,9 +539,7 @@
: _M_state(std::move(__uf._M_state))
{ }
- template<typename> class packaged_task; // undefined
-
- // primary template for promise
+ /// primary template for promise
template<typename _Result>
class promise
{
@@ -814,6 +813,7 @@
}
};
+ /// packaged_task
template<typename _Result, typename... _ArgTypes>
class packaged_task<_Result(_ArgTypes...)>
{
Index: testsuite/30_threads/shared_future/cons/assign_neg.cc
===================================================================
--- testsuite/30_threads/shared_future/cons/assign_neg.cc (revision 148871)
+++ testsuite/30_threads/shared_future/cons/assign_neg.cc (working copy)
@@ -35,4 +35,4 @@
}
// { dg-error "used here" "" { target *-*-* } 34 }
-// { dg-error "deleted function" "" { target *-*-* } 474 }
+// { dg-error "deleted function" "" { target *-*-* } 475 }
Index: testsuite/30_threads/unique_future/cons/assign_neg.cc
===================================================================
--- testsuite/30_threads/unique_future/cons/assign_neg.cc (revision 148871)
+++ testsuite/30_threads/unique_future/cons/assign_neg.cc (working copy)
@@ -35,4 +35,4 @@
}
// { dg-error "used here" "" { target *-*-* } 34 }
-// { dg-error "deleted function" "" { target *-*-* } 394 }
+// { dg-error "deleted function" "" { target *-*-* } 395 }
Index: testsuite/30_threads/unique_future/cons/copy_neg.cc
===================================================================
--- testsuite/30_threads/unique_future/cons/copy_neg.cc (revision 148871)
+++ testsuite/30_threads/unique_future/cons/copy_neg.cc (working copy)
@@ -34,4 +34,4 @@
}
// { dg-error "used here" "" { target *-*-* } 33 }
-// { dg-error "deleted function" "" { target *-*-* } 393 }
+// { dg-error "deleted function" "" { target *-*-* } 394 }
Index: testsuite/30_threads/promise/cons/assign_neg.cc
===================================================================
--- testsuite/30_threads/promise/cons/assign_neg.cc (revision 148871)
+++ testsuite/30_threads/promise/cons/assign_neg.cc (working copy)
@@ -33,4 +33,4 @@
}
// { dg-error "used here" "" { target *-*-* } 32 }
-// { dg-error "deleted function" "" { target *-*-* } 583 }
+// { dg-error "deleted function" "" { target *-*-* } 582 }
Index: testsuite/30_threads/promise/cons/copy_neg.cc
===================================================================
--- testsuite/30_threads/promise/cons/copy_neg.cc (revision 148871)
+++ testsuite/30_threads/promise/cons/copy_neg.cc (working copy)
@@ -32,4 +32,4 @@
}
// { dg-error "used here" "" { target *-*-* } 31 }
-// { dg-error "deleted function" "" { target *-*-* } 567 }
+// { dg-error "deleted function" "" { target *-*-* } 566 }