char_traits.cc: Move to ...

[gcc.git] / libstdc++-v3 / config / c_io_libio.cc

diff --git a/libstdc++-v3/config/c_io_libio.cc b/libstdc++-v3/config/c_io_libio.cc
index 6b3586262ac20c62076037569bdeb80fb0f6d8b5..1747ddb3e6d0beeb2dfde8900a1d832a8a98199c 100644 (file)
--- a/libstdc++-v3/config/c_io_libio.cc
+++ b/libstdc++-v3/config/c_io_libio.cc
@@ -33,13 +33,100 @@
 
 #include <bits/basic_file.h>
 #include <libioP.h>
-#include <fcntl.h>             // Solaris needs for O_* macros
 
 namespace std {
 
-  // Need to instantiate base class here for type-info bits, etc
-  template struct __basic_file_base<char>;
-  template struct __basic_file_base<wchar_t>;
+  // __basic_file<char> specializations
+  template<>
+    __basic_file<char>::__basic_file(__c_lock* __lock);
+
+  template<>
+    int 
+    __basic_file<char>::overflow(int __c);
+
+  template<>
+    int 
+    __basic_file<char>::underflow();
+
+  template<>
+    int 
+    __basic_file<char>::uflow();
+
+  template<>
+    int 
+    __basic_file<char>::pbackfail(int __c);
+
+  template<>
+    streamsize 
+    __basic_file<char>::xsputn(const char* __s, streamsize __n);
+
+  template<>
+    streamoff
+    __basic_file<char>::seekoff(streamoff __off, ios_base::seekdir __way, 
+                               ios_base::openmode __mode);
+
+  template<>
+    streamoff
+    __basic_file<char>::seekpos(streamoff __pos, ios_base::openmode __mode);
+
+  template<>
+    streambuf* 
+    __basic_file<char>::setbuf(char* __b, int __len);
+
+  template<>
+    int 
+    __basic_file<char>::sync();
+
+  template<>
+    int 
+    __basic_file<char>::doallocate();
+
+  // __basic_file<wchar_t> specializations
+#ifdef _GLIBCPP_USE_WCHAR_T
+  template<>
+    __basic_file<wchar_t>::__basic_file(__c_lock* __lock);
+
+  template<>
+    int 
+    __basic_file<wchar_t>::overflow(int __c);
+
+  template<>
+    int 
+    __basic_file<wchar_t>::underflow();
+
+  template<>
+    int 
+    __basic_file<wchar_t>::uflow();
+
+  template<>
+    int 
+    __basic_file<wchar_t>::pbackfail(int __c);
+
+  template<>
+    streamsize 
+    __basic_file<wchar_t>::xsputn(const wchar_t* __s, streamsize __n);
+
+  template<>
+    streamoff
+    __basic_file<wchar_t>::seekoff(streamoff __off, ios_base::seekdir __way, 
+                               ios_base::openmode __mode);
+
+  template<>
+    streamoff
+    __basic_file<wchar_t>::seekpos(streamoff __pos, ios_base::openmode __mode);
+
+  template<>
+    streambuf* 
+    __basic_file<wchar_t>::setbuf(wchar_t* __b, int __len);
+
+  template<>
+    int 
+    __basic_file<wchar_t>::sync();
+
+  template<>
+    int 
+    __basic_file<wchar_t>::doallocate();
+#endif
 
   // Generic definitions for __basic_file
   template<typename _CharT>
@@ -54,7 +141,8 @@ namespace std {
   template<typename _CharT>
     void 
     __basic_file<_CharT>::_M_open_mode(ios_base::openmode __mode, 
-                                      int& __p_mode, int& __rw_mode)
+                                      int& __p_mode, int& __rw_mode, 
+                                      char* /*__c_mode*/)
     {  
 #ifdef O_BINARY
       bool __testb = __mode & ios_base::binary;
@@ -107,8 +195,9 @@ namespace std {
       __basic_file* __ret = NULL;
       int __p_mode = 0;
       int __rw_mode = _IO_NO_READS + _IO_NO_WRITES; 
+      char __c_mode[4];
       
-      _M_open_mode(__mode, __p_mode, __rw_mode);
+      _M_open_mode(__mode, __p_mode, __rw_mode, __c_mode);
 
       if (!_IO_file_is_open(this))
        {
@@ -126,13 +215,14 @@ namespace std {
   template<typename _CharT>
     __basic_file<_CharT>* 
     __basic_file<_CharT>::open(const char* __name, ios_base::openmode __mode, 
-                              int __prot = 0664)
+                              int __prot)
     {
       __basic_file* __ret = NULL;
       int __p_mode = 0;
       int __rw_mode = _IO_NO_READS + _IO_NO_WRITES; 
-      
-      _M_open_mode(__mode, __p_mode, __rw_mode);
+      char __c_mode[4];
+
+      _M_open_mode(__mode, __p_mode, __rw_mode, __c_mode);
       if (!_IO_file_is_open(this))
        {
          __c_file_type* __f;
@@ -205,8 +295,12 @@ namespace std {
     _lock = __lock;
 #endif
     // Don't set the orientation of the stream when initializing.
+#ifdef _GLIBCPP_USE_WCHAR_T
     _IO_no_init(this, 0, 0, &_M_wfile, 0);
-    _IO_JUMPS(this) = &_IO_file_jumps;
+#else /* !defined(_GLIBCPP_USE_WCHAR_T) */
+    _IO_no_init(this, 0, 0, NULL, 0);
+#endif /* !defined(_GLIBCPP_USE_WCHAR_T) */
+    _IO_JUMPS((_IO_FILE_plus *) this) = &_IO_file_jumps;
     _IO_file_init((_IO_FILE_plus*)this);
   }
 
@@ -257,8 +351,6 @@ namespace std {
   __basic_file<char>::doallocate() 
   { return _IO_file_doallocate(this); }
 
-  template class __basic_file<char>;
-
   // __basic_file<wchar_t> definitions
 #ifdef _GLIBCPP_USE_WCHAR_T
   __basic_file<wchar_t>::__basic_file(__c_lock* __lock)
@@ -268,7 +360,7 @@ namespace std {
 #endif
     // Don't set the orientation of the stream when initializing.
     _IO_no_init(this, 0, 0, &_M_wfile, &_IO_wfile_jumps);
-    _IO_JUMPS(this) = &_IO_wfile_jumps;
+    _IO_JUMPS((_IO_FILE_plus *) this) = &_IO_wfile_jumps;
     _IO_file_init((_IO_FILE_plus*)this);
 
     // In addition, need to allocate the buffer...
@@ -281,7 +373,7 @@ namespace std {
     _IO_wsetp(this, _wide_data->_IO_buf_base, _wide_data->_IO_buf_base);
     
     // Setup codecvt bits...
-    _wide_data->_codecvt = __c_libio_codecvt;
+    _codecvt = &__c_libio_codecvt;
     
     // Do the same for narrow bits...
     if (_IO_write_base == NULL)
@@ -336,10 +428,15 @@ namespace std {
   int 
   __basic_file<wchar_t>::doallocate() 
   { return _IO_wfile_doallocate(this); }
+#endif
 
+  // Need to instantiate base class here for type-info bits, etc
+  template struct __basic_file_base<char>;
+  template class __basic_file<char>;
+#ifdef _GLIBCPP_USE_WCHAR_T
+  template struct __basic_file_base<wchar_t>;
   template class __basic_file<wchar_t>;
 #endif
-
 }  // namespace std