diff options
| author | mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-11-12 03:27:10 +0000 |
|---|---|---|
| committer | mmitchel <mmitchel@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-11-12 03:27:10 +0000 |
| commit | 31e488b35ca6ed51f874a72e957c69ad1ae84f95 (patch) | |
| tree | 77eabb478229f5fc34c6c67d7e7717ecd015dec0 /libstdc++-v3 | |
| parent | aaaa7561b921cb992574784bde92d643b80d3d9c (diff) | |
| download | gcc-31e488b35ca6ed51f874a72e957c69ad1ae84f95.tar.gz | |
* include/bits/basic_file.h (__basic_file): Don't use __c_wfile_type
when _GLIBCPP_USE_WCHAR_T is not defined.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37400 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/basic_file.h | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index be17c8e6ab0..034fa36b68e 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +Sat Nov 11 20:25:49 2000 Mark P Mitchell <mark@codesourcery.com> + + * include/bits/basic_file.h (__basic_file): Don't use __c_wfile_type + when _GLIBCPP_USE_WCHAR_T is not defined. + 2000-11-10 Phil Edwards <pme@sources.redhat.com> * include/bits/codecvt.h (__iconv_adaptor): New adaptor function, diff --git a/libstdc++-v3/include/bits/basic_file.h b/libstdc++-v3/include/bits/basic_file.h index 902337a801c..f3fb4735647 100644 --- a/libstdc++-v3/include/bits/basic_file.h +++ b/libstdc++-v3/include/bits/basic_file.h @@ -122,7 +122,9 @@ namespace std { int _M_fileno; __c_file_type* _M_cfile; #endif +#ifdef _GLIBCPP_USE_WCHAR_T __c_wfile_type _M_wfile; +#endif /* !defined(_GLIBCPP_USE_WCHAR_T) */ public: __basic_file(__c_lock* __lock = 0); |