git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename shared_mutex to shared_timed_mutex per C++14 acceptance of N3891. 

2014-02-20  Ed Smith-Rowland  <3dw4rd@verizon.net>

	Rename shared_mutex to shared_timed_mutex per C++14 acceptance of N3891.
	* include/std/shared_mutex: Rename shared_mutex to shared_timed_mutex.
	* testsuite/30_threads/shared_lock/locking/2.cc: Ditto.
	* testsuite/30_threads/shared_lock/locking/4.cc: Ditto.
	* testsuite/30_threads/shared_lock/locking/1.cc: Ditto.
	* testsuite/30_threads/shared_lock/locking/3.cc: Ditto.
	* testsuite/30_threads/shared_lock/requirements/
	explicit_instantiation.cc: Ditto.
	* testsuite/30_threads/shared_lock/requirements/typedefs.cc: Ditto.
	* testsuite/30_threads/shared_lock/cons/2.cc: Ditto.
	* testsuite/30_threads/shared_lock/cons/4.cc: Ditto.
	* testsuite/30_threads/shared_lock/cons/1.cc: Ditto.
	* testsuite/30_threads/shared_lock/cons/6.cc: Ditto.
	* testsuite/30_threads/shared_lock/cons/3.cc: Ditto.
	* testsuite/30_threads/shared_lock/cons/5.cc: Ditto.
	* testsuite/30_threads/shared_lock/modifiers/2.cc: Ditto.
	* testsuite/30_threads/shared_lock/modifiers/1.cc: Ditto.
	* testsuite/30_threads/shared_mutex/requirements/
	standard_layout.cc: Ditto.
	* testsuite/30_threads/shared_mutex/cons/copy_neg.cc: Ditto.
	* testsuite/30_threads/shared_mutex/cons/1.cc: Ditto.
	* testsuite/30_threads/shared_mutex/cons/assign_neg.cc: Ditto.
	* testsuite/30_threads/shared_mutex/try_lock/2.cc: Ditto.
	* testsuite/30_threads/shared_mutex/try_lock/1.cc: Ditto.

From-SVN: r207964
This commit is contained in:
Ed Smith-Rowland 2014-02-20 16:06:40 +00:00 committed by Edward Smith-Rowland
parent f1dbbe422e
commit 4bbfc5fa4d
22 changed files with 54 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,30 @@
2014-02-20 Ed Smith-Rowland <3dw4rd@verizon.net>
Rename shared_mutex to shared_timed_mutex per C++14 acceptance of N3891.
* include/std/shared_mutex: Rename shared_mutex to shared_timed_mutex.
* testsuite/30_threads/shared_lock/locking/2.cc: Ditto.
* testsuite/30_threads/shared_lock/locking/4.cc: Ditto.
* testsuite/30_threads/shared_lock/locking/1.cc: Ditto.
* testsuite/30_threads/shared_lock/locking/3.cc: Ditto.
* testsuite/30_threads/shared_lock/requirements/
explicit_instantiation.cc: Ditto.
* testsuite/30_threads/shared_lock/requirements/typedefs.cc: Ditto.
* testsuite/30_threads/shared_lock/cons/2.cc: Ditto.
* testsuite/30_threads/shared_lock/cons/4.cc: Ditto.
* testsuite/30_threads/shared_lock/cons/1.cc: Ditto.
* testsuite/30_threads/shared_lock/cons/6.cc: Ditto.
* testsuite/30_threads/shared_lock/cons/3.cc: Ditto.
* testsuite/30_threads/shared_lock/cons/5.cc: Ditto.
* testsuite/30_threads/shared_lock/modifiers/2.cc: Ditto.
* testsuite/30_threads/shared_lock/modifiers/1.cc: Ditto.
* testsuite/30_threads/shared_mutex/requirements/
standard_layout.cc: Ditto.
* testsuite/30_threads/shared_mutex/cons/copy_neg.cc: Ditto.
* testsuite/30_threads/shared_mutex/cons/1.cc: Ditto.
* testsuite/30_threads/shared_mutex/cons/assign_neg.cc: Ditto.
* testsuite/30_threads/shared_mutex/try_lock/2.cc: Ditto.
* testsuite/30_threads/shared_mutex/try_lock/1.cc: Ditto.
2014-02-10 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> 2014-02-10 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* testsuite/22_locale/num_put/put/char/14220.cc: Don't xfail * testsuite/22_locale/num_put/put/char/14220.cc: Don't xfail

12
libstdc++-v3/include/std/shared_mutex
View File

@ -52,8 +52,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
*/ */
#if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1) #if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1)
/// shared_mutex /// shared_timed_mutex
class shared_mutex class shared_timed_mutex
{ {
#if _GTHREAD_USE_MUTEX_TIMEDLOCK #if _GTHREAD_USE_MUTEX_TIMEDLOCK
struct _Mutex : mutex, __timed_mutex_impl<_Mutex> struct _Mutex : mutex, __timed_mutex_impl<_Mutex>
@ -84,15 +84,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
static constexpr unsigned _M_n_readers = ~_S_write_entered; static constexpr unsigned _M_n_readers = ~_S_write_entered;
public: public:
shared_mutex() : _M_state(0) {} shared_timed_mutex() : _M_state(0) {}
~shared_mutex() ~shared_timed_mutex()
{ {
_GLIBCXX_DEBUG_ASSERT( _M_state == 0 ); _GLIBCXX_DEBUG_ASSERT( _M_state == 0 );
} }
shared_mutex(const shared_mutex&) = delete; shared_timed_mutex(const shared_timed_mutex&) = delete;
shared_mutex& operator=(const shared_mutex&) = delete; shared_timed_mutex& operator=(const shared_timed_mutex&) = delete;
// Exclusive ownership // Exclusive ownership

2
libstdc++-v3/testsuite/30_threads/shared_lock/cons/1.cc
View File

@ -30,7 +30,7 @@
int main() int main()
{ {
bool test __attribute__((unused)) = true; bool test __attribute__((unused)) = true;
typedef std::shared_mutex mutex_type; typedef std::shared_timed_mutex mutex_type;
typedef std::shared_lock<mutex_type> lock_type; typedef std::shared_lock<mutex_type> lock_type;
try try

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

@ -30,7 +30,7 @@
int main() int main()
{ {
bool test __attribute__((unused)) = true; bool test __attribute__((unused)) = true;
typedef std::shared_mutex mutex_type; typedef std::shared_timed_mutex mutex_type;
typedef std::shared_lock<mutex_type> lock_type; typedef std::shared_lock<mutex_type> lock_type;
try try

2
libstdc++-v3/testsuite/30_threads/shared_lock/cons/3.cc
View File

@ -30,7 +30,7 @@
int main() int main()
{ {
bool test __attribute__((unused)) = true; bool test __attribute__((unused)) = true;
typedef std::shared_mutex mutex_type; typedef std::shared_timed_mutex mutex_type;
typedef std::shared_lock<mutex_type> lock_type; typedef std::shared_lock<mutex_type> lock_type;
try try

2
libstdc++-v3/testsuite/30_threads/shared_lock/cons/4.cc
View File

@ -30,7 +30,7 @@
int main() int main()
{ {
bool test __attribute__((unused)) = true; bool test __attribute__((unused)) = true;
typedef std::shared_mutex mutex_type; typedef std::shared_timed_mutex mutex_type;
typedef std::shared_lock<mutex_type> lock_type; typedef std::shared_lock<mutex_type> lock_type;
try try

2
libstdc++-v3/testsuite/30_threads/shared_lock/cons/5.cc
View File

@ -31,7 +31,7 @@
int main() int main()
{ {
bool test __attribute__((unused)) = true; bool test __attribute__((unused)) = true;
typedef std::shared_mutex mutex_type; typedef std::shared_timed_mutex mutex_type;
typedef std::shared_lock<mutex_type> lock_type; typedef std::shared_lock<mutex_type> lock_type;
typedef std::chrono::system_clock clock_type; typedef std::chrono::system_clock clock_type;

2
libstdc++-v3/testsuite/30_threads/shared_lock/cons/6.cc
View File

@ -31,7 +31,7 @@
int main() int main()
{ {
bool test __attribute__((unused)) = true; bool test __attribute__((unused)) = true;
typedef std::shared_mutex mutex_type; typedef std::shared_timed_mutex mutex_type;
typedef std::shared_lock<mutex_type> lock_type; typedef std::shared_lock<mutex_type> lock_type;
typedef std::chrono::system_clock clock_type; typedef std::chrono::system_clock clock_type;

2
libstdc++-v3/testsuite/30_threads/shared_lock/locking/1.cc
View File

@ -30,7 +30,7 @@
int main() int main()
{ {
bool test __attribute__((unused)) = true; bool test __attribute__((unused)) = true;
typedef std::shared_mutex mutex_type; typedef std::shared_timed_mutex mutex_type;
typedef std::shared_lock<mutex_type> lock_type; typedef std::shared_lock<mutex_type> lock_type;
try try

4
libstdc++-v3/testsuite/30_threads/shared_lock/locking/2.cc
View File

@ -30,7 +30,7 @@
void test01() void test01()
{ {
bool test __attribute__((unused)) = true; bool test __attribute__((unused)) = true;
typedef std::shared_mutex mutex_type; typedef std::shared_timed_mutex mutex_type;
typedef std::shared_lock<mutex_type> lock_type; typedef std::shared_lock<mutex_type> lock_type;
try try
@ -66,7 +66,7 @@ void test01()
void test02() void test02()
{ {
bool test __attribute__((unused)) = true; bool test __attribute__((unused)) = true;
typedef std::shared_mutex mutex_type; typedef std::shared_timed_mutex mutex_type;
typedef std::shared_lock<mutex_type> lock_type; typedef std::shared_lock<mutex_type> lock_type;
try try

2
libstdc++-v3/testsuite/30_threads/shared_lock/locking/3.cc
View File

@ -31,7 +31,7 @@
int main() int main()
{ {
bool test __attribute__((unused)) = true; bool test __attribute__((unused)) = true;
typedef std::shared_mutex mutex_type; typedef std::shared_timed_mutex mutex_type;
typedef std::shared_lock<mutex_type> lock_type; typedef std::shared_lock<mutex_type> lock_type;
try try

2
libstdc++-v3/testsuite/30_threads/shared_lock/locking/4.cc
View File

@ -31,7 +31,7 @@
int main() int main()
{ {
bool test __attribute__((unused)) = true; bool test __attribute__((unused)) = true;
typedef std::shared_mutex mutex_type; typedef std::shared_timed_mutex mutex_type;
typedef std::shared_lock<mutex_type> lock_type; typedef std::shared_lock<mutex_type> lock_type;
typedef std::chrono::system_clock clock_type; typedef std::chrono::system_clock clock_type;

2
libstdc++-v3/testsuite/30_threads/shared_lock/modifiers/1.cc
View File

@ -30,7 +30,7 @@
int main() int main()
{ {
bool test __attribute__((unused)) = true; bool test __attribute__((unused)) = true;
typedef std::shared_mutex mutex_type; typedef std::shared_timed_mutex mutex_type;
typedef std::shared_lock<mutex_type> lock_type; typedef std::shared_lock<mutex_type> lock_type;
try try

2
libstdc++-v3/testsuite/30_threads/shared_lock/modifiers/2.cc
View File

@ -30,7 +30,7 @@
int main() int main()
{ {
bool test __attribute__((unused)) = true; bool test __attribute__((unused)) = true;
typedef std::shared_mutex mutex_type; typedef std::shared_timed_mutex mutex_type;
typedef std::shared_lock<mutex_type> lock_type; typedef std::shared_lock<mutex_type> lock_type;
try try

2
libstdc++-v3/testsuite/30_threads/shared_lock/requirements/explicit_instantiation.cc
View File

@ -27,5 +27,5 @@
namespace std namespace std
{ {
template class shared_lock<shared_mutex>; template class shared_lock<shared_timed_mutex>;
} }

2
libstdc++-v3/testsuite/30_threads/shared_lock/requirements/typedefs.cc
View File

@ -28,6 +28,6 @@
void test01() void test01()
{ {
// Check for required typedefs // Check for required typedefs
typedef std::shared_lock<std::shared_mutex> test_type; typedef std::shared_lock<std::shared_timed_mutex> test_type;
typedef test_type::mutex_type mutex_type; typedef test_type::mutex_type mutex_type;
} }

2
libstdc++-v3/testsuite/30_threads/shared_mutex/cons/1.cc
View File

@ -30,7 +30,7 @@
int main() int main()
{ {
bool test __attribute__((unused)) = true; bool test __attribute__((unused)) = true;
typedef std::shared_mutex mutex_type; typedef std::shared_timed_mutex mutex_type;
try try
{ {

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

@ -26,7 +26,7 @@
void test01() void test01()
{ {
// assign // assign
typedef std::shared_mutex mutex_type; typedef std::shared_timed_mutex mutex_type;
mutex_type m1; mutex_type m1;
mutex_type m2; mutex_type m2;
m1 = m2; // { dg-error "deleted" } m1 = m2; // { dg-error "deleted" }

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

@ -26,7 +26,7 @@
void test01() void test01()
{ {
// assign // assign
typedef std::shared_mutex mutex_type; typedef std::shared_timed_mutex mutex_type;
mutex_type m1; mutex_type m1;
mutex_type m2(m1); // { dg-error "deleted" } mutex_type m2(m1); // { dg-error "deleted" }
} }

2
libstdc++-v3/testsuite/30_threads/shared_mutex/requirements/standard_layout.cc
View File

@ -27,5 +27,5 @@
void test01() void test01()
{ {
__gnu_test::standard_layout test; __gnu_test::standard_layout test;
test.operator()<std::shared_mutex>(); test.operator()<std::shared_timed_mutex>();
} }

2
libstdc++-v3/testsuite/30_threads/shared_mutex/try_lock/1.cc
View File

@ -30,7 +30,7 @@
int main() int main()
{ {
bool test __attribute__((unused)) = true; bool test __attribute__((unused)) = true;
typedef std::shared_mutex mutex_type; typedef std::shared_timed_mutex mutex_type;
try try
{ {

2
libstdc++-v3/testsuite/30_threads/shared_mutex/try_lock/2.cc
View File

@ -31,7 +31,7 @@
int main() int main()
{ {
bool test __attribute__((unused)) = true; bool test __attribute__((unused)) = true;
typedef std::shared_mutex mutex_type; typedef std::shared_timed_mutex mutex_type;
try try
{ {