From 918bf5c10e1d5b026dfedd58d3e701536142fcc2 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Fri, 24 Oct 2008 10:41:42 +0000 Subject: [PATCH] error_constants.h (enum errc): Remove no_posix_equivalent. 2008-10-24 Paolo Carlini * config/os/generic/error_constants.h (enum errc): Remove no_posix_equivalent. * config/os/mingw32/error_constants.h (enum errc): Likewise. * testsuite/19_diagnostics/headers/system_error/errc_std_c++0x.cc: Adjust. From-SVN: r141341 --- libstdc++-v3/ChangeLog | 8 ++++++++ libstdc++-v3/config/os/generic/error_constants.h | 5 ++--- libstdc++-v3/config/os/mingw32/error_constants.h | 9 ++++----- .../headers/system_error/errc_std_c++0x.cc | 3 +-- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 1144f9c4375..97ce9efec4f 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2008-10-24 Paolo Carlini + + * config/os/generic/error_constants.h (enum errc): Remove + no_posix_equivalent. + * config/os/mingw32/error_constants.h (enum errc): Likewise. + * testsuite/19_diagnostics/headers/system_error/errc_std_c++0x.cc: + Adjust. + 2008-10-24 Jakub Jelinek * testsuite/Makefile.am (AUTOMAKE_OPTIONS): Remove dejagnu. diff --git a/libstdc++-v3/config/os/generic/error_constants.h b/libstdc++-v3/config/os/generic/error_constants.h index edb196fc361..73918e5543e 100644 --- a/libstdc++-v3/config/os/generic/error_constants.h +++ b/libstdc++-v3/config/os/generic/error_constants.h @@ -40,7 +40,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) - enum class errc : long + enum class errc { address_family_not_supported = EAFNOSUPPORT, address_in_use = EADDRINUSE, @@ -172,8 +172,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) value_too_large = EOVERFLOW, #endif - wrong_protocol_type = EPROTOTYPE, - no_posix_equivalent = 1L << 16 + wrong_protocol_type = EPROTOTYPE }; _GLIBCXX_END_NAMESPACE diff --git a/libstdc++-v3/config/os/mingw32/error_constants.h b/libstdc++-v3/config/os/mingw32/error_constants.h index 7b756cc6b93..ce34bdeebd8 100644 --- a/libstdc++-v3/config/os/mingw32/error_constants.h +++ b/libstdc++-v3/config/os/mingw32/error_constants.h @@ -1,6 +1,6 @@ // Specific definitions for mingw32 platform -*- C++ -*- -// Copyright (C) 2007 Free Software Foundation, Inc. +// Copyright (C) 2007, 2008 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 @@ -43,7 +43,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // Most of the commented-out error codes are socket-related and could be // replaced by Winsock WSA-prefixed equivalents. - enum class errc : long + enum class errc { // address_family_not_supported = EAFNOSUPPORT, // address_in_use = EADDRINUSE, @@ -119,11 +119,10 @@ _GLIBCXX_BEGIN_NAMESPACE(std) // timed_out = ETIMEDOUT, too_many_files_open_in_system = ENFILE, too_many_files_open = EMFILE, - too_many_links = EMLINK, + too_many_links = EMLINK // too_many_symbolic_link_levels = ELOOP, // value_too_large = EOVERFLOW, - // wrong_protocol_type = EPROTOTYPE, - no_posix_equivalent = 1L << 16 + // wrong_protocol_type = EPROTOTYPE }; _GLIBCXX_END_NAMESPACE diff --git a/libstdc++-v3/testsuite/19_diagnostics/headers/system_error/errc_std_c++0x.cc b/libstdc++-v3/testsuite/19_diagnostics/headers/system_error/errc_std_c++0x.cc index d2325d17d46..6eff4ee5bda 100644 --- a/libstdc++-v3/testsuite/19_diagnostics/headers/system_error/errc_std_c++0x.cc +++ b/libstdc++-v3/testsuite/19_diagnostics/headers/system_error/errc_std_c++0x.cc @@ -1,7 +1,7 @@ // { dg-options "-std=gnu++0x" } // { dg-do compile } -// Copyright (C) 2007 Free Software Foundation, Inc. +// Copyright (C) 2007, 2008 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 @@ -85,7 +85,6 @@ void test01() #endif TEST_ERRC(no_message); - TEST_ERRC(no_posix_equivalent); TEST_ERRC(no_protocol_option); TEST_ERRC(no_space_on_device);