Re: [c++0x] remove std::lock_error

[Jonathan Wakely <jwakely dot gcc at gmail dot com>]

2009/5/13 Benjamin Kosnik:
>
>> std::lock_error was removed from the C++0x draft between n2691 and
>> n2723, it's unused in libstdc++ except for
>> testsuite/30_threads/headers/mutex/types_std_c++0x.cc but as its
>> exported it needs to be kept for binary compatibility.
>
> Sigh.
>
>>
>> ? ? ? ? * include/std/mutex: Move std::lock_error to ...
>> ? ? ? ? * src/mutex.cc: Here.
>
> Should be:
> src/compatibility.cc: Here.

Aha.

> Kill the doxygen markup too please.
>
>> ? ? ? ? * testsuite/30_threads/headers/mutex/types_std_c++0x.cc: Add
>> checks for lock types and remove std::lock_error check.
>>
>> tested x86_64 linux, is this OK for trunk?
>
> With this change, yes.

OK, I'll commit this revised patch in the next day or two.

        * include/std/mutex: Move std::lock_error to ...
        * src/compatibility.cc: Here.
        * src/mutex.cc: Likewise.
        * testsuite/30_threads/headers/mutex/types_std_c++0x.cc: Add checks
        for lock types and remove std::lock_error check.

Thanks,

Jonathan

Index: include/std/mutex
===================================================================
--- include/std/mutex	(revision 147496)
+++ include/std/mutex	(working copy)
@@ -386,18 +386,6 @@ namespace std
   extern const try_to_lock_t	try_to_lock;
   extern const adopt_lock_t	adopt_lock;
 
-  /** 
-   *  @brief Thrown to indicate errors with lock operations.
-   *
-   *  @ingroup exceptions
-   */
-  class lock_error : public exception
-  {
-  public:
-    virtual const char*
-    _GLIBCXX_CONST what() const throw();
-  };
-
   /// @brief  Scoped lock idiom.
   // Acquire the mutex here with a constructor call, then release with
   // the destructor call in accordance with RAII style.
Index: src/mutex.cc
===================================================================
--- src/mutex.cc	(revision 147496)
+++ src/mutex.cc	(working copy)
@@ -43,10 +43,6 @@ namespace std
   const try_to_lock_t try_to_lock = try_to_lock_t();
   const adopt_lock_t adopt_lock = adopt_lock_t();
 
-  const char*
-  lock_error::what() const throw()
-  { return "std::lock_error"; }
-
 #ifdef _GLIBCXX_HAVE_TLS
   __thread void* __once_callable;
   __thread void (*__once_call)();
Index: src/compatibility.cc
===================================================================
--- src/compatibility.cc	(revision 147496)
+++ src/compatibility.cc	(working copy)
@@ -513,6 +513,23 @@ extern __attribute__((used, weak)) const
       (void *) _ZTSPKe, (void *) 1L, (void *) _ZTIe };
 #endif // _GLIBCXX_LONG_DOUBLE_COMPAT
 
+// gcc-4.4.0
+// <mutex> exported std::lock_error
+#if defined(_GLIBCXX_HAS_GTHREADS) && defined(_GLIBCXX_USE_C99_STDINT_TR1)
+namespace std
+{
+  class lock_error : public exception
+  {
+  public:
+    virtual const char*
+    _GLIBCXX_CONST what() const throw();
+  };
+
+  const char*
+  lock_error::what() const throw()
+  { return "std::lock_error"; }
+}
+#endif
 
 
 #ifdef _GLIBCXX_SYMVER_DARWIN
Index: testsuite/30_threads/headers/mutex/types_std_c++0x.cc
===================================================================
--- testsuite/30_threads/headers/mutex/types_std_c++0x.cc	(revision 147496)
+++ testsuite/30_threads/headers/mutex/types_std_c++0x.cc	(working copy)
@@ -35,7 +35,8 @@ void test01()
   using std::try_to_lock;
   using std::adopt_lock;
 
-  typedef std::lock_error error_t;
+  typedef std::lock_guard<mutext_t> lock_t;
+  typedef std::unique_lock<rmutext_t> ulock_t;
 
   typedef std::once_flag once_t;
 }