a6863e2538
2000-10-10 Benjamin Kosnik <bkoz@purist.soma.redhat.com> * Makefile.am (LIBSUPCXX_INCLUDES): Adjust. * libsupc++/include: Remove * libsupc++/include/*: Move to ... * libsupc++: Here. * libsupc++/Makefile.am (glibcppinstall_HEADERS): Install headers. (glibcppinstalldir): New. * src/Makefile.am (c_base_headers): New. (c_shadow_headers): New (c_headers): New. (myinstallheaders): Correct install issues. * src/Makefile.in: Regenerate. * Makefile.am (CSHADOW_INCLUDES): Simplify. * Makefile.in: Regenerate. * acinclude.m4 (GLIBCPP_ENABLE_SHADOW): Add c_include_dir. * aclocal.m4: Regenerate. * mkcheck.in (SRC_DIR): Use it. * include/bits/std_stdexcept.h: And here. * include/bits/std_ios.h: Change std_exception.h to exception. * src/locale.cc: And here. * src/locale-inst.cc: And here. * include/bits/valarray_array.h: And here. * include/bits/stl_alloc.h: And here. * include/bits/stl_algobase.h: And here. * include/bits/pthread_allocimpl.h: And here. * include/bits/stl_construct.h: Change to std_new.h to new. * include/bits/locale_facets.h: Change std_typeinfo.h to typeinfo. * src/Makefile.am (INCLUDES): Add LIBSUPCXX_INCLUDES. (headers): Remove duplicated headers. (std_headers): And here. * src/Makefile.in: Regenerate. * libsupc++/Makefile.am (LIBSUPCXX_INCLUDES): Remove. * libsupc++/Makefile.in: Regenerate. * Makefile.am (LIBSUPCXX_INCLUDES): Add here. (AM_MAKEFLAGS): And here. * Makefile.in: Regenerate. * include/bits/std_typeinfo.h: Remove. * include/bits/std_new.h: Remove * include/bits/std_exception.h: Remove. * std/new: Remove. * std/typeinfo: Remove. * std/exception: Remove. * libio/_G_config.h (__need_ptrdiff_t): Add. * libsupc++/include/new: Change stddef.h to cstddef. * libsupc++/tinfo.h: Change limits.h to climits. * libsupc++/pure.cc: Comment out _GNU_LIBRARY_ bits, as this renders the file uncompilable. Add copyright. * include/c_std/bits/std_cstddef.h: Don't bring wchar_t into std namespace, as it is a fundamental type. From-SVN: r36833
90 lines
2.5 KiB
C++
90 lines
2.5 KiB
C++
// -*- C++ -*- header wrapper.
|
|
|
|
// 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
|
|
// 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: 18.1 Types
|
|
//
|
|
|
|
#ifndef _CPP_CSTDDEF
|
|
#define _CPP_CSTDDEF 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 _STDDEF_NEED_C_LEGACY_
|
|
# endif
|
|
|
|
namespace _C_legacy {
|
|
extern "C" {
|
|
# define _IN_C_LEGACY_
|
|
# pragma GCC system_header
|
|
|
|
//# define __need_ptrdiff_t
|
|
//# define __need_size_t
|
|
# include_next <stddef.h>
|
|
}
|
|
} // namespace _C_legacy
|
|
|
|
# undef ptrdiff_t
|
|
# undef size_t
|
|
# undef wchar_t
|
|
|
|
namespace std {
|
|
using _C_legacy::ptrdiff_t;
|
|
using _C_legacy::size_t;
|
|
} // namespace std
|
|
|
|
# undef _IN_C_LEGACY_
|
|
|
|
// Expose global C names, including non-standard ones, but shadow
|
|
// some names and types with the std:: C++ version.
|
|
using std::ptrdiff_t;
|
|
using std::size_t;
|
|
|
|
// 3.9.1 Fundamental Types
|
|
// p 5
|
|
// wchar_t is a fundamental type
|
|
// using std::wchar_t;
|
|
|
|
# ifdef _STDDEF_NEED_C_LEGACY_
|
|
// dive back into the "swamp"
|
|
namespace _C_legacy {
|
|
extern "C" {
|
|
# define _IN_C_LEGACY_
|
|
# undef _STDDEF_NEED_C_LEGACY_
|
|
# endif /* _STDDEF_NEED_C_LEGACY_ */
|
|
|
|
#endif /*_CPP_CSTDDEF*/
|
|
|
|
|
|
|
|
|
|
|