From 0b5ce4f15c22e4a60a28c8dc936531e7155af563 Mon Sep 17 00:00:00 2001
From: Petur Runolfsson <peturr02@ru.is>
Date: Thu, 18 Sep 2003 14:02:46 +0000
Subject: [PATCH] basic_file_stdio.cc (sys_getc, sys_ungetc): Delete.

2003-09-18  Petur Runolfsson  <peturr02@ru.is>

	* config/io/basic_file_stdio.cc (sys_getc, sys_ungetc): Delete.
	* config/io/basic_file_stdio.h: Same.
	* include/std/std_fstream.h (__ctype_type): Delete.
	* include/std/std_streambuf.h (__ctype_type, __state_type): Delete.

From-SVN: r71520
---
 libstdc++-v3/ChangeLog                     | 7 +++++++
 libstdc++-v3/config/io/basic_file_stdio.cc | 8 --------
 libstdc++-v3/config/io/basic_file_stdio.h  | 6 ------
 libstdc++-v3/include/std/std_fstream.h     | 1 -
 libstdc++-v3/include/std/std_streambuf.h   | 4 +---
 5 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 567a1876baa..cc31247e9dc 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2003-09-18  Petur Runolfsson  <peturr02@ru.is>
+
+	* config/io/basic_file_stdio.cc (sys_getc, sys_ungetc): Delete.
+	* config/io/basic_file_stdio.h: Same.
+	* include/std/std_fstream.h (__ctype_type): Delete.
+	* include/std/std_streambuf.h (__ctype_type, __state_type): Delete.
+	
 2003-09-17  Benjamin Kosnik  <bkoz@redhat.com>
 
 	PR libstdc++/12239
diff --git a/libstdc++-v3/config/io/basic_file_stdio.cc b/libstdc++-v3/config/io/basic_file_stdio.cc
index 5791135eb54..556bd9063fb 100644
--- a/libstdc++-v3/config/io/basic_file_stdio.cc
+++ b/libstdc++-v3/config/io/basic_file_stdio.cc
@@ -154,14 +154,6 @@ namespace std
       }
     return __ret;
   }
-
-  int
-  __basic_file<char>::sys_getc() 
-  { return getc(_M_cfile); }
-
-  int
-  __basic_file<char>::sys_ungetc(int __c) 
-  { return ungetc(__c, _M_cfile); }
   
   __basic_file<char>* 
   __basic_file<char>::open(const char* __name, ios_base::openmode __mode, 
diff --git a/libstdc++-v3/config/io/basic_file_stdio.h b/libstdc++-v3/config/io/basic_file_stdio.h
index 90721bb30c2..2b1a9871c32 100644
--- a/libstdc++-v3/config/io/basic_file_stdio.h
+++ b/libstdc++-v3/config/io/basic_file_stdio.h
@@ -76,12 +76,6 @@ namespace std
       __basic_file*
       sys_open(int __fd, ios_base::openmode __mode, bool __del);
 
-      int
-      sys_getc();
-
-      int
-      sys_ungetc(int);
-
       __basic_file* 
       close(); 
 
diff --git a/libstdc++-v3/include/std/std_fstream.h b/libstdc++-v3/include/std/std_fstream.h
index 78d052ae555..406ff1e2921 100644
--- a/libstdc++-v3/include/std/std_fstream.h
+++ b/libstdc++-v3/include/std/std_fstream.h
@@ -82,7 +82,6 @@ namespace std
       typedef __basic_file<char>		        __file_type;
       typedef typename traits_type::state_type          __state_type;
       typedef codecvt<char_type, char, __state_type>    __codecvt_type;
-      typedef ctype<char_type>                          __ctype_type;
       //@}
 
       friend class ios_base; // For sync_with_stdio.
diff --git a/libstdc++-v3/include/std/std_streambuf.h b/libstdc++-v3/include/std/std_streambuf.h
index 3c144987306..dc43db0bddf 100644
--- a/libstdc++-v3/include/std/std_streambuf.h
+++ b/libstdc++-v3/include/std/std_streambuf.h
@@ -140,12 +140,10 @@ namespace std
       //@{
       /**
        *  @if maint
-       *  These are non-standard types.
+       *  This is a non-standard type.
        *  @endif
       */
-      typedef ctype<char_type>           		__ctype_type;
       typedef basic_streambuf<char_type, traits_type>  	__streambuf_type;
-      typedef typename traits_type::state_type 		__state_type;
       //@}
       
       friend class basic_ios<char_type, traits_type>;