From 811e551b361a843f2b4eb9fbc29fdd6cd4112001 Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Wed, 17 May 2000 21:46:40 +0000 Subject: [PATCH] [multiple changes] 2000-05-17 Nathan C. Myers * bits/std_cmath.h: fix sqrt(float) 2000-05-16 Loren J. Rittle * bits/std_cassert.h: Use system_header pragma. * bits/std_cctype.h: Likewise. * bits/std_cerrno.h: Likewise. * bits/std_cfloat.h: Likewise. * bits/std_climits.h: Likewise. * bits/std_clocale.h: Likewise. * bits/std_cmath.h: Likewise. * bits/std_csetjmp.h: Likewise. * bits/std_csignal.h: Likewise. * bits/std_cstdarg.h: Likewise. * bits/std_cstddef.h: Likewise. * bits/std_cstdio.h: Likewise. * bits/std_cstdlib.h: Likewise. * bits/std_cstring.h: Likewise. * bits/std_ctime.h: Likewise. * bits/std_cwchar.h: Likewise. * bits/std_cwctype.h: Likewise. * bits/std_exception.h: Likewise. * bits/std_new.h: Likewise. * bits/std_typeinfo.h: Likewise. * shadow/bits/std_cassert.h: Likewise. * shadow/bits/std_cctype.h: Likewise. * shadow/bits/std_cerrno.h: Likewise. * shadow/bits/std_cfloat.h: Likewise. * shadow/bits/std_climits.h: Likewise. * shadow/bits/std_clocale.h: Likewise. * shadow/bits/std_cmath.h: Likewise. * shadow/bits/std_csetjmp.h: Likewise. * shadow/bits/std_csignal.h: Likewise. * shadow/bits/std_cstdarg.h: Likewise. * shadow/bits/std_cstddef.h: Likewise. * shadow/bits/std_cstdio.h: Likewise. * shadow/bits/std_cstdlib.h: Likewise. * shadow/bits/std_cstring.h: Likewise. * shadow/bits/std_ctime.h: Likewise. * shadow/bits/std_cwchar.h: Likewise. * shadow/bits/std_cwctype.h: Likewise. * shadow/bits/wrap_libio.h: Likewise. * shadow/bits/wrap_unistd.h: Likewise. * shadow/sys/cdefs.h: Likewise. 2000-05-16 Nathan C. Myers It appears that gcc-2.96 supports the keyword "and" now. * bits/std_ciso646.h: remove. * std/ciso646: gut. * testsuite/17_intro/header_ciso646.c: enable testing. * src/Makefile.am, src/Makefile.in: remove mention of bits/std_ciso646.h From-SVN: r33967 --- libstdc++-v3/ChangeLog | 56 +++++++++++++++++++ libstdc++-v3/Makefile.in | 1 + libstdc++-v3/bits/std_cassert.h | 1 + libstdc++-v3/bits/std_cctype.h | 1 + libstdc++-v3/bits/std_cerrno.h | 1 + libstdc++-v3/bits/std_cfloat.h | 1 + libstdc++-v3/bits/std_climits.h | 7 ++- libstdc++-v3/bits/std_clocale.h | 1 + libstdc++-v3/bits/std_cmath.h | 3 +- libstdc++-v3/bits/std_csetjmp.h | 1 + libstdc++-v3/bits/std_csignal.h | 1 + libstdc++-v3/bits/std_cstdarg.h | 1 + libstdc++-v3/bits/std_cstddef.h | 1 + libstdc++-v3/bits/std_cstdio.h | 1 + libstdc++-v3/bits/std_cstdlib.h | 1 + libstdc++-v3/bits/std_cstring.h | 1 + libstdc++-v3/bits/std_ctime.h | 1 + libstdc++-v3/bits/std_cwchar.h | 1 + libstdc++-v3/bits/std_cwctype.h | 1 + libstdc++-v3/bits/std_exception.h | 1 + libstdc++-v3/bits/std_new.h | 1 + libstdc++-v3/bits/std_typeinfo.h | 1 + libstdc++-v3/libio/Makefile.in | 1 + libstdc++-v3/math/Makefile.in | 1 + libstdc++-v3/shadow/bits/std_cassert.h | 1 + libstdc++-v3/shadow/bits/std_cctype.h | 1 + libstdc++-v3/shadow/bits/std_cerrno.h | 1 + libstdc++-v3/shadow/bits/std_cfloat.h | 1 + libstdc++-v3/shadow/bits/std_climits.h | 1 + libstdc++-v3/shadow/bits/std_clocale.h | 1 + libstdc++-v3/shadow/bits/std_cmath.h | 1 + libstdc++-v3/shadow/bits/std_csetjmp.h | 1 + libstdc++-v3/shadow/bits/std_csignal.h | 1 + libstdc++-v3/shadow/bits/std_cstdarg.h | 1 + libstdc++-v3/shadow/bits/std_cstddef.h | 1 + libstdc++-v3/shadow/bits/std_cstdio.h | 1 + libstdc++-v3/shadow/bits/std_cstdlib.h | 1 + libstdc++-v3/shadow/bits/std_cstring.h | 1 + libstdc++-v3/shadow/bits/std_ctime.h | 1 + libstdc++-v3/shadow/bits/std_cwchar.h | 1 + libstdc++-v3/shadow/bits/std_cwctype.h | 1 + libstdc++-v3/shadow/bits/wrap_libio.h | 1 + libstdc++-v3/shadow/bits/wrap_unistd.h | 1 + libstdc++-v3/shadow/sys/cdefs.h | 1 + libstdc++-v3/src/Makefile.am | 2 +- libstdc++-v3/src/Makefile.in | 3 +- libstdc++-v3/std/ciso646 | 3 - .../testsuite/17_intro/header_ciso646.cc | 8 +-- 48 files changed, 111 insertions(+), 12 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index a956c86958d..a151cc9dc5e 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,59 @@ +2000-05-17 Nathan C. Myers + + * bits/std_cmath.h: fix sqrt(float) + +2000-05-16 Loren J. Rittle + + * bits/std_cassert.h: Use system_header pragma. + * bits/std_cctype.h: Likewise. + * bits/std_cerrno.h: Likewise. + * bits/std_cfloat.h: Likewise. + * bits/std_climits.h: Likewise. + * bits/std_clocale.h: Likewise. + * bits/std_cmath.h: Likewise. + * bits/std_csetjmp.h: Likewise. + * bits/std_csignal.h: Likewise. + * bits/std_cstdarg.h: Likewise. + * bits/std_cstddef.h: Likewise. + * bits/std_cstdio.h: Likewise. + * bits/std_cstdlib.h: Likewise. + * bits/std_cstring.h: Likewise. + * bits/std_ctime.h: Likewise. + * bits/std_cwchar.h: Likewise. + * bits/std_cwctype.h: Likewise. + * bits/std_exception.h: Likewise. + * bits/std_new.h: Likewise. + * bits/std_typeinfo.h: Likewise. + * shadow/bits/std_cassert.h: Likewise. + * shadow/bits/std_cctype.h: Likewise. + * shadow/bits/std_cerrno.h: Likewise. + * shadow/bits/std_cfloat.h: Likewise. + * shadow/bits/std_climits.h: Likewise. + * shadow/bits/std_clocale.h: Likewise. + * shadow/bits/std_cmath.h: Likewise. + * shadow/bits/std_csetjmp.h: Likewise. + * shadow/bits/std_csignal.h: Likewise. + * shadow/bits/std_cstdarg.h: Likewise. + * shadow/bits/std_cstddef.h: Likewise. + * shadow/bits/std_cstdio.h: Likewise. + * shadow/bits/std_cstdlib.h: Likewise. + * shadow/bits/std_cstring.h: Likewise. + * shadow/bits/std_ctime.h: Likewise. + * shadow/bits/std_cwchar.h: Likewise. + * shadow/bits/std_cwctype.h: Likewise. + * shadow/bits/wrap_libio.h: Likewise. + * shadow/bits/wrap_unistd.h: Likewise. + * shadow/sys/cdefs.h: Likewise. + +2000-05-16 Nathan C. Myers + + It appears that gcc-2.96 supports the keyword "and" now. + * bits/std_ciso646.h: remove. + * std/ciso646: gut. + * testsuite/17_intro/header_ciso646.c: enable testing. + * src/Makefile.am, src/Makefile.in: remove mention of + bits/std_ciso646.h + 2000-05-16 Nathan C. Myers * mkcshadow: fix typo s/_C_Swamp_/_C_Swamp/. diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in index f51495cb286..a8f1bb90612 100644 --- a/libstdc++-v3/Makefile.in +++ b/libstdc++-v3/Makefile.in @@ -90,6 +90,7 @@ OBJDUMP = @OBJDUMP@ OPTLEVEL = @OPTLEVEL@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +SHADOW_INCLUDES = @SHADOW_INCLUDES@ THREADDEPS = @THREADDEPS@ THREADINCS = @THREADINCS@ THREADLIBS = @THREADLIBS@ diff --git a/libstdc++-v3/bits/std_cassert.h b/libstdc++-v3/bits/std_cassert.h index c1aefa6abb3..1b99dd1a7fa 100644 --- a/libstdc++-v3/bits/std_cassert.h +++ b/libstdc++-v3/bits/std_cassert.h @@ -35,4 +35,5 @@ // No include guards on this header... +# pragma system_header # include_next diff --git a/libstdc++-v3/bits/std_cctype.h b/libstdc++-v3/bits/std_cctype.h index 4e106c58747..57377a45ead 100644 --- a/libstdc++-v3/bits/std_cctype.h +++ b/libstdc++-v3/bits/std_cctype.h @@ -39,6 +39,7 @@ #define __NO_CTYPE 1 #endif +# pragma system_header # include_next // Sequester the C non-inline implementations in the _C_Swamp:: diff --git a/libstdc++-v3/bits/std_cerrno.h b/libstdc++-v3/bits/std_cerrno.h index fda202d1e4f..328bdb2e6d0 100644 --- a/libstdc++-v3/bits/std_cerrno.h +++ b/libstdc++-v3/bits/std_cerrno.h @@ -35,5 +35,6 @@ #ifndef _CPP_CERRNO #define _CPP_CERRNO 1 +# pragma system_header # include_next #endif diff --git a/libstdc++-v3/bits/std_cfloat.h b/libstdc++-v3/bits/std_cfloat.h index 869c452eb3f..0fc561f8c11 100644 --- a/libstdc++-v3/bits/std_cfloat.h +++ b/libstdc++-v3/bits/std_cfloat.h @@ -35,6 +35,7 @@ #ifndef _CPP_CFLOAT #define _CPP_CFLOAT 1 +# pragma system_header # include_next #if 0 diff --git a/libstdc++-v3/bits/std_climits.h b/libstdc++-v3/bits/std_climits.h index 0638ec22cc8..8de77597181 100644 --- a/libstdc++-v3/bits/std_climits.h +++ b/libstdc++-v3/bits/std_climits.h @@ -1,6 +1,6 @@ // -*- C++ -*- forwarding header. -// Copyright (C) 1997-1999 Free Software Foundation, Inc. +// Copyright (C) 1997-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 @@ -31,9 +31,12 @@ // ISO C++ 14882: 18.2.2 Implementation properties: C library // -// Note: this is not a conforming implementation. +// Note: This is not a conforming implementation. #ifndef _CPP_CLIMITS #define _CPP_CLIMITS 1 +# pragma system_header # include_next #endif + + diff --git a/libstdc++-v3/bits/std_clocale.h b/libstdc++-v3/bits/std_clocale.h index acadfd71089..0f0be821e6f 100644 --- a/libstdc++-v3/bits/std_clocale.h +++ b/libstdc++-v3/bits/std_clocale.h @@ -35,6 +35,7 @@ #ifndef _CPP_CLOCALE #define _CPP_CLOCALE 1 +# pragma system_header # include_next #endif diff --git a/libstdc++-v3/bits/std_cmath.h b/libstdc++-v3/bits/std_cmath.h index 3b53bb101e2..39f6c860db2 100644 --- a/libstdc++-v3/bits/std_cmath.h +++ b/libstdc++-v3/bits/std_cmath.h @@ -35,6 +35,7 @@ #ifndef _CPP_CMATH #define _CPP_CMATH 1 +# pragma system_header # include_next # include_next @@ -233,7 +234,7 @@ namespace std { sqrt(float __x) { return ::sqrtf(__x); } #else inline float - sqrt(float __x) { return ::fabs(static_cast(__x)); } + sqrt(float __x) { return ::sqrt(static_cast(__x)); } #endif // XXX long double diff --git a/libstdc++-v3/bits/std_csetjmp.h b/libstdc++-v3/bits/std_csetjmp.h index e94488b85b8..d35fc01190d 100644 --- a/libstdc++-v3/bits/std_csetjmp.h +++ b/libstdc++-v3/bits/std_csetjmp.h @@ -35,5 +35,6 @@ #ifndef _CPP_CSETJMP #define _CPP_CSETJMP 1 +# pragma system_header # include_next #endif diff --git a/libstdc++-v3/bits/std_csignal.h b/libstdc++-v3/bits/std_csignal.h index b300f5b0547..ad10e1bebd8 100644 --- a/libstdc++-v3/bits/std_csignal.h +++ b/libstdc++-v3/bits/std_csignal.h @@ -35,5 +35,6 @@ #ifndef _CPP_CSIGNAL #define _CPP_CSIGNAL 1 +# pragma system_header # include_next #endif diff --git a/libstdc++-v3/bits/std_cstdarg.h b/libstdc++-v3/bits/std_cstdarg.h index 5b0ca7d6e63..48fddf8b7b1 100644 --- a/libstdc++-v3/bits/std_cstdarg.h +++ b/libstdc++-v3/bits/std_cstdarg.h @@ -35,5 +35,6 @@ #ifndef _CPP_CSTDARG #define _CPP_CSTDARG 1 +# pragma system_header # include_next #endif diff --git a/libstdc++-v3/bits/std_cstddef.h b/libstdc++-v3/bits/std_cstddef.h index 66a1b5d4a05..46f2518541c 100644 --- a/libstdc++-v3/bits/std_cstddef.h +++ b/libstdc++-v3/bits/std_cstddef.h @@ -35,5 +35,6 @@ #ifndef _CPP_CSTDDEF #define _CPP_CSTDDEF 1 +# pragma system_header # include_next #endif diff --git a/libstdc++-v3/bits/std_cstdio.h b/libstdc++-v3/bits/std_cstdio.h index aec526d1b62..567a96a0447 100644 --- a/libstdc++-v3/bits/std_cstdio.h +++ b/libstdc++-v3/bits/std_cstdio.h @@ -35,6 +35,7 @@ #ifndef _CPP_CSTDIO #define _CPP_CSTDIO 1 +# pragma system_header # include_next #ifndef SEEK_CUR diff --git a/libstdc++-v3/bits/std_cstdlib.h b/libstdc++-v3/bits/std_cstdlib.h index adbefa2ad77..c8420e01870 100644 --- a/libstdc++-v3/bits/std_cstdlib.h +++ b/libstdc++-v3/bits/std_cstdlib.h @@ -41,6 +41,7 @@ #define __USE_ISOC9X 1 #endif +# pragma system_header # include_next #endif // _CPP_CSTDLIB diff --git a/libstdc++-v3/bits/std_cstring.h b/libstdc++-v3/bits/std_cstring.h index c076b6a12d0..3393de093c0 100644 --- a/libstdc++-v3/bits/std_cstring.h +++ b/libstdc++-v3/bits/std_cstring.h @@ -39,5 +39,6 @@ // We must not see the optimized string functions GNU libc defines. # define __NO_STRING_INLINES # endif +# pragma system_header # include_next #endif diff --git a/libstdc++-v3/bits/std_ctime.h b/libstdc++-v3/bits/std_ctime.h index 08c07b6d5f6..bce2d91353c 100644 --- a/libstdc++-v3/bits/std_ctime.h +++ b/libstdc++-v3/bits/std_ctime.h @@ -35,5 +35,6 @@ #ifndef _CPP_CTIME #define _CPP_CTIME 1 +# pragma system_header # include_next #endif diff --git a/libstdc++-v3/bits/std_cwchar.h b/libstdc++-v3/bits/std_cwchar.h index 8c606dc80de..8e5c1170c94 100644 --- a/libstdc++-v3/bits/std_cwchar.h +++ b/libstdc++-v3/bits/std_cwchar.h @@ -38,6 +38,7 @@ #include #ifdef _GLIBCPP_USE_WCHAR_T + # pragma system_header # include_next #endif diff --git a/libstdc++-v3/bits/std_cwctype.h b/libstdc++-v3/bits/std_cwctype.h index 97db4b85423..3607de92837 100644 --- a/libstdc++-v3/bits/std_cwctype.h +++ b/libstdc++-v3/bits/std_cwctype.h @@ -39,6 +39,7 @@ #define __NO_WCTYPE 1 #endif +# pragma system_header # include_next // Sequester the C non-inline implementations in the _C_Swamp:: diff --git a/libstdc++-v3/bits/std_exception.h b/libstdc++-v3/bits/std_exception.h index 66cf46d95cc..4e8ea118857 100644 --- a/libstdc++-v3/bits/std_exception.h +++ b/libstdc++-v3/bits/std_exception.h @@ -30,6 +30,7 @@ #define _CPP_EXCEPTION 1 #ifdef __GNUG__ +#pragma system_header #include_next #else diff --git a/libstdc++-v3/bits/std_new.h b/libstdc++-v3/bits/std_new.h index 1ac2dd05325..ec500e62559 100644 --- a/libstdc++-v3/bits/std_new.h +++ b/libstdc++-v3/bits/std_new.h @@ -32,6 +32,7 @@ #include #ifdef __GNUG__ +# pragma system_header # include_next #else diff --git a/libstdc++-v3/bits/std_typeinfo.h b/libstdc++-v3/bits/std_typeinfo.h index 1bce795882c..6c1655e66b6 100644 --- a/libstdc++-v3/bits/std_typeinfo.h +++ b/libstdc++-v3/bits/std_typeinfo.h @@ -34,6 +34,7 @@ #include #ifdef __GNUG__ +# pragma system_header # include_next #else diff --git a/libstdc++-v3/libio/Makefile.in b/libstdc++-v3/libio/Makefile.in index a5fd42ec112..33ac4de3e7a 100644 --- a/libstdc++-v3/libio/Makefile.in +++ b/libstdc++-v3/libio/Makefile.in @@ -90,6 +90,7 @@ OBJDUMP = @OBJDUMP@ OPTLEVEL = @OPTLEVEL@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +SHADOW_INCLUDES = @SHADOW_INCLUDES@ THREADDEPS = @THREADDEPS@ THREADINCS = @THREADINCS@ THREADLIBS = @THREADLIBS@ diff --git a/libstdc++-v3/math/Makefile.in b/libstdc++-v3/math/Makefile.in index 9683177ef7c..926aa21a687 100644 --- a/libstdc++-v3/math/Makefile.in +++ b/libstdc++-v3/math/Makefile.in @@ -90,6 +90,7 @@ OBJDUMP = @OBJDUMP@ OPTLEVEL = @OPTLEVEL@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +SHADOW_INCLUDES = @SHADOW_INCLUDES@ THREADDEPS = @THREADDEPS@ THREADINCS = @THREADINCS@ THREADLIBS = @THREADLIBS@ diff --git a/libstdc++-v3/shadow/bits/std_cassert.h b/libstdc++-v3/shadow/bits/std_cassert.h index cd7c939a3cf..b20c45fd5ef 100644 --- a/libstdc++-v3/shadow/bits/std_cassert.h +++ b/libstdc++-v3/shadow/bits/std_cassert.h @@ -37,6 +37,7 @@ // defines a global used in other headers, we are sunk. extern "C" { +# pragma system_header # include_next } diff --git a/libstdc++-v3/shadow/bits/std_cctype.h b/libstdc++-v3/shadow/bits/std_cctype.h index b8555c16e51..f20a4d6cf03 100644 --- a/libstdc++-v3/shadow/bits/std_cctype.h +++ b/libstdc++-v3/shadow/bits/std_cctype.h @@ -36,6 +36,7 @@ namespace _C_Swamp { extern "C" { # define _IN_C_SWAMP_ +# pragma system_header # include_next } diff --git a/libstdc++-v3/shadow/bits/std_cerrno.h b/libstdc++-v3/shadow/bits/std_cerrno.h index 0ca6b6c2d6a..461a41ee7ea 100644 --- a/libstdc++-v3/shadow/bits/std_cerrno.h +++ b/libstdc++-v3/shadow/bits/std_cerrno.h @@ -37,6 +37,7 @@ namespace _C_Swamp { extern "C" { # define _IN_C_SWAMP_ +# pragma system_header # include_next } diff --git a/libstdc++-v3/shadow/bits/std_cfloat.h b/libstdc++-v3/shadow/bits/std_cfloat.h index 2b8dbdf8ca3..c6dded2dc20 100644 --- a/libstdc++-v3/shadow/bits/std_cfloat.h +++ b/libstdc++-v3/shadow/bits/std_cfloat.h @@ -44,6 +44,7 @@ namespace _C_Swamp { extern "C" { # define _IN_C_SWAMP_ +# pragma system_header # include_next } diff --git a/libstdc++-v3/shadow/bits/std_climits.h b/libstdc++-v3/shadow/bits/std_climits.h index d1159df2e40..d64bc7d7f83 100644 --- a/libstdc++-v3/shadow/bits/std_climits.h +++ b/libstdc++-v3/shadow/bits/std_climits.h @@ -37,6 +37,7 @@ namespace _C_Swamp { extern "C" { # define _IN_C_SWAMP_ +# pragma system_header # include_next } namespace _C_Shadow { } diff --git a/libstdc++-v3/shadow/bits/std_clocale.h b/libstdc++-v3/shadow/bits/std_clocale.h index 85add2d2292..c62b88071a0 100644 --- a/libstdc++-v3/shadow/bits/std_clocale.h +++ b/libstdc++-v3/shadow/bits/std_clocale.h @@ -39,6 +39,7 @@ namespace _C_Swamp { extern "C" { # define _IN_C_SWAMP_ +# pragma system_header # include_next } diff --git a/libstdc++-v3/shadow/bits/std_cmath.h b/libstdc++-v3/shadow/bits/std_cmath.h index a6f97b990e7..a2b509f5cf3 100644 --- a/libstdc++-v3/shadow/bits/std_cmath.h +++ b/libstdc++-v3/shadow/bits/std_cmath.h @@ -37,6 +37,7 @@ namespace _C_Swamp { extern "C" { # define _IN_C_SWAMP_ +# pragma system_header # include_next } inline double _CPP_HUGE_VAL_capture() { return HUGE_VAL; } diff --git a/libstdc++-v3/shadow/bits/std_csetjmp.h b/libstdc++-v3/shadow/bits/std_csetjmp.h index 5313887270a..e4a218c869c 100644 --- a/libstdc++-v3/shadow/bits/std_csetjmp.h +++ b/libstdc++-v3/shadow/bits/std_csetjmp.h @@ -37,6 +37,7 @@ namespace _C_Swamp { extern "C" { # define _IN_C_SWAMP_ +# pragma system_header # include_next } typedef jmp_buf _CPP_jmp_buf_capture; diff --git a/libstdc++-v3/shadow/bits/std_csignal.h b/libstdc++-v3/shadow/bits/std_csignal.h index 36f3cb76817..4ebd53fe107 100644 --- a/libstdc++-v3/shadow/bits/std_csignal.h +++ b/libstdc++-v3/shadow/bits/std_csignal.h @@ -37,6 +37,7 @@ namespace _C_Swamp { extern "C" { # define _IN_C_SWAMP_ +# pragma system_header # include_next typedef void (*_CPP_CSIGFUN_capture)(int); // a C function pointer typedef sig_atomic_t _CPP_sig_atomic_t_capture; diff --git a/libstdc++-v3/shadow/bits/std_cstdarg.h b/libstdc++-v3/shadow/bits/std_cstdarg.h index 29aee63e05e..caf9608bd2a 100644 --- a/libstdc++-v3/shadow/bits/std_cstdarg.h +++ b/libstdc++-v3/shadow/bits/std_cstdarg.h @@ -37,6 +37,7 @@ namespace _C_Swamp { extern "C" { # define _IN_C_SWAMP_ +# pragma system_header # include_next } typedef va_list _CPP_va_list_capture; diff --git a/libstdc++-v3/shadow/bits/std_cstddef.h b/libstdc++-v3/shadow/bits/std_cstddef.h index 9ea0b6ccedc..b85042907f4 100644 --- a/libstdc++-v3/shadow/bits/std_cstddef.h +++ b/libstdc++-v3/shadow/bits/std_cstddef.h @@ -37,6 +37,7 @@ namespace _C_Swamp { extern "C" { # define _IN_C_SWAMP_ +# pragma system_header # include_next } typedef ptrdiff_t _CPP_ptrdiff_t_capture; diff --git a/libstdc++-v3/shadow/bits/std_cstdio.h b/libstdc++-v3/shadow/bits/std_cstdio.h index 44e16338e25..31c406cb666 100644 --- a/libstdc++-v3/shadow/bits/std_cstdio.h +++ b/libstdc++-v3/shadow/bits/std_cstdio.h @@ -47,6 +47,7 @@ namespace _C_Swamp { extern "C" { # define _IN_C_SWAMP_ +# pragma system_header # include_next } // size_t handled in diff --git a/libstdc++-v3/shadow/bits/std_cstdlib.h b/libstdc++-v3/shadow/bits/std_cstdlib.h index 3427cd84ccb..0c0ca177c2a 100644 --- a/libstdc++-v3/shadow/bits/std_cstdlib.h +++ b/libstdc++-v3/shadow/bits/std_cstdlib.h @@ -43,6 +43,7 @@ namespace _C_Swamp { extern "C" { # define _IN_C_SWAMP_ +# pragma system_header # include_next typedef int (*_C_cmp_fun_ptr)(const void*, const void*); // C fn ptr } diff --git a/libstdc++-v3/shadow/bits/std_cstring.h b/libstdc++-v3/shadow/bits/std_cstring.h index 258082be242..cf526603a27 100644 --- a/libstdc++-v3/shadow/bits/std_cstring.h +++ b/libstdc++-v3/shadow/bits/std_cstring.h @@ -43,6 +43,7 @@ namespace _C_Swamp { extern "C" { # define _IN_C_SWAMP_ +# pragma system_header # include_next } diff --git a/libstdc++-v3/shadow/bits/std_ctime.h b/libstdc++-v3/shadow/bits/std_ctime.h index 4caba882e9c..e6febaffa74 100644 --- a/libstdc++-v3/shadow/bits/std_ctime.h +++ b/libstdc++-v3/shadow/bits/std_ctime.h @@ -39,6 +39,7 @@ namespace _C_Swamp { extern "C" { # define _IN_C_SWAMP_ +# pragma system_header # include_next } inline clock_t _CPP_CLOCKS_PER_SEC_capture() diff --git a/libstdc++-v3/shadow/bits/std_cwchar.h b/libstdc++-v3/shadow/bits/std_cwchar.h index bd1ec656af6..62faabc3510 100644 --- a/libstdc++-v3/shadow/bits/std_cwchar.h +++ b/libstdc++-v3/shadow/bits/std_cwchar.h @@ -43,6 +43,7 @@ namespace _C_Swamp { extern "C" { # define _IN_C_SWAMP_ +# pragma system_header # include_next } // NULL, size_t handled in diff --git a/libstdc++-v3/shadow/bits/std_cwctype.h b/libstdc++-v3/shadow/bits/std_cwctype.h index e3b1a292b40..2eb1842faef 100644 --- a/libstdc++-v3/shadow/bits/std_cwctype.h +++ b/libstdc++-v3/shadow/bits/std_cwctype.h @@ -41,6 +41,7 @@ namespace _C_Swamp { extern "C" { # define _IN_C_SWAMP_ +# pragma system_header # include_next } typedef wctype_t _CPP_wctype_t_capture; diff --git a/libstdc++-v3/shadow/bits/wrap_libio.h b/libstdc++-v3/shadow/bits/wrap_libio.h index 3632043dd1f..04a0ffc444f 100644 --- a/libstdc++-v3/shadow/bits/wrap_libio.h +++ b/libstdc++-v3/shadow/bits/wrap_libio.h @@ -39,6 +39,7 @@ namespace _C_Swamp { extern "C" { # define _IN_C_SWAMP_ +# pragma system_header # include_next } diff --git a/libstdc++-v3/shadow/bits/wrap_unistd.h b/libstdc++-v3/shadow/bits/wrap_unistd.h index 109a6102515..77199b1a6d9 100644 --- a/libstdc++-v3/shadow/bits/wrap_unistd.h +++ b/libstdc++-v3/shadow/bits/wrap_unistd.h @@ -39,6 +39,7 @@ namespace _C_Swamp { extern "C" { # define _IN_C_SWAMP_ +# pragma system_header # include_next } diff --git a/libstdc++-v3/shadow/sys/cdefs.h b/libstdc++-v3/shadow/sys/cdefs.h index ebcad9a7b80..32e325563c1 100644 --- a/libstdc++-v3/shadow/sys/cdefs.h +++ b/libstdc++-v3/shadow/sys/cdefs.h @@ -31,6 +31,7 @@ #ifndef _CPP_SYS_CDEFS_H # define _CPP_SYS_CDEFS_H +# pragma system_header # include_next // glibc-2 hackery. Other systems likely require other hacks. diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am index 6550c360882..3d532441208 100644 --- a/libstdc++-v3/src/Makefile.am +++ b/libstdc++-v3/src/Makefile.am @@ -83,7 +83,7 @@ headers = \ bits/valarray_array.h bits/valarray_array.tcc bits/valarray_meta.h \ bits/std_valarray.h bits/mask_array.h bits/slice.h bits/slice_array.h \ bits/gslice.h bits/gslice_array.h bits/indirect_array.h \ - bits/std_cassert.h bits/std_cwctype.h bits/std_ciso646.h \ + bits/std_cassert.h bits/std_cwctype.h \ bits/std_cerrno.h bits/std_cfloat.h bits/std_climits.h \ bits/std_clocale.h bits/std_cmath.h \ bits/std_csetjmp.h bits/std_csignal.h bits/std_cstdarg.h \ diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index 5a472f50dd3..5b6c30ddb93 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -89,6 +89,7 @@ OBJDUMP = @OBJDUMP@ OPTLEVEL = @OPTLEVEL@ PACKAGE = @PACKAGE@ RANLIB = @RANLIB@ +SHADOW_INCLUDES = @SHADOW_INCLUDES@ THREADDEPS = @THREADDEPS@ THREADINCS = @THREADINCS@ THREADLIBS = @THREADLIBS@ @@ -165,7 +166,7 @@ headers = \ bits/valarray_array.h bits/valarray_array.tcc bits/valarray_meta.h \ bits/std_valarray.h bits/mask_array.h bits/slice.h bits/slice_array.h \ bits/gslice.h bits/gslice_array.h bits/indirect_array.h \ - bits/std_cassert.h bits/std_cwctype.h bits/std_ciso646.h \ + bits/std_cassert.h bits/std_cwctype.h \ bits/std_cerrno.h bits/std_cfloat.h bits/std_climits.h \ bits/std_clocale.h bits/std_cmath.h \ bits/std_csetjmp.h bits/std_csignal.h bits/std_cstdarg.h \ diff --git a/libstdc++-v3/std/ciso646 b/libstdc++-v3/std/ciso646 index 188676772bb..e69de29bb2d 100644 --- a/libstdc++-v3/std/ciso646 +++ b/libstdc++-v3/std/ciso646 @@ -1,3 +0,0 @@ -#ifndef _CPP_ISO646 -#include -#endif diff --git a/libstdc++-v3/testsuite/17_intro/header_ciso646.cc b/libstdc++-v3/testsuite/17_intro/header_ciso646.cc index 6677db733ad..c6c1e39a499 100644 --- a/libstdc++-v3/testsuite/17_intro/header_ciso646.cc +++ b/libstdc++-v3/testsuite/17_intro/header_ciso646.cc @@ -100,15 +100,11 @@ bool test02() int int1 = 45; int int2 = 0; -#if 0 - // XXX g++ doesn't like this. Recognizes the keyword, but can't - // parse what's next. test &= arg1 && int1; test &= arg1 and int1; test &= (arg1 && arg2) == (arg1 and arg2); test &= (arg1 && int1) == (arg1 and int1); -#endif #ifdef DEBUG_ASSERT assert(test); @@ -129,3 +125,7 @@ int main(void) + + + + -- 2.30.2