Index: include/std/shared_mutex
===================================================================
--- include/std/shared_mutex	(revision 207061)
+++ include/std/shared_mutex	(working copy)
@@ -52,8 +52,8 @@
    */
 
 #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 @@
     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
 
Index: testsuite/30_threads/shared_lock/locking/2.cc
===================================================================
--- testsuite/30_threads/shared_lock/locking/2.cc	(revision 205961)
+++ testsuite/30_threads/shared_lock/locking/2.cc	(working copy)
@@ -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 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
Index: testsuite/30_threads/shared_lock/locking/4.cc
===================================================================
--- testsuite/30_threads/shared_lock/locking/4.cc	(revision 205961)
+++ testsuite/30_threads/shared_lock/locking/4.cc	(working copy)
@@ -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;
 
Index: testsuite/30_threads/shared_lock/locking/1.cc
===================================================================
--- testsuite/30_threads/shared_lock/locking/1.cc	(revision 205961)
+++ testsuite/30_threads/shared_lock/locking/1.cc	(working copy)
@@ -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
Index: testsuite/30_threads/shared_lock/locking/3.cc
===================================================================
--- testsuite/30_threads/shared_lock/locking/3.cc	(revision 205961)
+++ testsuite/30_threads/shared_lock/locking/3.cc	(working copy)
@@ -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
Index: testsuite/30_threads/shared_lock/requirements/explicit_instantiation.cc
===================================================================
--- testsuite/30_threads/shared_lock/requirements/explicit_instantiation.cc	(revision 205961)
+++ testsuite/30_threads/shared_lock/requirements/explicit_instantiation.cc	(working copy)
@@ -27,5 +27,5 @@
 
 namespace std
 {
-  template class shared_lock<shared_mutex>;
+  template class shared_lock<shared_timed_mutex>;
 }
Index: testsuite/30_threads/shared_lock/requirements/typedefs.cc
===================================================================
--- testsuite/30_threads/shared_lock/requirements/typedefs.cc	(revision 205961)
+++ testsuite/30_threads/shared_lock/requirements/typedefs.cc	(working copy)
@@ -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;
 }
Index: testsuite/30_threads/shared_lock/cons/2.cc
===================================================================
--- testsuite/30_threads/shared_lock/cons/2.cc	(revision 205961)
+++ testsuite/30_threads/shared_lock/cons/2.cc	(working copy)
@@ -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
Index: testsuite/30_threads/shared_lock/cons/4.cc
===================================================================
--- testsuite/30_threads/shared_lock/cons/4.cc	(revision 205961)
+++ testsuite/30_threads/shared_lock/cons/4.cc	(working copy)
@@ -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
Index: testsuite/30_threads/shared_lock/cons/1.cc
===================================================================
--- testsuite/30_threads/shared_lock/cons/1.cc	(revision 205961)
+++ testsuite/30_threads/shared_lock/cons/1.cc	(working copy)
@@ -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
Index: testsuite/30_threads/shared_lock/cons/6.cc
===================================================================
--- testsuite/30_threads/shared_lock/cons/6.cc	(revision 205961)
+++ testsuite/30_threads/shared_lock/cons/6.cc	(working copy)
@@ -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;
 
Index: testsuite/30_threads/shared_lock/cons/3.cc
===================================================================
--- testsuite/30_threads/shared_lock/cons/3.cc	(revision 205961)
+++ testsuite/30_threads/shared_lock/cons/3.cc	(working copy)
@@ -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
Index: testsuite/30_threads/shared_lock/cons/5.cc
===================================================================
--- testsuite/30_threads/shared_lock/cons/5.cc	(revision 205961)
+++ testsuite/30_threads/shared_lock/cons/5.cc	(working copy)
@@ -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;
 
Index: testsuite/30_threads/shared_lock/modifiers/2.cc
===================================================================
--- testsuite/30_threads/shared_lock/modifiers/2.cc	(revision 205961)
+++ testsuite/30_threads/shared_lock/modifiers/2.cc	(working copy)
@@ -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
Index: testsuite/30_threads/shared_lock/modifiers/1.cc
===================================================================
--- testsuite/30_threads/shared_lock/modifiers/1.cc	(revision 205961)
+++ testsuite/30_threads/shared_lock/modifiers/1.cc	(working copy)
@@ -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
Index: testsuite/30_threads/shared_mutex/requirements/standard_layout.cc
===================================================================
--- testsuite/30_threads/shared_mutex/requirements/standard_layout.cc	(revision 205961)
+++ testsuite/30_threads/shared_mutex/requirements/standard_layout.cc	(working copy)
@@ -27,5 +27,5 @@
 void test01()
 {
   __gnu_test::standard_layout test;
-  test.operator()<std::shared_mutex>();
+  test.operator()<std::shared_timed_mutex>();
 }
Index: testsuite/30_threads/shared_mutex/cons/copy_neg.cc
===================================================================
--- testsuite/30_threads/shared_mutex/cons/copy_neg.cc	(revision 205961)
+++ testsuite/30_threads/shared_mutex/cons/copy_neg.cc	(working copy)
@@ -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" }
 }
Index: testsuite/30_threads/shared_mutex/cons/1.cc
===================================================================
--- testsuite/30_threads/shared_mutex/cons/1.cc	(revision 205961)
+++ testsuite/30_threads/shared_mutex/cons/1.cc	(working copy)
@@ -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
     {
Index: testsuite/30_threads/shared_mutex/cons/assign_neg.cc
===================================================================
--- testsuite/30_threads/shared_mutex/cons/assign_neg.cc	(revision 205961)
+++ testsuite/30_threads/shared_mutex/cons/assign_neg.cc	(working copy)
@@ -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" }
Index: testsuite/30_threads/shared_mutex/try_lock/2.cc
===================================================================
--- testsuite/30_threads/shared_mutex/try_lock/2.cc	(revision 205961)
+++ testsuite/30_threads/shared_mutex/try_lock/2.cc	(working copy)
@@ -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
     {
Index: testsuite/30_threads/shared_mutex/try_lock/1.cc
===================================================================
--- testsuite/30_threads/shared_mutex/try_lock/1.cc	(revision 205961)
+++ testsuite/30_threads/shared_mutex/try_lock/1.cc	(working copy)
@@ -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
     {
