This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[v3] Fix again the error_constants.h issue


Hi,

I think no_posix_equivalent is just a remnant of previous WDs, thus the
below seems a much better fix to me. Tested x86_64-linux, committing to
mainline.

Paolo.

///////////////////
2008-10-24  Paolo Carlini  <paolo.carlini@oracle.com>

	* 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.
Index: testsuite/19_diagnostics/headers/system_error/errc_std_c++0x.cc
===================================================================
*** testsuite/19_diagnostics/headers/system_error/errc_std_c++0x.cc	(revision 141336)
--- testsuite/19_diagnostics/headers/system_error/errc_std_c++0x.cc	(working copy)
***************
*** 1,7 ****
  // { dg-options "-std=gnu++0x" }
  // { dg-do compile }
  
! // Copyright (C) 2007 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
--- 1,7 ----
  // { dg-options "-std=gnu++0x" }
  // { dg-do compile }
  
! // 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
*************** void test01()
*** 85,91 ****
  #endif
  
    TEST_ERRC(no_message);
-   TEST_ERRC(no_posix_equivalent);
    TEST_ERRC(no_protocol_option);
    TEST_ERRC(no_space_on_device);
  
--- 85,90 ----
Index: config/os/mingw32/error_constants.h
===================================================================
*** config/os/mingw32/error_constants.h	(revision 141336)
--- config/os/mingw32/error_constants.h	(working copy)
***************
*** 1,6 ****
  // Specific definitions for mingw32 platform  -*- C++ -*-
  
! // Copyright (C) 2007 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
--- 1,6 ----
  // Specific definitions for mingw32 platform  -*- C++ -*-
  
! // 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
*************** _GLIBCXX_BEGIN_NAMESPACE(std)
*** 43,49 ****
  
  // Most of the commented-out error codes are socket-related and could be
  // replaced by Winsock WSA-prefixed equivalents.
!   enum class errc : long
      {
  //    address_family_not_supported = 		EAFNOSUPPORT,
  //    address_in_use = 				EADDRINUSE,
--- 43,49 ----
  
  // Most of the commented-out error codes are socket-related and could be
  // replaced by Winsock WSA-prefixed equivalents.
!   enum class errc
      {
  //    address_family_not_supported = 		EAFNOSUPPORT,
  //    address_in_use = 				EADDRINUSE,
*************** _GLIBCXX_BEGIN_NAMESPACE(std)
*** 119,129 ****
  //    timed_out = 				ETIMEDOUT,
        too_many_files_open_in_system = 		ENFILE,
        too_many_files_open = 			EMFILE,
!       too_many_links = 				EMLINK,
   //   too_many_symbolic_link_levels = 		ELOOP,
   //   value_too_large = 			EOVERFLOW,
!  //   wrong_protocol_type = 			EPROTOTYPE,
!       no_posix_equivalent = 1L << 16
     };
  
  _GLIBCXX_END_NAMESPACE
--- 119,128 ----
  //    timed_out = 				ETIMEDOUT,
        too_many_files_open_in_system = 		ENFILE,
        too_many_files_open = 			EMFILE,
!       too_many_links = 				EMLINK
   //   too_many_symbolic_link_levels = 		ELOOP,
   //   value_too_large = 			EOVERFLOW,
!  //   wrong_protocol_type = 			EPROTOTYPE
     };
  
  _GLIBCXX_END_NAMESPACE
Index: config/os/generic/error_constants.h
===================================================================
*** config/os/generic/error_constants.h	(revision 141336)
--- config/os/generic/error_constants.h	(working copy)
***************
*** 40,46 ****
  
  _GLIBCXX_BEGIN_NAMESPACE(std)
  
!   enum class errc : long
      {
        address_family_not_supported = 		EAFNOSUPPORT,
        address_in_use = 				EADDRINUSE,
--- 40,46 ----
  
  _GLIBCXX_BEGIN_NAMESPACE(std)
  
!   enum class errc
      {
        address_family_not_supported = 		EAFNOSUPPORT,
        address_in_use = 				EADDRINUSE,
*************** _GLIBCXX_BEGIN_NAMESPACE(std)
*** 172,179 ****
        value_too_large = 			EOVERFLOW,
  #endif
  
!       wrong_protocol_type = 			EPROTOTYPE,
!       no_posix_equivalent = 1L << 16
      };
  
  _GLIBCXX_END_NAMESPACE
--- 172,178 ----
        value_too_large = 			EOVERFLOW,
  #endif
  
!       wrong_protocol_type = 			EPROTOTYPE
      };
  
  _GLIBCXX_END_NAMESPACE

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]