From 8089616e6abc2a796ad4a6d7d084b766454ce3e1 Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Mon, 5 Feb 2001 22:27:40 +0000 Subject: [PATCH] std_cerrno.h: Correct date format for copyright. 2001-02-05 Benjamin Kosnik * include/c_std/bits/std_cerrno.h: Correct date format for copyright. * include/c_std/bits/std_cctype.h: Same. * include/c_std/bits/std_cassert.h: Same. * include/c_std/bits/std_cstdarg.h: Same. * include/c_std/bits/std_cstddef.h: Same. * include/c_std/bits/std_cstdio.h: Undefine all names brought into namespace std. * include/c_std/bits/std_ctime.h: Same. * include/c_std/bits/std_clocale.h: Same. * include/c_std/bits/std_cmath.h: Same. * include/c_std/bits/std_csetjmp.h: Same. * include/c_std/bits/std_csignal.h: Same. * include/c_std/bits/std_cstring.h: Same. * include/c_std/bits/std_cstdlib.h: Same. * include/c_std/bits/std_cwchar.h: Same. From-SVN: r39468 --- libstdc++-v3/ChangeLog | 19 +++++++ libstdc++-v3/include/c_std/bits/std_cassert.h | 4 +- libstdc++-v3/include/c_std/bits/std_cctype.h | 2 +- libstdc++-v3/include/c_std/bits/std_cerrno.h | 2 +- libstdc++-v3/include/c_std/bits/std_cfloat.h | 2 +- libstdc++-v3/include/c_std/bits/std_climits.h | 2 +- libstdc++-v3/include/c_std/bits/std_clocale.h | 4 ++ libstdc++-v3/include/c_std/bits/std_cmath.h | 29 +++++++++-- libstdc++-v3/include/c_std/bits/std_csetjmp.h | 5 +- libstdc++-v3/include/c_std/bits/std_csignal.h | 5 +- libstdc++-v3/include/c_std/bits/std_cstdarg.h | 2 +- libstdc++-v3/include/c_std/bits/std_cstddef.h | 2 +- libstdc++-v3/include/c_std/bits/std_cstdio.h | 49 ++++++++++++++++--- libstdc++-v3/include/c_std/bits/std_cstdlib.h | 37 +++++++++++++- libstdc++-v3/include/c_std/bits/std_cstring.h | 24 +++++++++ libstdc++-v3/include/c_std/bits/std_ctime.h | 9 ++++ libstdc++-v3/include/c_std/bits/std_cwchar.h | 44 +++++++++++++++++ 17 files changed, 220 insertions(+), 21 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 02794f9458c..291b6853d5b 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,22 @@ +2001-02-05 Benjamin Kosnik + + * include/c_std/bits/std_cerrno.h: Correct date format for copyright. + * include/c_std/bits/std_cctype.h: Same. + * include/c_std/bits/std_cassert.h: Same. + * include/c_std/bits/std_cstdarg.h: Same. + * include/c_std/bits/std_cstddef.h: Same. + + * include/c_std/bits/std_cstdio.h: Undefine all names brought into + namespace std. + * include/c_std/bits/std_ctime.h: Same. + * include/c_std/bits/std_clocale.h: Same. + * include/c_std/bits/std_cmath.h: Same. + * include/c_std/bits/std_csetjmp.h: Same. + * include/c_std/bits/std_csignal.h: Same. + * include/c_std/bits/std_cstring.h: Same. + * include/c_std/bits/std_cstdlib.h: Same. + * include/c_std/bits/std_cwchar.h: Same. + 2001-02-05 Phil Edwards * testsuite/27_io/ios_base_members_static.cc: Swap order of tests. diff --git a/libstdc++-v3/include/c_std/bits/std_cassert.h b/libstdc++-v3/include/c_std/bits/std_cassert.h index e06927493ab..b0e1f13f10a 100644 --- a/libstdc++-v3/include/c_std/bits/std_cassert.h +++ b/libstdc++-v3/include/c_std/bits/std_cassert.h @@ -1,6 +1,6 @@ // -*- C++ -*- forwarding header. -// Copyright (C) 1997-1999, 2000 Free Software Foundation, Inc. +// Copyright (C) 1997, 1998, 1999, 2000, 2001 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 @@ -31,8 +31,6 @@ // ISO C++ 14882: 19.2 Assertions // -// Note: This is not a conforming implementation. - // No include guards on this header... #pragma GCC system_header diff --git a/libstdc++-v3/include/c_std/bits/std_cctype.h b/libstdc++-v3/include/c_std/bits/std_cctype.h index a6a882bc8a2..e03a4fd086b 100644 --- a/libstdc++-v3/include/c_std/bits/std_cctype.h +++ b/libstdc++-v3/include/c_std/bits/std_cctype.h @@ -1,6 +1,6 @@ // -*- C++ -*- forwarding header. -// Copyright (C) 1997-1999, 2000 Free Software Foundation, Inc. +// Copyright (C) 1997, 1998, 1999, 2000, 2001 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 diff --git a/libstdc++-v3/include/c_std/bits/std_cerrno.h b/libstdc++-v3/include/c_std/bits/std_cerrno.h index 682882768b3..1dc2d137e39 100644 --- a/libstdc++-v3/include/c_std/bits/std_cerrno.h +++ b/libstdc++-v3/include/c_std/bits/std_cerrno.h @@ -1,6 +1,6 @@ // The -*- C++ -*- error number header. -// Copyright (C) 1997-1999 Free Software Foundation, Inc. +// Copyright (C) 1997, 1998, 1999 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 diff --git a/libstdc++-v3/include/c_std/bits/std_cfloat.h b/libstdc++-v3/include/c_std/bits/std_cfloat.h index 1444be1ecfb..e121c8d685a 100644 --- a/libstdc++-v3/include/c_std/bits/std_cfloat.h +++ b/libstdc++-v3/include/c_std/bits/std_cfloat.h @@ -1,6 +1,6 @@ // -*- C++ -*- forwarding header. -// Copyright (C) 1997-1999, 2000 Free Software Foundation, Inc. +// Copyright (C) 1997, 1998, 1999, 2000 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 diff --git a/libstdc++-v3/include/c_std/bits/std_climits.h b/libstdc++-v3/include/c_std/bits/std_climits.h index 071dd0594f9..87406e68d31 100644 --- a/libstdc++-v3/include/c_std/bits/std_climits.h +++ b/libstdc++-v3/include/c_std/bits/std_climits.h @@ -1,6 +1,6 @@ // -*- C++ -*- forwarding header. -// Copyright (C) 1997-1999, 2000 Free Software Foundation, Inc. +// Copyright (C) 1997, 1998, 1999, 2000 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 diff --git a/libstdc++-v3/include/c_std/bits/std_clocale.h b/libstdc++-v3/include/c_std/bits/std_clocale.h index e74397f40fe..9fb5a1e02a2 100644 --- a/libstdc++-v3/include/c_std/bits/std_clocale.h +++ b/libstdc++-v3/include/c_std/bits/std_clocale.h @@ -41,6 +41,10 @@ #pragma GCC system_header #include +// Get rid of those macros defined in in lieu of real functions. +#undef setlocale +#undef localeconv + namespace std { using ::lconv; diff --git a/libstdc++-v3/include/c_std/bits/std_cmath.h b/libstdc++-v3/include/c_std/bits/std_cmath.h index 01cf652548d..3648b20a5c6 100644 --- a/libstdc++-v3/include/c_std/bits/std_cmath.h +++ b/libstdc++-v3/include/c_std/bits/std_cmath.h @@ -1,6 +1,6 @@ // -*- C++ -*- C math library. -// Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc. +// Copyright (C) 1997, 1998, 1999, 2000, 2001 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 @@ -42,6 +42,31 @@ #pragma GCC system_header #include +// Get rid of those macros defined in in lieu of real functions. +#undef abs +#undef div +#undef acos +#undef asin +#undef atan +#undef atan2 +#undef ceil +#undef cos +#undef cosh +#undef exp +#undef fabs +#undef floor +#undef fmod +#undef frexp +#undef ldexp +#undef log +#undef log10 +#undef modf +#undef pow +#undef sin +#undef sinh +#undef tan +#undef tanh + namespace std { // Forward declaration of a helper function. This really should be @@ -580,8 +605,6 @@ namespace std inline long double tanh(long double __x) { return ::tanh(static_cast(__x)); } #endif - - } // std #ifdef _GLIBCPP_NO_TEMPLATE_EXPORT diff --git a/libstdc++-v3/include/c_std/bits/std_csetjmp.h b/libstdc++-v3/include/c_std/bits/std_csetjmp.h index ea30d8d868d..b8c319ce0a7 100644 --- a/libstdc++-v3/include/c_std/bits/std_csetjmp.h +++ b/libstdc++-v3/include/c_std/bits/std_csetjmp.h @@ -1,6 +1,6 @@ // -*- C++ -*- forwarding header. -// Copyright (C) 1997-1999, 2000 Free Software Foundation, Inc. +// Copyright (C) 1997, 1998, 1999, 2000, 2001 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 @@ -39,6 +39,9 @@ #pragma GCC system_header #include +// Get rid of those macros defined in in lieu of real functions. +#undef longjmp + namespace std { using ::jmp_buf; diff --git a/libstdc++-v3/include/c_std/bits/std_csignal.h b/libstdc++-v3/include/c_std/bits/std_csignal.h index e54db8aa812..437590f7f38 100644 --- a/libstdc++-v3/include/c_std/bits/std_csignal.h +++ b/libstdc++-v3/include/c_std/bits/std_csignal.h @@ -1,6 +1,6 @@ // -*- C++ -*- forwarding header. -// Copyright (C) 1997-1999, 2000 Free Software Foundation, Inc. +// Copyright (C) 1997, 1998, 1999, 2000, 2001 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 @@ -39,6 +39,9 @@ #pragma GCC system_header #include +// Get rid of those macros defined in in lieu of real functions. +#undef raise + namespace std { using ::sig_atomic_t; diff --git a/libstdc++-v3/include/c_std/bits/std_cstdarg.h b/libstdc++-v3/include/c_std/bits/std_cstdarg.h index 817cee5e579..39018be29f2 100644 --- a/libstdc++-v3/include/c_std/bits/std_cstdarg.h +++ b/libstdc++-v3/include/c_std/bits/std_cstdarg.h @@ -1,6 +1,6 @@ // -*- C++ -*- forwarding header. -// Copyright (C) 1997-1999, 2000 Free Software Foundation, Inc. +// Copyright (C) 1997, 1998, 1999, 2000 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 diff --git a/libstdc++-v3/include/c_std/bits/std_cstddef.h b/libstdc++-v3/include/c_std/bits/std_cstddef.h index 184a533cfe3..d03c899b27e 100644 --- a/libstdc++-v3/include/c_std/bits/std_cstddef.h +++ b/libstdc++-v3/include/c_std/bits/std_cstddef.h @@ -1,6 +1,6 @@ // -*- C++ -*- forwarding header. -// Copyright (C) 1997-1999, 2000 Free Software Foundation, Inc. +// Copyright (C) 1997, 1998, 1999, 2000 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 diff --git a/libstdc++-v3/include/c_std/bits/std_cstdio.h b/libstdc++-v3/include/c_std/bits/std_cstdio.h index 569b511b80c..ba731a6af28 100644 --- a/libstdc++-v3/include/c_std/bits/std_cstdio.h +++ b/libstdc++-v3/include/c_std/bits/std_cstdio.h @@ -44,15 +44,52 @@ #include // Get rid of those macros defined in in lieu of real functions. +#undef remove +#undef rename +#undef tmpfile +#undef tmpnam +#undef fclose +#undef fflush +#undef fopen +#undef freopen +#undef setbuf +#undef setvbuf +#undef fprintf +#undef fscanf +#undef printf +#undef scanf +#undef snprintf +#undef sprintf +#undef sscanf +#undef vfprintf +#undef vfscanf +#undef vprintf +#undef vscanf +#undef vsnprintf +#undef vsprintf +#undef vsscanf +#undef fgetc +#undef fgets +#undef fputc +#undef fputs +#undef getc +#undef getchar +#undef gets +#undef putc +#undef putchar +#undef puts +#undef ungetc +#undef fread +#undef fwrite +#undef fgetpos +#undef fseek +#undef fsetpos +#undef ftell +#undef rewind #undef clearerr #undef feof #undef ferror -#undef fileno -#undef getc -#undef getchar -#undef putc -#undef putchar -#undef printf +#undef perror namespace std { diff --git a/libstdc++-v3/include/c_std/bits/std_cstdlib.h b/libstdc++-v3/include/c_std/bits/std_cstdlib.h index fa5c72e2ae4..5ee0b7e9b6e 100644 --- a/libstdc++-v3/include/c_std/bits/std_cstdlib.h +++ b/libstdc++-v3/include/c_std/bits/std_cstdlib.h @@ -42,8 +42,43 @@ #pragma GCC system_header #include -// Get rid of those macros defined in in lieu of real functions. +// Get rid of those macros defined in in lieu of real functions. +#undef atof +#undef atoi +#undef atol +#undef strtod +#undef strtof +#undef strtol +#undef strtoul +#undef rand +#undef srand +#undef calloc +#undef free +#undef malloc +#undef realloc +#undef abort +#undef atexit +#undef exit +#undef _Exit +#undef getenv +#undef system +#undef bsearch +#undef qsort +#undef abs +#undef labs +#undef llabs +#undef div +#undef ldiv +#undef lldiv #undef mblen +#undef mbtowc +#undef wctomb +#undef mbstowcs +#undef wcstombs +#undef atoll +#undef strtoll +#undef strtoull +#undef strtold namespace std { diff --git a/libstdc++-v3/include/c_std/bits/std_cstring.h b/libstdc++-v3/include/c_std/bits/std_cstring.h index a9b907f3111..7429e6570e2 100644 --- a/libstdc++-v3/include/c_std/bits/std_cstring.h +++ b/libstdc++-v3/include/c_std/bits/std_cstring.h @@ -42,6 +42,30 @@ #pragma GCC system_header #include +// Get rid of those macros defined in in lieu of real functions. +#undef memcpy +#undef memmove +#undef strcpy +#undef strncpy +#undef strcat +#undef strncat +#undef memcmp +#undef strcmp +#undef strcoll +#undef strncmp +#undef strxfrm +#undef memchr +#undef strchr +#undef strcspn +#undef strpbrk +#undef strrchr +#undef strspn +#undef strstr +#undef strtok +#undef memset +#undef strerror +#undef strlen + namespace std { extern "C" void* memcpy(void*, const void*, size_t); diff --git a/libstdc++-v3/include/c_std/bits/std_ctime.h b/libstdc++-v3/include/c_std/bits/std_ctime.h index 763693ae788..d4bb28d50d2 100644 --- a/libstdc++-v3/include/c_std/bits/std_ctime.h +++ b/libstdc++-v3/include/c_std/bits/std_ctime.h @@ -42,7 +42,16 @@ #pragma GCC system_header #include +// Get rid of those macros defined in in lieu of real functions. +#undef clock #undef difftime +#undef mktime +#undef time +#undef asctime +#undef ctime +#undef gmtime +#undef localtime +#undef strftime namespace std { diff --git a/libstdc++-v3/include/c_std/bits/std_cwchar.h b/libstdc++-v3/include/c_std/bits/std_cwchar.h index 583f885c679..d2ac5bbdda3 100644 --- a/libstdc++-v3/include/c_std/bits/std_cwchar.h +++ b/libstdc++-v3/include/c_std/bits/std_cwchar.h @@ -46,6 +46,7 @@ #include #endif + // Need to do a bit of trickery here with mbstate_t as char_traits // assumes it is in wchar.h, regardless of wchar_t specializations. #ifndef _GLIBCPP_HAVE_MBSTATE_T @@ -64,7 +65,50 @@ namespace std } // Get rid of those macros defined in in lieu of real functions. +#undef vwprintf +#undef vwscanf +#undef wprintf +#undef wscanf +#undef getwc #undef getwchar +#undef mbsinit +#undef mbrlen +#undef mbrtowc +#undef mbsrtowcs +#undef wcsrtombs +#undef putwc +#undef putwchar +#undef ungetwc +#undef wcrtomb +#undef wcstod +#undef wcstof +#undef wcstol +#undef wcstoul +#undef wcscpy +#undef wcsncpy +#undef wcscat +#undef wcsncat +#undef wcscmp +#undef wcscoll +#undef wcsncmp +#undef wcsxfrm +#undef wcschr +#undef wcscspn +#undef wcslen +#undef wcspbrk +#undef wcsrchr +#undef wcsspn +#undef wcsstr +#undef wcstok +#undef wmemchr +#undef wmemcmp +#undef wmemcpy +#undef wmemmove +#undef wmemset +#undef wcsftime +#undef wcstold +#undef wcstoll +#undef wcstoull #if _GLIBCPP_USE_WCHAR_T namespace std