mirror of
git://gcc.gnu.org/git/gcc.git
synced 2024-12-26 07:58:57 +08:00
0517cb9903
2000-10-02 Steven King <sxking@uswest.net>
* mkcshadow: Fixed script to output proper include guard.
* bits/char_traits.h: Cleaned up types in char_traits<char> functions.
* libio/_G_config.h: Hacked to make work with shadow heraders.
* shadow/*: Hacked to make shadow headers work.
2000-10-02 Benjamin Kosnik <bkoz@purist.soma.redhat.com>
Self-compile with shadow headers.
* acconfig.h (_GLIBCPP_USE_SHADOW_HEADERS): Define. Eventually,
like _GLIBCPP_USE_NAMESPACES before it, this macro will die when
it becomes the default way the library is built.
* acinclude.m4 (GLIBCPP_ENABLE_SHADOW): New macro.
* config/gnu-linux/bits/ctype_base.h (ctype_base): Use it.
* config/gnu-linux/ctype.cc (ctype): Use it.
* src/localename.cc (locale::_Impl::_M_replace_categories): Remove
call to assert.
* src/locale.cc: Explicitly cast mbstate_t to void* in calls to
memset. This should not be necessary, but an ambiguous overload
with it in.
* shadow/bits/std_cwchar.h: Fix.
* shadow/wchar.h: Fix.
* config/gnu-linux/bits/ctype_base.h (ctype_base): Inject ctype
enums into namespace std:: for ctype_base enum. Other OS types
will have to do this as well.
* config/gnu-linux/ctype.cc (ctype): Inject ctype data into
namespace std, in particular __ctype_toupper, __ctype_tolower,
__ctype_b.
* shadow/iolibio.h: New file.
* shadow/bits/wrap_iolibio.h: New file.
* shadow/libioP.h: New file.
* shadow/bits/wrap_libioP.h: New file.
* shadow/bits/wrap_fcntl.h: New file.
* shadow/fcntl.h: New file.
* shadow/iconv.h: New file. Inject iconv names into the global
namespace, unmangled for the moment.
* shadow/bits/wrap_iconv.h: New file.
* shadow/unistd.h: Remove. Useless.
* shadow/bits/wrap_unistd.h: Remove.
* src/Makefile.am: Take out machine-ansi.h, add fcntl.h unistd.h.
* src/Makefile.in: Regenerate.
* config/c_io_libio.h (_IO_codecvt): Change to normal C++ decl.
* shadow/libio.h: Fix.
* shadow/bits/wrap_libio.h: Fix.
* shadow/bits/std_clocale.h: Remove typedef struct construct,
which will not compile.
* shadow/bits/std_ctime.h: Same.
* shadow/pthread.h: New file. Put pthreads types and functions
into global scope, which is probably not the correct long-term
solution but has to be done at the moment before libio wrappers
can even be started.
* shadow/bits/wrap_pthread.h: New file.
* bits/std_ios.h: Formatting tweak.
* shadow/bits/std_cstdio.h: Format. Remove extraneous bits.
* acinclude.m4 (GLIBCPP_CHECK_COMPILER_FEATURES): Add -Werror to
tests for compiler features.
* aclocal.m4: Regenerate.
* configure: Regenerate.
* config/c_io_libio.cc: Remove fcntl.h include, as SEEK_SET
redefined.
* libio/libioP.h: Comment out fcntl.h include.
* shadow/math.h: Add in float and long declarations, as per ISO C9X.
* bits/c++config: Define _ISOC99_SOURCE.
* acinclude.m4 (GLIBCPP_ENABLE_SHADOW): Add -fno-builtins to
CSHADOWFLAGS, as well as _ISOC99_SOURCE.
* aclocal.m4: Regenerate.
* configure: Regenerate.
* src/Makefile.am (CSHADOW_INCLUDES): Enable, again.
(CSHADOW_INCLUDES): Add -I$(top_srcdir)/std before shadow include dir.
(CXXCOMPILE): Remove $(DEFS), which searches $(top_srcdir) before
std or shadow directories.
(LTCXXCOMPILE): Same.
(INCLUDES): Add $(top_builddir) before $(top_srcdir).
(AC_CXXFLAGS): Add CSHADOWFLAGS.
* src/Makefile.in: Regenerate.
* src/complex.cc (FCT): Change ::name to name.
* src/complexl.cc (FCT): Same. Use _GLIBCPP_USE_LONG_LONG here.
* src/complexf.cc (FCT): Same.
* src/complexf.cc: Remove FCT define, as things are properly
overloaded in the std namespace with the shadow headers.
* src/complexl.cc: Same.
* src/complex.cc: Same.
From-SVN: r36707
282 lines
6.6 KiB
C++
282 lines
6.6 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: 21
|
|
|
|
#ifndef _CPP_CWCHAR
|
|
# define _CPP_CWCHAR 1
|
|
|
|
# include <bits/std_cstdio.h>
|
|
|
|
namespace _C_legacy {
|
|
extern "C" {
|
|
# define _IN_C_LEGACY_
|
|
# pragma GCC system_header
|
|
# include_next <wchar.h>
|
|
}
|
|
|
|
typedef wchar_t _CPP_wchar_t_capture;
|
|
typedef wint_t _CPP_wint_t_capture;
|
|
typedef mbstate_t _CPP_mbstate_t_capture;
|
|
|
|
#if 0
|
|
// XXX
|
|
inline int
|
|
fwprintf(FILE* __stream, const wchar_t* __format, ...);
|
|
|
|
inline int
|
|
fwscanf(FILE* __stream, const wchar_t* __format, ...);
|
|
|
|
inline int
|
|
vfwprintf(FILE* __stream, const wchar_t* __format, va_list __arg);
|
|
|
|
inline int
|
|
vfwscanf(FILE* __stream, const wchar_t* __format, va_list __arg);
|
|
|
|
inline wint_t
|
|
_CPP_fgetwc_capture(FILE* __stream)
|
|
{ return fgetwc(__stream); }
|
|
|
|
inline wchar_t*
|
|
_CPP_fgetws_capture(wchar_t* __s, int __n, FILE* __stream)
|
|
{ return fgetws(__s, __n, __stream); }
|
|
|
|
inline wint_t
|
|
_CPP_fputwc_capture(wchar_t __c, FILE* __stream)
|
|
{ return fputwc(__c, __stream); }
|
|
|
|
inline int
|
|
_CPP_fputws_capture(const wchar_t* __s, FILE* __stream)
|
|
{ return fputws(__s, __stream); }
|
|
|
|
inline int
|
|
_CPP_fwide_capture(FILE* __stream, int __mode)
|
|
{ return fwide(__stream, __mode); }
|
|
|
|
inline wint_t
|
|
_CPP_fgetwc_capture(FILE* __stream)
|
|
{ return fgetwc(__stream); }
|
|
|
|
inline wint_t
|
|
_CPP_putwc_capture(wchar_t __c, FILE* __stream)
|
|
{ return putwc(__c, __stream); }
|
|
|
|
inline wint_t
|
|
_CPP_ungetwc_capture(wint_t __c, FILE* __stream)
|
|
{ return ungetwc(__c, __stream); }
|
|
#endif
|
|
} // namespace _C_legacy
|
|
|
|
# undef wchar_t
|
|
# undef wint_t
|
|
# undef mbstate_t
|
|
|
|
# undef fwprintf
|
|
# undef fwscanf
|
|
# undef swprintf
|
|
# undef swscanf
|
|
# undef vfwprintf
|
|
# undef vfwscanf
|
|
# undef vswprintf
|
|
# undef vswscanf
|
|
# undef vwprintf
|
|
# undef vwscanf
|
|
# undef wprintf
|
|
# undef wscanf
|
|
# undef fgetwc
|
|
# undef fgetws
|
|
# undef fputwc
|
|
# undef fputws
|
|
# undef fwide
|
|
# undef getwc
|
|
# undef getwchar
|
|
# undef putwc
|
|
# undef putwchar
|
|
# undef ungetwc
|
|
# undef wcstod
|
|
# undef wcstof
|
|
# undef wcstold
|
|
# undef wcstol
|
|
# undef wcstoll
|
|
# undef wcstoul
|
|
# undef wcstoull
|
|
# undef wcscpy
|
|
# undef wcsncpy
|
|
# undef wcscat
|
|
# undef wcsncat
|
|
# undef wcsmp
|
|
# 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 btowc
|
|
# undef wctob
|
|
# undef mbsinit
|
|
# undef mbrlen
|
|
# undef mbrtowc
|
|
# undef wcrtomb
|
|
# undef mbsrtowcs
|
|
# undef wcsrtombs
|
|
|
|
namespace std {
|
|
|
|
typedef _C_legacy::_CPP_wchar_t_capture wchar_t;
|
|
typedef _C_legacy::_CPP_wint_t_capture wint_t;
|
|
typedef _C_legacy::_CPP_mbstate_t_capture mbstate_t;
|
|
|
|
#if 0
|
|
using _C_legacy::swprintf;
|
|
using _C_legacy::swscanf;
|
|
using _C_legacy::vswprintf;
|
|
using _C_legacy::vswscanf;
|
|
using _C_legacy::vwprintf;
|
|
using _C_legacy::vwscanf;
|
|
using _C_legacy::wprintf;
|
|
using _C_legacy::wscanf;
|
|
using _C_legacy::getwchar;
|
|
using _C_legacy::putwchar;
|
|
#endif
|
|
|
|
using _C_legacy::wcstod;
|
|
using _C_legacy::wcstof;
|
|
using _C_legacy::wcstold;
|
|
using _C_legacy::wcstol;
|
|
using _C_legacy::wcstoll;
|
|
using _C_legacy::wcstoul;
|
|
using _C_legacy::wcstoull;
|
|
using _C_legacy::wcscpy;
|
|
using _C_legacy::wcsncpy;
|
|
using _C_legacy::wcscat;
|
|
using _C_legacy::wcsncat;
|
|
|
|
#if 0
|
|
using _C_legacy::wcsmp;
|
|
#endif
|
|
|
|
using _C_legacy::wcscoll;
|
|
using _C_legacy::wcsncmp;
|
|
using _C_legacy::wcsxfrm;
|
|
using _C_legacy::wcschr;
|
|
using _C_legacy::wcscspn;
|
|
using _C_legacy::wcslen;
|
|
using _C_legacy::wcspbrk;
|
|
using _C_legacy::wcsrchr;
|
|
using _C_legacy::wcsspn;
|
|
using _C_legacy::wcsstr;
|
|
using _C_legacy::wcstok;
|
|
using _C_legacy::wmemchr;
|
|
using _C_legacy::wmemcmp;
|
|
using _C_legacy::wmemcpy;
|
|
using _C_legacy::wmemmove;
|
|
using _C_legacy::wmemset;
|
|
|
|
#if 0
|
|
using _C_legacy::wcsftime;
|
|
#endif
|
|
|
|
using _C_legacy::btowc;
|
|
using _C_legacy::wctob;
|
|
using _C_legacy::mbsinit;
|
|
using _C_legacy::mbrlen;
|
|
using _C_legacy::mbrtowc;
|
|
using _C_legacy::wcrtomb;
|
|
using _C_legacy::mbsrtowcs;
|
|
using _C_legacy::wcsrtombs;
|
|
|
|
#if 0
|
|
// XXX
|
|
inline int
|
|
fwprintf(FILE* __stream, const wchar_t* __format, ...);
|
|
|
|
inline int
|
|
fwscanf(FILE* __stream, const wchar_t* __format, ...);
|
|
|
|
inline int
|
|
vfwprintf(FILE* __stream, const wchar_t* __format, va_list __arg);
|
|
|
|
inline int
|
|
vfwscanf(FILE* __stream, const wchar_t* __format, va_list __arg);
|
|
|
|
inline wint_t
|
|
fgetwc(FILE* __stream)
|
|
{ return _C_legacy::_CPP_fgetwc_capture(__stream); }
|
|
|
|
inline wchar_t*
|
|
fgetws(wchar_t* __s, int __n, FILE* __stream)
|
|
{ return _C_legacy::_CPP_fgetws_capture(__s, __n, __stream); }
|
|
|
|
inline wint_t
|
|
fputwc(wchar_t __c, FILE* __stream)
|
|
{ return _C_legacy::_CPP_fputwc_capture(__c, __stream); }
|
|
|
|
inline int
|
|
fputws(const wchar_t* __s, FILE* __stream)
|
|
{ return _C_legacy::_CPP_fputws_capture(__s, __stream); }
|
|
|
|
inline int
|
|
fwide(FILE* __stream, int __mode)
|
|
{ return _C_legacy::_CPP_fwide_capture(__stream, __mode); }
|
|
|
|
inline wint_t
|
|
getwc(FILE* __stream)
|
|
{ return _C_legacy::_CPP_getwc_capture(__stream); }
|
|
|
|
inline wint_t
|
|
putwc(wchar_t __c, FILE* __stream)
|
|
{ return _C_legacy::_CPP_putwc_capture(__c, __stream); }
|
|
|
|
inline wint_t
|
|
ungetwc(wint_t __c, FILE* __stream)
|
|
{ return _C_legacy::_CPP_ungetwc_capture(__c, __stream); }
|
|
#endif
|
|
}
|
|
|
|
# undef _IN_C_LEGACY_
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|