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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 8d04dfb78ed8c853319bcd3fe4e1b4df3a1a38ab..7e42778fda5a294a56f8b665e7d7d84784479584 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -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>
 
        * testsuite/22_locale/num_put/put/char/14220.cc: Don't xfail

diff --git a/libstdc++-v3/include/std/shared_mutex b/libstdc++-v3/include/std/shared_mutex
index 8cafd480144edf9a9970f4fec617da227444c7fd..53b39f8251b0bc46220f97455830eca7baced8e3 100644 (file)
--- a/libstdc++-v3/include/std/shared_mutex
+++ b/libstdc++-v3/include/std/shared_mutex
@@ -52,8 +52,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
    */
 
 #if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1)
-  /// shared_mutex
-  class shared_mutex
+  /// shared_timed_mutex
+  class shared_timed_mutex
   {
 #if _GTHREAD_USE_MUTEX_TIMEDLOCK
     struct _Mutex : mutex, __timed_mutex_impl<_Mutex>
@@ -84,15 +84,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
     static constexpr unsigned _M_n_readers = ~_S_write_entered;
 
   public:
-    shared_mutex() : _M_state(0) {}
+    shared_timed_mutex() : _M_state(0) {}
 
-    ~shared_mutex()
+    ~shared_timed_mutex()
     {
       _GLIBCXX_DEBUG_ASSERT( _M_state == 0 );
     }
 
-    shared_mutex(const shared_mutex&) = delete;
-    shared_mutex& operator=(const shared_mutex&) = delete;
+    shared_timed_mutex(const shared_timed_mutex&) = delete;
+    shared_timed_mutex& operator=(const shared_timed_mutex&) = delete;
 
     // Exclusive ownership
 

diff --git a/libstdc++-v3/testsuite/30_threads/shared_lock/cons/1.cc b/libstdc++-v3/testsuite/30_threads/shared_lock/cons/1.cc
index da479b88edb391885d2edb7858c406f27ea9dd20..c271577cf3e0e77cea20782e7b4dffed9bfa6b4e 100644 (file)
--- a/libstdc++-v3/testsuite/30_threads/shared_lock/cons/1.cc
+++ b/libstdc++-v3/testsuite/30_threads/shared_lock/cons/1.cc
@@ -30,7 +30,7 @@
 int main()
 {
   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;
 
   try

diff --git a/libstdc++-v3/testsuite/30_threads/shared_lock/cons/2.cc b/libstdc++-v3/testsuite/30_threads/shared_lock/cons/2.cc
index ab9d8519fb5faa0ce30ea220d54a580864b5b5d7..af01e0e661d57ba3d392e010f3026660f9db4a10 100644 (file)
--- a/libstdc++-v3/testsuite/30_threads/shared_lock/cons/2.cc
+++ b/libstdc++-v3/testsuite/30_threads/shared_lock/cons/2.cc
@@ -30,7 +30,7 @@
 int main()
 {
   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;
 
   try

diff --git a/libstdc++-v3/testsuite/30_threads/shared_lock/cons/3.cc b/libstdc++-v3/testsuite/30_threads/shared_lock/cons/3.cc
index 2ca470e593d215c91f122a53a7a4a13cfe64a99a..17023b410a7334abab97bfa1dd7214e04c291f36 100644 (file)
--- a/libstdc++-v3/testsuite/30_threads/shared_lock/cons/3.cc
+++ b/libstdc++-v3/testsuite/30_threads/shared_lock/cons/3.cc
@@ -30,7 +30,7 @@
 int main()
 {
   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;
 
   try

diff --git a/libstdc++-v3/testsuite/30_threads/shared_lock/cons/4.cc b/libstdc++-v3/testsuite/30_threads/shared_lock/cons/4.cc
index cff54e0dd6c966ca4a65720ee8e575085b512b1b..db761e1f55d7a26d008c84f7a521512f22c23fe8 100644 (file)
--- a/libstdc++-v3/testsuite/30_threads/shared_lock/cons/4.cc
+++ b/libstdc++-v3/testsuite/30_threads/shared_lock/cons/4.cc
@@ -30,7 +30,7 @@
 int main()
 {
   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;
 
   try

diff --git a/libstdc++-v3/testsuite/30_threads/shared_lock/cons/5.cc b/libstdc++-v3/testsuite/30_threads/shared_lock/cons/5.cc
index 1731f1d1eb3cad0fd8569d2f78c5de6f7f851ce5..712e68ca6631236ee50fabb235c363080c7f06ab 100644 (file)
--- a/libstdc++-v3/testsuite/30_threads/shared_lock/cons/5.cc
+++ b/libstdc++-v3/testsuite/30_threads/shared_lock/cons/5.cc
@@ -31,7 +31,7 @@
 int main()
 {
   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::chrono::system_clock clock_type;
 

diff --git a/libstdc++-v3/testsuite/30_threads/shared_lock/cons/6.cc b/libstdc++-v3/testsuite/30_threads/shared_lock/cons/6.cc
index ced28fbb18489f0d1fe38f6a20e55befe5fe58a3..bb1f902acecce0649d1913b0225f14362961e9b9 100644 (file)
--- a/libstdc++-v3/testsuite/30_threads/shared_lock/cons/6.cc
+++ b/libstdc++-v3/testsuite/30_threads/shared_lock/cons/6.cc
@@ -31,7 +31,7 @@
 int main()
 {
   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::chrono::system_clock clock_type;
 

diff --git a/libstdc++-v3/testsuite/30_threads/shared_lock/locking/1.cc b/libstdc++-v3/testsuite/30_threads/shared_lock/locking/1.cc
index 8d07eeac348e4f7cb51a201db7921b6865b05885..ececeb0074a9941b6c155b9354966ce942d72d45 100644 (file)
--- a/libstdc++-v3/testsuite/30_threads/shared_lock/locking/1.cc
+++ b/libstdc++-v3/testsuite/30_threads/shared_lock/locking/1.cc
@@ -30,7 +30,7 @@
 int main()
 {
   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;
 
   try

diff --git a/libstdc++-v3/testsuite/30_threads/shared_lock/locking/2.cc b/libstdc++-v3/testsuite/30_threads/shared_lock/locking/2.cc
index aba28b964c9bf14b5ccf35c179274332c55572ca..3f120ad44656513b2c39fe670c1a7431a1cc97ce 100644 (file)
--- a/libstdc++-v3/testsuite/30_threads/shared_lock/locking/2.cc
+++ b/libstdc++-v3/testsuite/30_threads/shared_lock/locking/2.cc
@@ -30,7 +30,7 @@
 void test01()
 {
   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;
 
   try
@@ -66,7 +66,7 @@ void test01()
 void test02()
 {
   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;
 
   try

diff --git a/libstdc++-v3/testsuite/30_threads/shared_lock/locking/3.cc b/libstdc++-v3/testsuite/30_threads/shared_lock/locking/3.cc
index d267e72afc4d407cc3ece8641fbd53af53e7b1f1..2770a75ed16bfa2bd07338e4a52b9f756fd17b5c 100644 (file)
--- a/libstdc++-v3/testsuite/30_threads/shared_lock/locking/3.cc
+++ b/libstdc++-v3/testsuite/30_threads/shared_lock/locking/3.cc
@@ -31,7 +31,7 @@
 int main()
 {
   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;
 
   try

diff --git a/libstdc++-v3/testsuite/30_threads/shared_lock/locking/4.cc b/libstdc++-v3/testsuite/30_threads/shared_lock/locking/4.cc
index a2e1588bf53a73695b6b622c8a696a9112d9ef11..8d11de9b0353440189a8ed1aaba31b888138e8b2 100644 (file)
--- a/libstdc++-v3/testsuite/30_threads/shared_lock/locking/4.cc
+++ b/libstdc++-v3/testsuite/30_threads/shared_lock/locking/4.cc
@@ -31,7 +31,7 @@
 int main()
 {
   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::chrono::system_clock clock_type;
 

diff --git a/libstdc++-v3/testsuite/30_threads/shared_lock/modifiers/1.cc b/libstdc++-v3/testsuite/30_threads/shared_lock/modifiers/1.cc
index 440ed2f1a6e74a10270050083b85dbd6fbc7081f..03abcc4c8d7bcc3a28a9c9b4abbaa4e0c464e511 100644 (file)
--- a/libstdc++-v3/testsuite/30_threads/shared_lock/modifiers/1.cc
+++ b/libstdc++-v3/testsuite/30_threads/shared_lock/modifiers/1.cc
@@ -30,7 +30,7 @@
 int main()
 {
   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;
 
   try

diff --git a/libstdc++-v3/testsuite/30_threads/shared_lock/modifiers/2.cc b/libstdc++-v3/testsuite/30_threads/shared_lock/modifiers/2.cc
index fd8651d238a8ed9fe1dcdf45b64f67d9b463c58b..a5e3493738f6147d8c7bf54b7de82c88026231a9 100644 (file)
--- a/libstdc++-v3/testsuite/30_threads/shared_lock/modifiers/2.cc
+++ b/libstdc++-v3/testsuite/30_threads/shared_lock/modifiers/2.cc
@@ -30,7 +30,7 @@
 int main()
 {
   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;
 
   try

diff --git a/libstdc++-v3/testsuite/30_threads/shared_lock/requirements/explicit_instantiation.cc b/libstdc++-v3/testsuite/30_threads/shared_lock/requirements/explicit_instantiation.cc
index e6f511eac5db5164cb502802fb857462763b1267..efd61565bdfae5212dcc12843bde8c3c5299e873 100644 (file)
--- a/libstdc++-v3/testsuite/30_threads/shared_lock/requirements/explicit_instantiation.cc
+++ b/libstdc++-v3/testsuite/30_threads/shared_lock/requirements/explicit_instantiation.cc
@@ -27,5 +27,5 @@
 
 namespace std
 {
-  template class shared_lock<shared_mutex>;
+  template class shared_lock<shared_timed_mutex>;
 }

diff --git a/libstdc++-v3/testsuite/30_threads/shared_lock/requirements/typedefs.cc b/libstdc++-v3/testsuite/30_threads/shared_lock/requirements/typedefs.cc
index 8ceb3eeda3f0427f87825cfd241cffc304d8d559..738e7f1471435ce74a3a434c9d62f7a31233a46c 100644 (file)
--- a/libstdc++-v3/testsuite/30_threads/shared_lock/requirements/typedefs.cc
+++ b/libstdc++-v3/testsuite/30_threads/shared_lock/requirements/typedefs.cc
@@ -28,6 +28,6 @@
 void test01()
 {
   // 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;
 }

diff --git a/libstdc++-v3/testsuite/30_threads/shared_mutex/cons/1.cc b/libstdc++-v3/testsuite/30_threads/shared_mutex/cons/1.cc
index 61ca0daf6fcbcf65f79884be60b44633d139c5ae..b38cdbbcbcaa2f0e73979c3be13d5f2b1600eb0d 100644 (file)
--- a/libstdc++-v3/testsuite/30_threads/shared_mutex/cons/1.cc
+++ b/libstdc++-v3/testsuite/30_threads/shared_mutex/cons/1.cc
@@ -30,7 +30,7 @@
 int main()
 {
   bool test __attribute__((unused)) = true;
-  typedef std::shared_mutex mutex_type;
+  typedef std::shared_timed_mutex mutex_type;
 
   try
     {

diff --git a/libstdc++-v3/testsuite/30_threads/shared_mutex/cons/assign_neg.cc b/libstdc++-v3/testsuite/30_threads/shared_mutex/cons/assign_neg.cc
index 759d13357331574ff3c2214facf55b1b0f940ef2..c8be74101eabc79eef20d6ec0262042c8bc6c187 100644 (file)
--- a/libstdc++-v3/testsuite/30_threads/shared_mutex/cons/assign_neg.cc
+++ b/libstdc++-v3/testsuite/30_threads/shared_mutex/cons/assign_neg.cc
@@ -26,7 +26,7 @@
 void test01()
 {
   // assign
-  typedef std::shared_mutex mutex_type;
+  typedef std::shared_timed_mutex mutex_type;
   mutex_type m1;
   mutex_type m2;
   m1 = m2;                     // { dg-error "deleted" }

diff --git a/libstdc++-v3/testsuite/30_threads/shared_mutex/cons/copy_neg.cc b/libstdc++-v3/testsuite/30_threads/shared_mutex/cons/copy_neg.cc
index 754d162eeaeeaeb3cb0b464a17dd0451f7bc2666..780c1934112d17669428448d941a7798a675af41 100644 (file)
--- a/libstdc++-v3/testsuite/30_threads/shared_mutex/cons/copy_neg.cc
+++ b/libstdc++-v3/testsuite/30_threads/shared_mutex/cons/copy_neg.cc
@@ -26,7 +26,7 @@
 void test01()
 {
   // assign
-  typedef std::shared_mutex mutex_type;
+  typedef std::shared_timed_mutex mutex_type;
   mutex_type m1;
   mutex_type m2(m1);           // { dg-error "deleted" }
 }

diff --git a/libstdc++-v3/testsuite/30_threads/shared_mutex/requirements/standard_layout.cc b/libstdc++-v3/testsuite/30_threads/shared_mutex/requirements/standard_layout.cc
index 0ca18e7c60db26e3f6c616369559cc25c934e6ad..3133b10eb469e81a6d4df477308adcf45b2289c9 100644 (file)
--- a/libstdc++-v3/testsuite/30_threads/shared_mutex/requirements/standard_layout.cc
+++ b/libstdc++-v3/testsuite/30_threads/shared_mutex/requirements/standard_layout.cc
@@ -27,5 +27,5 @@
 void test01()
 {
   __gnu_test::standard_layout test;
-  test.operator()<std::shared_mutex>();
+  test.operator()<std::shared_timed_mutex>();
 }

diff --git a/libstdc++-v3/testsuite/30_threads/shared_mutex/try_lock/1.cc b/libstdc++-v3/testsuite/30_threads/shared_mutex/try_lock/1.cc
index ab87ab1118f7a9137b82e157244c1595b93a3341..c13e05b57e1c7aca44cc2076b43c0f05b20030a2 100644 (file)
--- a/libstdc++-v3/testsuite/30_threads/shared_mutex/try_lock/1.cc
+++ b/libstdc++-v3/testsuite/30_threads/shared_mutex/try_lock/1.cc
@@ -30,7 +30,7 @@
 int main()
 {
   bool test __attribute__((unused)) = true;
-  typedef std::shared_mutex mutex_type;
+  typedef std::shared_timed_mutex mutex_type;
 
   try
     {

diff --git a/libstdc++-v3/testsuite/30_threads/shared_mutex/try_lock/2.cc b/libstdc++-v3/testsuite/30_threads/shared_mutex/try_lock/2.cc
index f287771675cfa9e0aecdb0badfe2ca0ccb8adc82..28f833ba6f3f34c46dad6c01b3876b7a34f0534c 100644 (file)
--- a/libstdc++-v3/testsuite/30_threads/shared_mutex/try_lock/2.cc
+++ b/libstdc++-v3/testsuite/30_threads/shared_mutex/try_lock/2.cc
@@ -31,7 +31,7 @@
 int main()
 {
   bool test __attribute__((unused)) = true;
-  typedef std::shared_mutex mutex_type;
+  typedef std::shared_timed_mutex mutex_type;
 
   try
     {