diff options
| author | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-02-18 07:35:36 +0000 |
|---|---|---|
| committer | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-02-18 07:35:36 +0000 |
| commit | c47f0e874511ec628ef0b140a4be7276005d27a8 (patch) | |
| tree | d70eeaeb64ce9289bfb6e172e223f4c4cd5f2910 /libstdc++-v3/src/functexcept.cc | |
| parent | f29980e5d27d9f744359173bb14ad7cc1b9f42fc (diff) | |
| download | gcc-c47f0e874511ec628ef0b140a4be7276005d27a8.tar.gz | |
2009-02-17 Benjamin Kosnik <bkoz@redhat.com>
* include/std/system_error (system_category): To system_category().
(generic_category): To generic_category. DR 890.
* src/system_error.cc: Define.
* include/bits/functexcept.h: Only one __throw_system_error.
* src/functexcept.cc: Same.
* include/std/mutex: Fixup for changes above.
* testsuite/19_diagnostics/error_condition/cons/1.cc: Same.
* testsuite/19_diagnostics/error_code/cons/1.cc: Same.
* testsuite/19_diagnostics/system_error/cons-1.cc: Same.
* config/abi/pre/gnu.ver: Clean up exports.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@144259 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/src/functexcept.cc')
| -rw-r--r-- | libstdc++-v3/src/functexcept.cc | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/libstdc++-v3/src/functexcept.cc b/libstdc++-v3/src/functexcept.cc index 266e035662a..d1352d79419 100644 --- a/libstdc++-v3/src/functexcept.cc +++ b/libstdc++-v3/src/functexcept.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -97,16 +97,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std) { throw underflow_error(_(__s)); } void - __throw_system_error(const char* __s) - { throw system_error(error_code(), _(__s)); } + __throw_ios_failure(const char* __s) + { throw ios_base::failure(_(__s)); } void __throw_system_error(int __i) - { throw system_error(error_code(__i, generic_category)); } - - void - __throw_ios_failure(const char* __s) - { throw ios_base::failure(_(__s)); } + { throw system_error(error_code(__i, generic_category())); } #else void __throw_bad_exception(void) @@ -161,16 +157,12 @@ _GLIBCXX_BEGIN_NAMESPACE(std) { std::abort(); } void - __throw_system_error(const char* __s) + __throw_ios_failure(const char*) { std::abort(); } void __throw_system_error(int __i) { std::abort(); } - - void - __throw_ios_failure(const char*) - { std::abort(); } #endif //__EXCEPTIONS _GLIBCXX_END_NAMESPACE |