mirror of
git://gcc.gnu.org/git/gcc.git
synced 2024-12-23 16:29:30 +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
112 lines
3.8 KiB
C++
112 lines
3.8 KiB
C++
// underlying io library -*- C++ -*-
|
|
|
|
// 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.
|
|
|
|
// c_io_libio.h - Defines for using the GNU libio
|
|
|
|
#ifndef _CPP_IO_LIBIO_H
|
|
#define _CPP_IO_LIBIO_H 1
|
|
|
|
#include <libio.h>
|
|
|
|
namespace std {
|
|
|
|
// from fpos.h
|
|
typedef _IO_ssize_t streamsize; // Signed integral type
|
|
typedef _IO_ssize_t wstreamsize;
|
|
|
|
#if defined(_G_IO_IO_FILE_VERSION) && _G_IO_IO_FILE_VERSION == 0x20001
|
|
typedef _IO_off64_t streamoff;
|
|
typedef _IO_fpos64_t __c_streampos;
|
|
typedef _IO_off64_t wstreamoff;
|
|
#else
|
|
typedef _IO_off_t streamoff;
|
|
typedef _IO_fpos_t __c_streampos;
|
|
typedef _IO_off_t wstreamoff;
|
|
#endif
|
|
|
|
typedef _IO_lock_t __c_lock;
|
|
|
|
// from basic_file.h
|
|
#define _GLIBCPP_BASIC_FILE_INHERITANCE 1
|
|
typedef _IO_FILE __c_file_type;
|
|
typedef _IO_wide_data __c_wfile_type;
|
|
|
|
extern "C" _IO_codecvt __c_libio_codecvt;
|
|
|
|
// from ios_base.h
|
|
struct __ios_flags
|
|
{
|
|
typedef short __int_type;
|
|
|
|
static const __int_type _S_boolalpha = _IO_BAD_SEEN;
|
|
static const __int_type _S_dec = _IO_DEC;
|
|
static const __int_type _S_fixed = _IO_FIXED;
|
|
static const __int_type _S_hex = _IO_HEX;
|
|
static const __int_type _S_internal = _IO_INTERNAL;
|
|
static const __int_type _S_left = _IO_LEFT;
|
|
static const __int_type _S_oct = _IO_OCT;
|
|
static const __int_type _S_right = _IO_RIGHT;
|
|
static const __int_type _S_scientific = _IO_SCIENTIFIC;
|
|
static const __int_type _S_showbase = _IO_SHOWBASE;
|
|
static const __int_type _S_showpoint = _IO_SHOWPOINT;
|
|
static const __int_type _S_showpos = _IO_SHOWPOS;
|
|
static const __int_type _S_skipws = _IO_SKIPWS;
|
|
static const __int_type _S_unitbuf = _IO_UNITBUF;
|
|
static const __int_type _S_uppercase = _IO_UPPERCASE;
|
|
static const __int_type _S_adjustfield = _IO_LEFT | _IO_RIGHT
|
|
| _IO_INTERNAL;
|
|
static const __int_type _S_basefield = _IO_DEC | _IO_OCT | _IO_HEX;
|
|
static const __int_type _S_floatfield = _IO_SCIENTIFIC | _IO_FIXED;
|
|
|
|
// 27.4.2.1.3 Type ios_base::iostate
|
|
static const __int_type _S_badbit = _IO_BAD_SEEN;
|
|
static const __int_type _S_eofbit = _IO_EOF_SEEN;
|
|
static const __int_type _S_failbit = _IO_ERR_SEEN;
|
|
|
|
// 27.4.2.1.4 Type openmode
|
|
static const __int_type _S_app = _IOS_APPEND;
|
|
static const __int_type _S_ate = _IOS_ATEND;
|
|
static const __int_type _S_bin = _IOS_BIN;
|
|
static const __int_type _S_in = _IOS_INPUT;
|
|
static const __int_type _S_out = _IOS_OUTPUT;
|
|
static const __int_type _S_trunc = _IOS_TRUNC;
|
|
};
|
|
|
|
}
|
|
|
|
#endif // _CPP_IO_LIBIO_H
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|