user.cfg.in (PREDEFINED): Add _GLIBCXX_ATOMIC_BUILTINS_*.
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. From-SVN: r148883
This commit is contained in:
Benjamin Kosnik
Benjamin Kosnik
parent
2ea259393d
commit
3259554a05
@ -1,3 +1,15 @@
|
||||
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.
|
||||
|
||||
2009-06-23 Jonathan Wakely <jwakely.gcc@gmail.com>
|
||||
|
||||
* include/bits/shared_ptr.h: Do not swap rvalues.
|
||||
|
||||
@ -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=// \
|
||||
|
||||
@ -92,6 +92,19 @@ namespace std
|
||||
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 @@ namespace std
|
||||
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,11 +380,7 @@ namespace std
|
||||
_State_ptr _M_state;
|
||||
};
|
||||
|
||||
/// promise
|
||||
template<typename _Result>
|
||||
class promise;
|
||||
|
||||
// primary template for unique_future
|
||||
/// primary template for unique_future
|
||||
template<typename _Result>
|
||||
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<typename _Result>
|
||||
class shared_future : public _Future_impl<_Result>
|
||||
{
|
||||
@ -538,9 +539,7 @@ namespace std
|
||||
: _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 @@ namespace std
|
||||
}
|
||||
};
|
||||
|
||||
/// packaged_task
|
||||
template<typename _Result, typename... _ArgTypes>
|
||||
class packaged_task<_Result(_ArgTypes...)>
|
||||
{
|
||||
|
||||
@ -33,4 +33,4 @@ void test01()
|
||||
}
|
||||
|
||||
// { dg-error "used here" "" { target *-*-* } 32 }
|
||||
// { dg-error "deleted function" "" { target *-*-* } 583 }
|
||||
// { dg-error "deleted function" "" { target *-*-* } 582 }
|
||||
|
||||
@ -32,4 +32,4 @@ void test01()
|
||||
}
|
||||
|
||||
// { dg-error "used here" "" { target *-*-* } 31 }
|
||||
// { dg-error "deleted function" "" { target *-*-* } 567 }
|
||||
// { dg-error "deleted function" "" { target *-*-* } 566 }
|
||||
|
||||
@ -35,4 +35,4 @@ void test01()
|
||||
}
|
||||
|
||||
// { dg-error "used here" "" { target *-*-* } 34 }
|
||||
// { dg-error "deleted function" "" { target *-*-* } 474 }
|
||||
// { dg-error "deleted function" "" { target *-*-* } 475 }
|
||||
|
||||
@ -35,4 +35,4 @@ void test01()
|
||||
}
|
||||
|
||||
// { dg-error "used here" "" { target *-*-* } 34 }
|
||||
// { dg-error "deleted function" "" { target *-*-* } 394 }
|
||||
// { dg-error "deleted function" "" { target *-*-* } 395 }
|
||||
|
||||
@ -34,4 +34,4 @@ void test01()
|
||||
}
|
||||
|
||||
// { dg-error "used here" "" { target *-*-* } 33 }
|
||||
// { dg-error "deleted function" "" { target *-*-* } 393 }
|
||||
// { dg-error "deleted function" "" { target *-*-* } 394 }
|
||||
|
||||
Loading…
Reference in New Issue
Block a user