diff options
| author | Paolo Carlini <paolo@gcc.gnu.org> | 2007-10-15 09:34:49 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2007-10-15 09:34:49 +0000 |
| commit | 54bdca68ec7d645d28317fe31f0b7a11fab0da54 (patch) | |
| tree | fb9aa57c48b2d49491ea1081f49066c0a6841f76 | |
| parent | 64520bdc184659160eee1d8eda9dc6a3babc5209 (diff) | |
| download | gcc-54bdca68ec7d645d28317fe31f0b7a11fab0da54.zip gcc-54bdca68ec7d645d28317fe31f0b7a11fab0da54.tar.gz gcc-54bdca68ec7d645d28317fe31f0b7a11fab0da54.tar.bz2 | |
re PR libstdc++/33771 (FAIL: 17_intro/headers/c++1998/all.cc (test for excess errors))
2007-10-15 Paolo Carlini <pcarlini@suse.de>
PR libstdc++/33771
PR libstdc++/33773
* testsuite/21_strings/headers/cwchar/macros.cc: Guard test with
_GLIBCXX_HAVE_WCHAR_H.
* testsuite/21_strings/headers/cwctype/macros.cc: Likewise with
_GLIBCXX_HAVE_WCTYPE_H.
* testsuite/17_intro/headers/c++200x/all.cc: Guard inclusions
of <wchar.h> and <wctype.h>.
* testsuite/17_intro/headers/c++200x/all_multiple_inclusion.cc:
Likewise.
* testsuite/17_intro/headers/c++1998/all.cc: Likewise.
* testsuite/17_intro/headers/c++1998/all_multiple_inclusion.cc:
Likewise.
From-SVN: r129313
6 files changed, 32 insertions, 0 deletions
diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++1998/all.cc b/libstdc++-v3/testsuite/17_intro/headers/c++1998/all.cc index 2704e49..6416734 100644 --- a/libstdc++-v3/testsuite/17_intro/headers/c++1998/all.cc +++ b/libstdc++-v3/testsuite/17_intro/headers/c++1998/all.cc @@ -61,8 +61,12 @@ #include <stdlib.h> #include <string.h> #include <time.h> +#ifdef _GLIBCXX_HAVE_WCHAR_H #include <wchar.h> +#endif +#ifdef _GLIBCXX_HAVE_WCTYPE_H #include <wctype.h> +#endif // "C++" headers #include <algorithm> diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++1998/all_multiple_inclusion.cc b/libstdc++-v3/testsuite/17_intro/headers/c++1998/all_multiple_inclusion.cc index a1cb289..831616b 100644 --- a/libstdc++-v3/testsuite/17_intro/headers/c++1998/all_multiple_inclusion.cc +++ b/libstdc++-v3/testsuite/17_intro/headers/c++1998/all_multiple_inclusion.cc @@ -61,8 +61,12 @@ #include <stdlib.h> #include <string.h> #include <time.h> +#ifdef _GLIBCXX_HAVE_WCHAR_H #include <wchar.h> +#endif +#ifdef _GLIBCXX_HAVE_WCTYPE_H #include <wctype.h> +#endif // "C++" headers #include <algorithm> @@ -136,8 +140,12 @@ #include <stdlib.h> #include <string.h> #include <time.h> +#ifdef _GLIBCXX_HAVE_WCHAR_H #include <wchar.h> +#endif +#ifdef _GLIBCXX_HAVE_WCTYPE_H #include <wctype.h> +#endif // "C++" headers #include <algorithm> diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++200x/all.cc b/libstdc++-v3/testsuite/17_intro/headers/c++200x/all.cc index 76566d0..753f08e 100644 --- a/libstdc++-v3/testsuite/17_intro/headers/c++200x/all.cc +++ b/libstdc++-v3/testsuite/17_intro/headers/c++200x/all.cc @@ -82,8 +82,12 @@ #include <tgmath.h> #endif #include <time.h> +#ifdef _GLIBCXX_HAVE_WCHAR_H #include <wchar.h> +#endif +#ifdef _GLIBCXX_HAVE_WCTYPE_H #include <wctype.h> +#endif // "C++" headers #include <algorithm> diff --git a/libstdc++-v3/testsuite/17_intro/headers/c++200x/all_multiple_inclusion.cc b/libstdc++-v3/testsuite/17_intro/headers/c++200x/all_multiple_inclusion.cc index d788be2..9aa802c 100644 --- a/libstdc++-v3/testsuite/17_intro/headers/c++200x/all_multiple_inclusion.cc +++ b/libstdc++-v3/testsuite/17_intro/headers/c++200x/all_multiple_inclusion.cc @@ -82,8 +82,12 @@ #include <tgmath.h> #endif #include <time.h> +#ifdef _GLIBCXX_HAVE_WCHAR_H #include <wchar.h> +#endif +#ifdef _GLIBCXX_HAVE_WCTYPE_H #include <wctype.h> +#endif // "C++" headers #include <algorithm> @@ -188,8 +192,12 @@ #include <tgmath.h> #endif #include <time.h> +#ifdef _GLIBCXX_HAVE_WCHAR_H #include <wchar.h> +#endif +#ifdef _GLIBCXX_HAVE_WCTYPE_H #include <wctype.h> +#endif // "C++" headers #include <algorithm> diff --git a/libstdc++-v3/testsuite/21_strings/headers/cwchar/macros.cc b/libstdc++-v3/testsuite/21_strings/headers/cwchar/macros.cc index 17d6129..b80db00 100644 --- a/libstdc++-v3/testsuite/21_strings/headers/cwchar/macros.cc +++ b/libstdc++-v3/testsuite/21_strings/headers/cwchar/macros.cc @@ -20,6 +20,8 @@ #include <cwchar> +#ifdef _GLIBCXX_HAVE_WCHAR_H + namespace gnu { #ifndef NULL @@ -38,3 +40,5 @@ namespace gnu #error "WEOF_must_be_a_macro" #endif } + +#endif diff --git a/libstdc++-v3/testsuite/21_strings/headers/cwctype/macros.cc b/libstdc++-v3/testsuite/21_strings/headers/cwctype/macros.cc index a1d78c7..ae2e401 100644 --- a/libstdc++-v3/testsuite/21_strings/headers/cwctype/macros.cc +++ b/libstdc++-v3/testsuite/21_strings/headers/cwctype/macros.cc @@ -20,9 +20,13 @@ #include <cwctype> +#ifdef _GLIBCXX_HAVE_WCTYPE_H + namespace gnu { #ifndef WEOF #error "WEOF_must_be_a_macro" #endif } + +#endif |