aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Mitchell <mark@codesourcery.com>2000-11-12 03:27:10 +0000
committerMark Mitchell <mmitchel@gcc.gnu.org>2000-11-12 03:27:10 +0000
commit8d8523fe5247ceeef73f081cdac9d3709db0d9e1 (patch)
tree77eabb478229f5fc34c6c67d7e7717ecd015dec0
parent72aaffbd37e06eb3d8d94452c1f5b3a4d2a64b54 (diff)
downloadgcc-8d8523fe5247ceeef73f081cdac9d3709db0d9e1.zip
gcc-8d8523fe5247ceeef73f081cdac9d3709db0d9e1.tar.gz
gcc-8d8523fe5247ceeef73f081cdac9d3709db0d9e1.tar.bz2
basic_file.h (__basic_file): Don't use __c_wfile_type when _GLIBCPP_USE_WCHAR_T is not defined.
* include/bits/basic_file.h (__basic_file): Don't use __c_wfile_type when _GLIBCPP_USE_WCHAR_T is not defined. From-SVN: r37400
-rw-r--r--libstdc++-v3/ChangeLog5
-rw-r--r--libstdc++-v3/include/bits/basic_file.h2
2 files changed, 7 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index be17c8e..034fa36 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 902337a..f3fb473 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);