mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-01-13 13:35:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

future: Use base class with nested types.

Browse Source 
2009-11-02  Benjamin Kosnik  <bkoz@redhat.com>

	* include/std/future: Use base class with nested types.
	(__future_base): New.
	(__future_base::_Result_base): From _Future_result_base.
	(__future_base::_Result): From _Future_result.
	(__future_base::_Move_result): From _Move_future_result.
	(__future_base::_Ptr): From _Future_ptr.
	(__future_base::_State): From _Future_state.
	(__basic_future): From _Future_impl.
	* testsuite/30_threads/packaged_task/cons/assign_neg.cc: Adjust line
	numbers.
	* testsuite/30_threads/packaged_task/cons/copy_neg.cc: Same.
	* testsuite/30_threads/shared_future/cons/assign_neg.cc: Same.
	* 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: r153834
This commit is contained in:
Benjamin Kosnik 2009-11-03 00:47:48 +00:00
parent c393f55941
commit c36abf0326
9 changed files with 410 additions and 347 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,22 @@
2009-11-02 Benjamin Kosnik <bkoz@redhat.com>
* include/std/future: Use base class with nested types.
(__future_base): New.
(__future_base::_Result_base): From _Future_result_base.
(__future_base::_Result): From _Future_result.
(__future_base::_Move_result): From _Move_future_result.
(__future_base::_Ptr): From _Future_ptr.
(__future_base::_State): From _Future_state.
(__basic_future): From _Future_impl.
* testsuite/30_threads/packaged_task/cons/assign_neg.cc: Adjust line
numbers.
* testsuite/30_threads/packaged_task/cons/copy_neg.cc: Same.
* testsuite/30_threads/shared_future/cons/assign_neg.cc: Same.
* 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-10-31 Paolo Carlini <paolo.carlini@oracle.com> 2009-10-31 Paolo Carlini <paolo.carlini@oracle.com>
* include/std/chrono (struct __common_rep_type): New. * include/std/chrono (struct __common_rep_type): New.
@ -9,7 +28,7 @@
operator/(const duration<>&, const _Rep2&), operator/(const duration<>&, const _Rep2&),
time_point_cast(const time_point<>&)): Implement resolution of time_point_cast(const time_point<>&)): Implement resolution of
DR 1177 ([Ready] in Santa Cruz), change to not participate to DR 1177 ([Ready] in Santa Cruz), change to not participate to
overload resolution if the constraints are not met. overload resolution if the constraints are not met.
* testsuite/20_util/duration/cons/1_neg.cc: Adjust dg-errors. * testsuite/20_util/duration/cons/1_neg.cc: Adjust dg-errors.
* testsuite/20_util/duration/cons/dr974.cc: Likewise. * testsuite/20_util/duration/cons/dr974.cc: Likewise.
* testsuite/20_util/duration/requirements/typedefs_neg1.cc: Adjust * testsuite/20_util/duration/requirements/typedefs_neg1.cc: Adjust

722
libstdc++-v3/include/std/future
View File

File diff suppressed because it is too large Load Diff

2
libstdc++-v3/testsuite/30_threads/packaged_task/cons/assign_neg.cc
View File

@ -33,4 +33,4 @@ void test01()
} }
// { dg-error "used here" "" { target *-*-* } 32 } // { dg-error "used here" "" { target *-*-* } 32 }
// { dg-error "deleted function" "" { target *-*-* } 864 } // { dg-error "deleted function" "" { target *-*-* } 912 }

2
libstdc++-v3/testsuite/30_threads/packaged_task/cons/copy_neg.cc
View File

@ -32,4 +32,4 @@ void test01()
} }
// { dg-error "used here" "" { target *-*-* } 31 } // { dg-error "used here" "" { target *-*-* } 31 }
// { dg-error "deleted function" "" { target *-*-* } 863 } // { dg-error "deleted function" "" { target *-*-* } 911 }

2
libstdc++-v3/testsuite/30_threads/promise/cons/assign_neg.cc
View File

@ -33,4 +33,4 @@ void test01()
} }
// { dg-error "used here" "" { target *-*-* } 32 } // { dg-error "used here" "" { target *-*-* } 32 }
// { dg-error "deleted function" "" { target *-*-* } 590 } // { dg-error "deleted function" "" { target *-*-* } 630 }

2
libstdc++-v3/testsuite/30_threads/promise/cons/copy_neg.cc
View File

@ -32,4 +32,4 @@ void test01()
} }
// { dg-error "used here" "" { target *-*-* } 31 } // { dg-error "used here" "" { target *-*-* } 31 }
// { dg-error "deleted function" "" { target *-*-* } 574 } // { dg-error "deleted function" "" { target *-*-* } 614 }

2
libstdc++-v3/testsuite/30_threads/shared_future/cons/assign_neg.cc
View File

@ -35,4 +35,4 @@ void test01()
} }
// { dg-error "used here" "" { target *-*-* } 34 } // { dg-error "used here" "" { target *-*-* } 34 }
// { dg-error "deleted function" "" { target *-*-* } 483 } // { dg-error "deleted function" "" { target *-*-* } 514 }

2
libstdc++-v3/testsuite/30_threads/unique_future/cons/assign_neg.cc
View File

@ -35,4 +35,4 @@ void test01()
} }
// { dg-error "used here" "" { target *-*-* } 34 } // { dg-error "used here" "" { target *-*-* } 34 }
// { dg-error "deleted function" "" { target *-*-* } 403 } // { dg-error "deleted function" "" { target *-*-* } 440 }

2
libstdc++-v3/testsuite/30_threads/unique_future/cons/copy_neg.cc
View File

@ -34,4 +34,4 @@ void test01()
} }
// { dg-error "used here" "" { target *-*-* } 33 } // { dg-error "used here" "" { target *-*-* } 33 }
// { dg-error "deleted function" "" { target *-*-* } 402 } // { dg-error "deleted function" "" { target *-*-* } 439 }