2008-10-22 Chris Fairles <cfairles@gcc.gnu.org>

        * include/std/system_error (is_error_code_enum): Specialize for errc.
        (error_category::error_category): Defaulted and protected.
        (error_category::~error_category): New, virtual.
        (error_category::error_category(const error_category&),
        error_category::operator=(const error_category&)): Deleted.
        (get_system_category, get_posix_category): Remove (DR 890).
        (system_category): External linkage (DR 890).
        (posix_category): Remove.
        (generic_category): Add. External linkage (DR 890).
        (error_code::error_code<>(_ErrorCodeEnum)): Use generic_category.
        (error_code::clear, error_code::operator=<>(_ErrorCodeEnum)): Forward to
        error_code::assign, use generic_category.
        (error_condition::error_condition,
        error_condition::error_condition<>(_ErrorConditionEnum)): Use
        generic_category.
        (error_condition::clear,
        error_condition::operator=<>(_ErrorConditionEnum)): Forward to
        error_code::assign, use generic_category.
        (make_error_code, make_error_condition): Define in namespace std.
        * include/std/mutex (unique_lock<>::lock, unique_lock<>::try_lock,
        unique_lock<>::try_lock_until<>(duration),
        unique_lock<>::try_lock_for<>(duration)): Replace posix_error with errc.
        * src/system_error.cc (system_error_category, generic_error_category):
        New.
        (gnu_error_category): Remove.
        (get_system_category, get_posix_category): Remove (DR 890).
        (system_category, generic_category): Define.
        * src/functexcept.cc (__throw_system_error): Use generic_category.
        * config/abi/pre/gnu.ver: Export system_category and generic_category,
        remove get_system_category and get_generic_category (DR 890).
        * config/os/generic/error_constants.h (posix_errno): Rename to errc, use
        enum class type. Fix spelling.
        * config/os/mingw32/error_constants.h (posix_errno): Likewise.
        * testsuite/19_diagnostics/error_code/cons/1.cc: Use errc and
        generic_category.
        * testsuite/19_diagnostics/error_code/operators/bool.cc: Use errc.
        * testsuite/19_diagnostics/error_code/operators/equal.cc: Likewise.
        * testsuite/19_diagnostics/error_code/operators/not_equal.cc: Likewise.
        * testsuite/19_diagnostics/error_category/cons/copy_neg.cc: Update
        dg-error line numbers.
        * testsuite/19_diagnostics/error_condition/cons/1.cc: Use
        generic_category.
        * testsuite/19_diagnostics/error_condition/operators/bool.cc: Use errc.
        * testsuite/19_diagnostics/error_condition/operators/equal.cc: Likewise.
        * testsuite/19_diagnostics/error_condition/operators/not_equal.cc:
        Likewise.
        * testsuite/19_diagnostics/headers/system_error/errc_std_c++0x.cc: New.
        * testsuite/19_diagnostics/headers/system_error/types_std_c++0x.cc:
        Remove using tests since errc is not a namespace.
        * testsuite/19_diagnostics/system_error/cons-1.cc: Use errc.
        * testsuite/19_diagnostics/system_error/what-4.cc: Likewise.
        * testsuite/27_io/basic_ostream/inserters_other/wchar_t/error_code.cc:
        Likewise.
        * testsuite/27_io/basic_ostream/inserters_other/char/error_code.cc:
        Likewise.
        * testsuite/30_threads/unique_lock/locking/2.cc: Likewise.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@141297 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 9 insertions, 9 deletions

diff --git a/libstdc++-v3/include/std/mutex b/libstdc++-v3/include/std/mutex
index f3848d09c02..e3922360b3d 100644
--- a/libstdc++-v3/include/std/mutex
+++ b/libstdc++-v3/include/std/mutex
@@ -489,9 +489,9 @@ namespace std
       lock()
       {
 	if (!_M_device)
-	  __throw_system_error(posix_error::operation_not_permitted);
+	  __throw_system_error((int)errc::operation_not_permitted);
 	else if (_M_owns)
-	  __throw_system_error(posix_error::resource_deadlock_would_occur);
+	  __throw_system_error((int)errc::resource_deadlock_would_occur);
 	else
 	  {
 	    _M_device->lock();
@@ -503,9 +503,9 @@ namespace std
       try_lock()
       {
 	if (!_M_device)
-          __throw_system_error(posix_error::operation_not_permitted);
+          __throw_system_error((int)errc::operation_not_permitted);
         else if (_M_owns)
-          __throw_system_error(posix_error::resource_deadlock_would_occur);
+          __throw_system_error((int)errc::resource_deadlock_would_occur);
         else
 	  {
 	    _M_owns = _M_device->try_lock();	    
@@ -518,9 +518,9 @@ namespace std
         try_lock_until(const chrono::time_point<_Clock, _Duration>& __atime)
         {
 	  if (!_M_device)
-	    __throw_system_error(posix_error::operation_not_permitted);
+	    __throw_system_error((int)errc::operation_not_permitted);
 	  else if (_M_owns)
-	    __throw_system_error(posix_error::resource_deadlock_would_occur);
+	    __throw_system_error((int)errc::resource_deadlock_would_occur);
 	  else
 	    {
 	      _M_owns = _M_device->try_lock_until(__atime);
@@ -533,9 +533,9 @@ namespace std
 	try_lock_for(const chrono::duration<_Rep, _Period>& __rtime)
         {
 	  if (!_M_device)
-	    __throw_system_error(posix_error::operation_not_permitted);
+	    __throw_system_error((int)errc::operation_not_permitted);
 	  else if (_M_owns)
-	    __throw_system_error(posix_error::resource_deadlock_would_occur);
+	    __throw_system_error((int)errc::resource_deadlock_would_occur);
 	  else
 	    {
 	      _M_owns = _M_device->try_lock_for(__rtime);
@@ -547,7 +547,7 @@ namespace std
       unlock()
       {
         if (!_M_owns)
-          __throw_system_error(posix_error::operation_not_permitted);
+          __throw_system_error((int)errc::operation_not_permitted);
         else if (_M_device)
           {
             _M_device->unlock();