diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2021-09-22 11:58:20 +0100 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2021-09-23 16:07:38 +0100 |
| commit | ce01e2e64c340dadb55a8a24c545a13e654804d4 (patch) | |
| tree | 176a81b25388f926aa7f7285bbea977ff7c80478 | |
| parent | f6a05b23cc2e53c38e8321ddb5d2cbe40737e506 (diff) | |
| download | gcc-ce01e2e64c340dadb55a8a24c545a13e654804d4.zip gcc-ce01e2e64c340dadb55a8a24c545a13e654804d4.tar.gz gcc-ce01e2e64c340dadb55a8a24c545a13e654804d4.tar.bz2 | |
libstdc++: std::system_category should know meaning of zero [PR102425]
Although 0 is not an errno value, it should still be recognized as
corresponding to a value belonging to the generic_category().
Signed-off-by: Jonathan Wakely <jwakely@redhat.com>
libstdc++-v3/ChangeLog:
PR libstdc++/102425
* src/c++11/system_error.cc
(system_error_category::default_error_condition): Add 0 to
switch.
* testsuite/19_diagnostics/error_category/102425.cc: New test.
| -rw-r--r-- | libstdc++-v3/src/c++11/system_error.cc | 3 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/19_diagnostics/error_category/102425.cc | 18 |
2 files changed, 21 insertions, 0 deletions
diff --git a/libstdc++-v3/src/c++11/system_error.cc b/libstdc++-v3/src/c++11/system_error.cc index f12290a..6c79202 100644 --- a/libstdc++-v3/src/c++11/system_error.cc +++ b/libstdc++-v3/src/c++11/system_error.cc @@ -70,6 +70,8 @@ namespace virtual std::error_condition default_error_condition(int ev) const noexcept { + // Use generic category for all known POSIX errno values (including zero) + // and system category otherwise. switch (ev) { // List of errno macros from [cerrno.syn]. @@ -310,6 +312,7 @@ namespace #ifdef EXDEV case EXDEV: #endif + case 0: return std::error_condition(ev, std::generic_category()); /* Additional system-dependent mappings from non-standard error codes diff --git a/libstdc++-v3/testsuite/19_diagnostics/error_category/102425.cc b/libstdc++-v3/testsuite/19_diagnostics/error_category/102425.cc new file mode 100644 index 0000000..069b5e2 --- /dev/null +++ b/libstdc++-v3/testsuite/19_diagnostics/error_category/102425.cc @@ -0,0 +1,18 @@ +// { dg-do run { target c++11 } } +#include <system_error> +#include <testsuite_hooks.h> + +void test01() +{ + // PR libstdc++/102425 + VERIFY( std::error_code() == std::error_condition() ); + + auto zero = std::system_category().default_error_condition(0); + // This is the condition that the equality above relies on: + VERIFY( zero.category() == std::generic_category() ); +} + +int main() +{ + test01(); +} |