diff options
author | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-03-07 22:22:41 +0000 |
---|---|---|
committer | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-03-07 22:22:41 +0000 |
commit | 4daa85e8cd08f3ea6993dc7aaeae18b6592f40c5 (patch) | |
tree | 1b3a74319ba47ca42f9732a30368fa98541f158a /libstdc++-v3/config | |
parent | a17bbbd8b0d9a20eab8fe2778d560588888bc4a5 (diff) | |
download | gcc-4daa85e8cd08f3ea6993dc7aaeae18b6592f40c5.tar.gz |
2001-03-07 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/std_iosfwd.h: Remove string forward decls here.
* include/bits/stringfwd.h: Add forward decls for char_traits
specializations.
* config/c_io_libio.h (wstreamoff): Delete.
* config/c_io_stdio.h (wstreamoff): Same.
* include/bits/char_traits.h: Use streamoff not wstreamoff for
char_traits<wchar_t>::off_type.
Remove duplicate typedefs.
* include/bits/fpos.h: Define streampos/wstreampos here.
* testsuite/27_io/istream_seeks.cc (test04): Explicitly cast int
values to off_type.
(test05): Same.
Changeup output files.
* testsuite/27_io/istream_unformatted.cc: Change output files.
* testsuite/27_io/istream_seeks-1.txt: Add.
* testsuite/27_io/istream_seeks-2.tst: Add.
* testsuite/27_io/istream_seeks-1.tst: Add.
* testsuite/27_io/istream_unformatted-2.tst: Delete.
* testsuite/27_io/istream_unformatted-3.tst: Delete.
* testsuite/27_io/istream_unformatted-3.txt: Delete.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@40303 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/config')
-rw-r--r-- | libstdc++-v3/config/c_io_libio.h | 2 | ||||
-rw-r--r-- | libstdc++-v3/config/c_io_stdio.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/libstdc++-v3/config/c_io_libio.h b/libstdc++-v3/config/c_io_libio.h index 9e040d7b91a..59267985f96 100644 --- a/libstdc++-v3/config/c_io_libio.h +++ b/libstdc++-v3/config/c_io_libio.h @@ -43,11 +43,9 @@ namespace std #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 #ifdef _GLIBCPP_USE_THREADS diff --git a/libstdc++-v3/config/c_io_stdio.h b/libstdc++-v3/config/c_io_stdio.h index a9a3fda625e..e44780c78e8 100644 --- a/libstdc++-v3/config/c_io_stdio.h +++ b/libstdc++-v3/config/c_io_stdio.h @@ -42,7 +42,6 @@ namespace std typedef long streamoff; typedef ptrdiff_t streamsize; // Signed integral type #if _GLIBCPP_USE_WCHAR_T - typedef long wstreamoff; typedef ptrdiff_t wstreamsize; #endif typedef fpos_t __c_streampos; @@ -51,6 +50,7 @@ namespace std typedef __mutext_type __c_lock; #else typedef int __c_lock; + #endif // from basic_file.h |