4c4809c175
2003-10-16 Petur Runolfsson <peturr02@ru.is>
PR libstdc++/8610
PR libstdc++/11450
PR libstdc++/11543
PR libstdc++/12065
* config/io/basic_file_stdio.cc (__basic_file::seekoff):
Change return value from streampos to streamoff.
(__basic_file::seekpos): Delete.
* config/io/basic_file_stdio.h: Same.
* config/io/c_io_stdio.h: Remove streamoff and wstreamsize typedefs.
* include/Makefile.am (bits_headers): Add bits/postypes.h.
* include/bits/char_traits.h: Include bits/postypes.h instead of
bits/fpos.h.
* include/bits/fstream.tcc (basic_filebuf::open,
basic_filebuf::pbackfail): Don't use < or >= to compare pos_type
values, use == and != instead.
(basic_filebuf::_M_seek): Use explicit conversion from streamoff
to pos_type.
(basic_filebuf::imbue): Don't use ! on pos_type values, use
== instead. Don't use __check_facet(_M_codecvt) unless is_open().
* include/bits/postypes.h: New file.
Add __streamoff_base_type typedef, streamsize.
(streamoff, streampos, wstreampos): Define typedefs, with
streamoff defined as...
(streamoff): New class. Document implementation defined
aspects.
(fpos): New implementation. Document implementation defined
aspects.
* include/bits/sstream.tcc (basic_stringbuf::seekpos): Use
explicit conversion from pos_type to off_type.
* include/std/std_iosfwd.h: Include bits/postypes.h instead
of bits/fpos.h.
* testsuite/27_io/basic_filebuf/seekoff/char/11543.cc: New test.
* testsuite/27_io/basic_filebuf/seekoff/wchar_t/11543.cc: New test.
* testsuite/27_io/fpos/11450.cc: New test.
* testsuite/27_io/fpos/mbstate_t/12065.cc: New test.
* testsuite/27_io/fpos/mbstate_t/4_neg.cc: New test.
* testsuite/27_io/types/3.cc: New test.
2003-10-16 Benjamin Kosnik <bkoz@redhat.com>
* configure.host: Remove fpos_include_dir.
* configure.ac: Remove FPOS_INC_SRCDIR.
* configure: Regenerate.
* acinclude.m4 (GLIBCXX_ENABLE_CSTDIO): Remove FPOS_H.
* aclocal.m4: Regenerate.
* include/Makefile.am (host_headers): Remove fpos.h.
(bits_headers): Add postypes.h.
* include/Makefile.in: Regenerate.
* config/os/gnu-linux/fposh: Remove.
* config/os/generic/fpos.h: Remove.
* testsuite/27_io/basic_filebuf/seekoff/char/1-in.cc: Fixup.
* testsuite/27_io/basic_filebuf/seekoff/char/1-io.cc: Same.
* testsuite/27_io/basic_filebuf/seekoff/char/1-out.cc: Same.
* testsuite/27_io/basic_filebuf/seekoff/char/2-in.cc: Same.
* testsuite/27_io/basic_filebuf/seekoff/char/2-io.cc: Same.
* testsuite/27_io/basic_filebuf/seekoff/char/2-out.cc: Same.
* testsuite/27_io/basic_filebuf/seekpos/char/1-in.cc: Same.
* testsuite/27_io/basic_filebuf/seekpos/char/1-io.cc: Same.
* testsuite/27_io/basic_filebuf/seekpos/char/1-out.cc: Same.
* testsuite/27_io/basic_filebuf/seekpos/char/2-in.cc: Same.
* testsuite/27_io/basic_filebuf/seekpos/char/2-io.cc: Same.
* testsuite/27_io/basic_filebuf/seekpos/char/2-out.cc: Same.
* testsuite/27_io/basic_istream/seekg/char/2.cc: Same.
* testsuite/27_io/basic_stringbuf/seekoff/char/1.cc: Same.
* testsuite/27_io/basic_stringbuf/seekpos/char/1.cc: Same.
* testsuite/27_io/fpos/mbstate_t/3.cc: Same.
* testsuite/27_io/objects/char/10.cc: Same.
From-SVN: r72582
86 lines
3.1 KiB
C++
86 lines
3.1 KiB
C++
// underlying io library -*- C++ -*-
|
|
|
|
// Copyright (C) 2000, 2001, 2002, 2003 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_stdio.h - Defines for using "C" stdio.h
|
|
|
|
#ifndef _C_IO_STDIO_H
|
|
#define _C_IO_STDIO_H 1
|
|
|
|
#include <cstdio>
|
|
#include <cstddef>
|
|
#include <bits/gthr.h>
|
|
|
|
namespace std
|
|
{
|
|
typedef __gthread_mutex_t __c_lock;
|
|
|
|
// for basic_file.h
|
|
typedef FILE __c_file;
|
|
|
|
// for ios_base.h
|
|
struct __ios_flags
|
|
{
|
|
typedef short __int_type;
|
|
|
|
static const __int_type _S_boolalpha = 0x0001;
|
|
static const __int_type _S_dec = 0x0002;
|
|
static const __int_type _S_fixed = 0x0004;
|
|
static const __int_type _S_hex = 0x0008;
|
|
static const __int_type _S_internal = 0x0010;
|
|
static const __int_type _S_left = 0x0020;
|
|
static const __int_type _S_oct = 0x0040;
|
|
static const __int_type _S_right = 0x0080;
|
|
static const __int_type _S_scientific = 0x0100;
|
|
static const __int_type _S_showbase = 0x0200;
|
|
static const __int_type _S_showpoint = 0x0400;
|
|
static const __int_type _S_showpos = 0x0800;
|
|
static const __int_type _S_skipws = 0x1000;
|
|
static const __int_type _S_unitbuf = 0x2000;
|
|
static const __int_type _S_uppercase = 0x4000;
|
|
static const __int_type _S_adjustfield = 0x0020 | 0x0080 | 0x0010;
|
|
static const __int_type _S_basefield = 0x0002 | 0x0040 | 0x0008;
|
|
static const __int_type _S_floatfield = 0x0100 | 0x0004;
|
|
|
|
// 27.4.2.1.3 Type ios_base::iostate
|
|
static const __int_type _S_badbit = 0x01;
|
|
static const __int_type _S_eofbit = 0x02;
|
|
static const __int_type _S_failbit = 0x04;
|
|
|
|
// 27.4.2.1.4 Type openmode
|
|
static const __int_type _S_app = 0x01;
|
|
static const __int_type _S_ate = 0x02;
|
|
static const __int_type _S_bin = 0x04;
|
|
static const __int_type _S_in = 0x08;
|
|
static const __int_type _S_out = 0x10;
|
|
static const __int_type _S_trunc = 0x20;
|
|
};
|
|
}
|
|
|
|
#endif
|