From: bkoz Date: Tue, 23 Jun 2009 23:24:20 +0000 (+0000) Subject: 2009-06-23 Benjamin Kosnik X-Git-Tag: upstream/4.9.2~35252 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=14565c53bd05a15f50d4964ac24370612e2b2716;p=platform%2Fupstream%2Flinaro-gcc.git 2009-06-23 Benjamin Kosnik * 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@148883 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 1a589dd..371c2c9 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,15 @@ +2009-06-23 Benjamin Kosnik + + * 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. + 2009-06-23 Jonathan Wakely * include/bits/shared_ptr.h: Do not swap rvalues. diff --git a/libstdc++-v3/doc/doxygen/user.cfg.in b/libstdc++-v3/doc/doxygen/user.cfg.in index 8e09894..9c4b6c9 100644 --- a/libstdc++-v3/doc/doxygen/user.cfg.in +++ b/libstdc++-v3/doc/doxygen/user.cfg.in @@ -590,6 +590,7 @@ INPUT = @srcdir@/doc/doxygen/doxygroups.cc \ include/deque \ include/fstream \ include/functional \ + include/future \ include/iomanip \ include/ios \ include/iosfwd \ @@ -1427,6 +1428,10 @@ PREDEFINED = __cplusplus \ _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=// \ diff --git a/libstdc++-v3/include/std/future b/libstdc++-v3/include/std/future index c485b96..d155822 100644 --- a/libstdc++-v3/include/std/future +++ b/libstdc++-v3/include/std/future @@ -92,6 +92,19 @@ namespace std error_code _M_code; }; + // Forward declarations. + template + class unique_future; + + template + class shared_future; + + template + class packaged_task; + + template + class promise; + // Holds the result of a future struct _Future_result_base { @@ -304,14 +317,6 @@ namespace std void _M_destroy() { delete this; } }; - /// unique_future - template - class unique_future; - - /// shared_future - template - class shared_future; - // common implementation for unique_future and shared_future template class _Future_impl @@ -375,11 +380,7 @@ namespace std _State_ptr _M_state; }; - /// promise - template - class promise; - - // primary template for unique_future + /// primary template for unique_future template class unique_future : public _Future_impl<_Result> { @@ -458,7 +459,7 @@ namespace std unique_future(const _State_ptr& __state) : _Base_type(__state) { } }; - // primary template for unique_future + /// primary template for unique_future template class shared_future : public _Future_impl<_Result> { @@ -538,9 +539,7 @@ namespace std : _M_state(std::move(__uf._M_state)) { } - template class packaged_task; // undefined - - // primary template for promise + /// primary template for promise template class promise { @@ -814,6 +813,7 @@ namespace std } }; + /// packaged_task template class packaged_task<_Result(_ArgTypes...)> { diff --git a/libstdc++-v3/testsuite/30_threads/promise/cons/assign_neg.cc b/libstdc++-v3/testsuite/30_threads/promise/cons/assign_neg.cc index 0c77173..cebe5f9 100644 --- a/libstdc++-v3/testsuite/30_threads/promise/cons/assign_neg.cc +++ b/libstdc++-v3/testsuite/30_threads/promise/cons/assign_neg.cc @@ -33,4 +33,4 @@ void test01() } // { dg-error "used here" "" { target *-*-* } 32 } -// { dg-error "deleted function" "" { target *-*-* } 583 } +// { dg-error "deleted function" "" { target *-*-* } 582 } diff --git a/libstdc++-v3/testsuite/30_threads/promise/cons/copy_neg.cc b/libstdc++-v3/testsuite/30_threads/promise/cons/copy_neg.cc index 867c4be..cbcdcfb 100644 --- a/libstdc++-v3/testsuite/30_threads/promise/cons/copy_neg.cc +++ b/libstdc++-v3/testsuite/30_threads/promise/cons/copy_neg.cc @@ -32,4 +32,4 @@ void test01() } // { dg-error "used here" "" { target *-*-* } 31 } -// { dg-error "deleted function" "" { target *-*-* } 567 } +// { dg-error "deleted function" "" { target *-*-* } 566 } diff --git a/libstdc++-v3/testsuite/30_threads/shared_future/cons/assign_neg.cc b/libstdc++-v3/testsuite/30_threads/shared_future/cons/assign_neg.cc index 7e3c96ff..3b446d0 100644 --- a/libstdc++-v3/testsuite/30_threads/shared_future/cons/assign_neg.cc +++ b/libstdc++-v3/testsuite/30_threads/shared_future/cons/assign_neg.cc @@ -35,4 +35,4 @@ void test01() } // { dg-error "used here" "" { target *-*-* } 34 } -// { dg-error "deleted function" "" { target *-*-* } 474 } +// { dg-error "deleted function" "" { target *-*-* } 475 } diff --git a/libstdc++-v3/testsuite/30_threads/unique_future/cons/assign_neg.cc b/libstdc++-v3/testsuite/30_threads/unique_future/cons/assign_neg.cc index e9525e4..928ee0a 100644 --- a/libstdc++-v3/testsuite/30_threads/unique_future/cons/assign_neg.cc +++ b/libstdc++-v3/testsuite/30_threads/unique_future/cons/assign_neg.cc @@ -35,4 +35,4 @@ void test01() } // { dg-error "used here" "" { target *-*-* } 34 } -// { dg-error "deleted function" "" { target *-*-* } 394 } +// { dg-error "deleted function" "" { target *-*-* } 395 } diff --git a/libstdc++-v3/testsuite/30_threads/unique_future/cons/copy_neg.cc b/libstdc++-v3/testsuite/30_threads/unique_future/cons/copy_neg.cc index bf40e05..5153636 100644 --- a/libstdc++-v3/testsuite/30_threads/unique_future/cons/copy_neg.cc +++ b/libstdc++-v3/testsuite/30_threads/unique_future/cons/copy_neg.cc @@ -34,4 +34,4 @@ void test01() } // { dg-error "used here" "" { target *-*-* } 33 } -// { dg-error "deleted function" "" { target *-*-* } 393 } +// { dg-error "deleted function" "" { target *-*-* } 394 }