From 060974d0af8d8162df62df7f4dfbf95536df29b5 Mon Sep 17 00:00:00 2001 From: Benjamin Kosnik Date: Tue, 24 Oct 2000 17:00:07 +0000 Subject: [PATCH] compare.cc (test01): Add using declarations. 2000-10-23 Benjamin Kosnik * testsuite/21_strings/compare.cc (test01): Add using declarations. * include/c_std/bits/std_cerrno.h: And here. * include/c_std/bits/std_cassert.h: Tweaks. * mkcheck.in: Simplify. * acinclude.m4 (GLIBCPP_ENABLE_LONG_DOUBLE): Simplify. (GLIBCPP_ENABLE_LONG_LONG): Same. * aclocal.m4: Regenerate. * src/Makefile.am (c_shadow_headers): Add features.h, bits/wrap_features.h. * src/Makefile.in: Regenerate. * include/c_std/features.h: New file. * include/c_std/bits/wrap_features.h (_CPP_WRAP_FEATURES_H): New file. Need to have c++config.h included before this file so _ISOC99_SOURCE around. * include/c_std/sys/cdefs.h: Hack. * include/c_std/stdlib.h: Same, use c++config.h. * include/c_std/bits/std_cstdlib.h: Use _GLIBCPP_HAVE_STRTOLD. * include/c_std/bits/std_cassert.h: Fix. * include/c_std/bits/std_cerrno.h: Make consistent. * include/c_std/bits/std_csetjmp.h (setjmp): Unscope global declaration from ::_C_legacy to _C_legacy. * include/c_std/bits/std_cstdio.h: same with printf. * include/c_std/stdio.h: And here. * include/c_std/bits/std_cstdlib.h: abort, exit comment. * include/c_std/stdlib.h: Same here. From-SVN: r37034 --- .../include/c_std/bits/wrap_features.h | 51 ++++++++++++++++ libstdc++-v3/include/c_std/features.h | 58 +++++++++++++++++++ 2 files changed, 109 insertions(+) create mode 100644 libstdc++-v3/include/c_std/bits/wrap_features.h create mode 100644 libstdc++-v3/include/c_std/features.h diff --git a/libstdc++-v3/include/c_std/bits/wrap_features.h b/libstdc++-v3/include/c_std/bits/wrap_features.h new file mode 100644 index 00000000000..52402bf66bb --- /dev/null +++ b/libstdc++-v3/include/c_std/bits/wrap_features.h @@ -0,0 +1,51 @@ +// -*- C++ -*- header wrapper. + +// Copyright (C) 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 +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + +// +// ISO C++ 14882: 20.5 Extensions +// + +#ifndef _CPP_WRAP_FEATURES_H +#define _CPP_WRAP_FEATURES_H 1 + +#include + +namespace _C_legacy { + extern "C" { +# define _IN_C_LEGACY_ +# pragma GCC system_header +# include_next + } +} // namespace _C_legacy + +// NB: Don't bring elements from this non-standard header into namespace std. + +# undef _IN_C_LEGACY_ + +#endif diff --git a/libstdc++-v3/include/c_std/features.h b/libstdc++-v3/include/c_std/features.h new file mode 100644 index 00000000000..eed4b0e803d --- /dev/null +++ b/libstdc++-v3/include/c_std/features.h @@ -0,0 +1,58 @@ +// -*- C++ -*- header wrapper. + +// Copyright (C) 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 +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + + +#ifndef _INCLUDED_CPP_FEATURES_H_ +# define _INCLUDED_CPP_FEATURES_H_ 1 + +# ifdef _IN_C_LEGACY_ /* sub-included by a C header */ + // get out of the "legacy" + } // close extern "C" + } // close namespace _C_legacy:: +# undef _IN_C_LEGACY_ +# define _FEATURES_NEED_C_LEGACY_ +# endif + +# include + + // Expose global C names, including non-standard ones, but shadow + // some names and types with the std:: C++ version. + +# ifdef _FEATURES_NEED_C_LEGACY_ + // dive back into the "swamp" + namespace _C_legacy { + extern "C" { +# define _IN_C_LEGACY_ +# undef _FEATURES_NEED_C_LEGACY_ +# endif /* _FEATURES_NEED_C_LEGACY_ */ +#endif /* _INCLUDED_CPP_FEATURES_H_ */ + + + + -- 2.30.2