2000-12-07 Benjamin Kosnik <bkoz@purist.soma.redhat.com>

	* config/os/generic/bits/ctype_base.h (ctype_base): Change space mask.

	* config/os/generic/bits/ctype_noninline.h (ctype): Remove default
	arguments in definition.
	* config/os/solaris/solaris2.7/bits/ctype_noninline.h (ctype): Same.
	* config/os/solaris/solaris2.6/bits/ctype_noninline.h (ctype): Same.
	* config/os/solaris/solaris2.5/bits/ctype_noninline.h (ctype): Same.
	* config/os/newlib/bits/ctype_noninline.h (ctype): Same.
	* config/os/irix/bits/ctype_noninline.h (ctype): Same.
	* config/os/hpux/bits/ctype_noninline.h (ctype): Same.
	* config/os/bsd/netbsd/bits/ctype_noninline.h (ctype): Same.
	* config/os/bsd/freebsd/bits/ctype_noninline.h (ctype): Same.
	* config/os/aix/bits/ctype_noninline.h (ctype): Same.

	* include/bits/locale_facets.h: Tweak.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@38115 138bc75d-0d04-0410-961f-82ee72b054a4

13 files changed, 44 insertions, 37 deletions

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 686a3501140..dd0949b7918 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,21 @@
+2000-12-07  Benjamin Kosnik  <bkoz@purist.soma.redhat.com>
+
+	* config/os/generic/bits/ctype_base.h (ctype_base): Change space mask.
+
+	* config/os/generic/bits/ctype_noninline.h (ctype): Remove default
+	arguments in definition.
+	* config/os/solaris/solaris2.7/bits/ctype_noninline.h (ctype): Same.
+	* config/os/solaris/solaris2.6/bits/ctype_noninline.h (ctype): Same.
+	* config/os/solaris/solaris2.5/bits/ctype_noninline.h (ctype): Same.
+	* config/os/newlib/bits/ctype_noninline.h (ctype): Same.
+	* config/os/irix/bits/ctype_noninline.h (ctype): Same.
+	* config/os/hpux/bits/ctype_noninline.h (ctype): Same.
+	* config/os/bsd/netbsd/bits/ctype_noninline.h (ctype): Same.
+	* config/os/bsd/freebsd/bits/ctype_noninline.h (ctype): Same.
+	* config/os/aix/bits/ctype_noninline.h (ctype): Same.
+
+	* include/bits/locale_facets.h: Tweak.
+	
 2000-12-06  Benjamin Kosnik  <bkoz@kredhat.com>
 
 	* include/bits/locale_facets.h (ctype): Remove _Ctype_nois and
diff --git a/libstdc++-v3/config/os/aix/bits/ctype_noninline.h b/libstdc++-v3/config/os/aix/bits/ctype_noninline.h
index 54f546c75cb..30a36d27846 100644
--- a/libstdc++-v3/config/os/aix/bits/ctype_noninline.h
+++ b/libstdc++-v3/config/os/aix/bits/ctype_noninline.h
@@ -33,8 +33,7 @@
   
 // Information as gleaned from /usr/include/ctype.h
   
-  ctype<char>::ctype(const mask* __table = 0, bool __del = false, 
-	size_t __refs = 0) 
+  ctype<char>::ctype(const mask* __table, bool __del, size_t __refs) 
     : __ctype_abstract_base<char>(__refs), _M_del(__table != 0 && __del), 
       _M_toupper(NULL), _M_tolower(NULL),
       _M_ctable(NULL), _M_table(__table == 0 ? _M_ctable: __table) 
diff --git a/libstdc++-v3/config/os/bsd/freebsd/bits/ctype_noninline.h b/libstdc++-v3/config/os/bsd/freebsd/bits/ctype_noninline.h
index 5de223ba852..40262f7ce26 100644
--- a/libstdc++-v3/config/os/bsd/freebsd/bits/ctype_noninline.h
+++ b/libstdc++-v3/config/os/bsd/freebsd/bits/ctype_noninline.h
@@ -33,8 +33,7 @@
   
 // Information as gleaned from /usr/include/ctype.h
   
-  ctype<char>::ctype(const mask* __table = 0, bool __del = false, 
-	size_t __refs = 0) 
+  ctype<char>::ctype(const mask* __table, bool __del, size_t __refs) 
     : __ctype_abstract_base<char>(__refs), _M_del(__table != 0 && __del), 
       _M_toupper(NULL), _M_tolower(NULL),
       _M_ctable(NULL), _M_table(__table == 0 ? _M_ctable: __table) 
diff --git a/libstdc++-v3/config/os/bsd/netbsd/bits/ctype_noninline.h b/libstdc++-v3/config/os/bsd/netbsd/bits/ctype_noninline.h
index 395c066da53..8ea1b8d9827 100644
--- a/libstdc++-v3/config/os/bsd/netbsd/bits/ctype_noninline.h
+++ b/libstdc++-v3/config/os/bsd/netbsd/bits/ctype_noninline.h
@@ -33,8 +33,7 @@
   
 // Information as gleaned from /usr/include/ctype.h
   
-  ctype<char>::ctype(const mask* __table = 0, bool __del = false, 
-	size_t __refs = 0) 
+  ctype<char>::ctype(const mask* __table, bool __del, size_t __refs) 
     : __ctype_abstract_base<char>(__refs), _M_del(__table != 0 && __del), 
       _M_toupper(NULL), _M_tolower(NULL),
       _M_ctable(NULL), _M_table(__table == 0 ? (_ctype_ + 1) : __table) 
diff --git a/libstdc++-v3/config/os/generic/bits/ctype_base.h b/libstdc++-v3/config/os/generic/bits/ctype_base.h
index 8b5e0a07252..08b85344390 100644
--- a/libstdc++-v3/config/os/generic/bits/ctype_base.h
+++ b/libstdc++-v3/config/os/generic/bits/ctype_base.h
@@ -41,17 +41,17 @@
 
     enum
     {
-      space = (1 << 5),	// Whitespace
-      print = (1 << 6),	// Printing
-      cntrl = (1 << 9),	// Control character
-      upper = (1 << 0),	// UPPERCASE
-      lower = (1 << 1),	// lowercase
-      alpha = (1 << 5),	// Alphabetic
-      digit = (1 << 2),	// Numeric
-      punct = (1 << 10),// Punctuation
-      xdigit = (1 << 4),// Hexadecimal numeric
-      alnum = (1 << 11),// Alphanumeric
-      graph = (1 << 7)	// Graphical
+      space  = (1 << 0),     // Whitespace
+      print  = (1 << 1),     // Printing
+      cntrl  = (1 << 2),     // Control character
+      upper  = (1 << 3),     // UPPERCASE
+      lower  = (1 << 4),     // lowercase
+      alpha  = (1 << 5),     // Alphabetic
+      digit  = (1 << 6),     // Numeric
+      punct  = (1 << 7),     // Punctuation
+      xdigit = (1 << 8),     // Hexadecimal numeric
+      alnum  = (1 << 9),     // Alphanumeric
+      graph  = (1 << 10)     // Graphical
     };
   };
 
diff --git a/libstdc++-v3/config/os/generic/bits/ctype_noninline.h b/libstdc++-v3/config/os/generic/bits/ctype_noninline.h
index 38edd40c7a9..e8da46269dd 100644
--- a/libstdc++-v3/config/os/generic/bits/ctype_noninline.h
+++ b/libstdc++-v3/config/os/generic/bits/ctype_noninline.h
@@ -33,8 +33,7 @@
   
 // Information as gleaned from /usr/include/ctype.h
   
-  ctype<char>::ctype(const mask* __table = 0, bool __del = false, 
-	size_t __refs = 0) 
+  ctype<char>::ctype(const mask* __table, bool __del, size_t __refs) 
     : __ctype_abstract_base<char>(__refs), _M_del(__table != 0 && __del), 
       _M_toupper(NULL), _M_tolower(NULL),
       _M_ctable(NULL), _M_table(__table == 0 ? _M_ctable: __table) 
diff --git a/libstdc++-v3/config/os/hpux/bits/ctype_noninline.h b/libstdc++-v3/config/os/hpux/bits/ctype_noninline.h
index 38edd40c7a9..e8da46269dd 100644
--- a/libstdc++-v3/config/os/hpux/bits/ctype_noninline.h
+++ b/libstdc++-v3/config/os/hpux/bits/ctype_noninline.h
@@ -33,8 +33,7 @@
   
 // Information as gleaned from /usr/include/ctype.h
   
-  ctype<char>::ctype(const mask* __table = 0, bool __del = false, 
-	size_t __refs = 0) 
+  ctype<char>::ctype(const mask* __table, bool __del, size_t __refs) 
     : __ctype_abstract_base<char>(__refs), _M_del(__table != 0 && __del), 
       _M_toupper(NULL), _M_tolower(NULL),
       _M_ctable(NULL), _M_table(__table == 0 ? _M_ctable: __table) 
diff --git a/libstdc++-v3/config/os/irix/bits/ctype_noninline.h b/libstdc++-v3/config/os/irix/bits/ctype_noninline.h
index 0fb25d189c0..8045feb0890 100644
--- a/libstdc++-v3/config/os/irix/bits/ctype_noninline.h
+++ b/libstdc++-v3/config/os/irix/bits/ctype_noninline.h
@@ -33,13 +33,11 @@
   
 // Information as gleaned from /usr/include/ctype.h
 
-  ctype<char>::ctype(const mask* __table = 0, bool __del = false, 
-	size_t __refs = 0)
-    : __ctype_abstract_base<char>(__refs), _M_del(__table != 0 && __del), 
-      _M_toupper(NULL), _M_tolower(NULL), _M_ctable(NULL), 
-      _M_table(!__table
-	       ? (const mask*) (__libc_attr._ctype_tbl->_class + 1)
-	       : __table) 
+  ctype<char>::ctype(const mask* __table, bool __del, size_t __refs)
+  : __ctype_abstract_base<char>(__refs), _M_del(__table != 0 && __del), 
+    _M_toupper(NULL), _M_tolower(NULL), _M_ctable(NULL), 
+    _M_table(!__table ? 
+             (const mask*) (__libc_attr._ctype_tbl->_class + 1) : __table) 
     { }
 
   char
diff --git a/libstdc++-v3/config/os/newlib/bits/ctype_noninline.h b/libstdc++-v3/config/os/newlib/bits/ctype_noninline.h
index 30494d34b30..803e6d43dfc 100644
--- a/libstdc++-v3/config/os/newlib/bits/ctype_noninline.h
+++ b/libstdc++-v3/config/os/newlib/bits/ctype_noninline.h
@@ -33,8 +33,7 @@
   
 // Information as gleaned from /usr/include/ctype.h
   
-  ctype<char>::ctype(const mask* __table = 0, bool __del = false, 
-	size_t __refs = 0) 
+  ctype<char>::ctype(const mask* __table, bool __del, size_t __refs) 
     : __ctype_abstract_base<char>(__refs), _M_del(__table != 0 && __del), 
       _M_toupper(NULL), _M_tolower(NULL),
       _M_ctable(_ctype_), _M_table(__table == 0 ? _M_ctable: __table) 
diff --git a/libstdc++-v3/config/os/solaris/solaris2.5/bits/ctype_noninline.h b/libstdc++-v3/config/os/solaris/solaris2.5/bits/ctype_noninline.h
index 867607742b8..dd0d4fb7729 100644
--- a/libstdc++-v3/config/os/solaris/solaris2.5/bits/ctype_noninline.h
+++ b/libstdc++-v3/config/os/solaris/solaris2.5/bits/ctype_noninline.h
@@ -33,8 +33,7 @@
   
 // Information as gleaned from /usr/include/ctype.h
   
-  ctype<char>::ctype(const mask* __table = 0, bool __del = false, 
-	size_t __refs = 0) 
+  ctype<char>::ctype(const mask* __table, bool __del, size_t __refs) 
     : __ctype_abstract_base<char>(__refs), _M_del(__table != 0 && __del), 
       _M_toupper(NULL), _M_tolower(NULL),
       _M_ctable(__ctype), _M_table(__table == 0 ? _M_ctable: __table) 
diff --git a/libstdc++-v3/config/os/solaris/solaris2.6/bits/ctype_noninline.h b/libstdc++-v3/config/os/solaris/solaris2.6/bits/ctype_noninline.h
index 29ecc9eb7a1..e436eb066b3 100644
--- a/libstdc++-v3/config/os/solaris/solaris2.6/bits/ctype_noninline.h
+++ b/libstdc++-v3/config/os/solaris/solaris2.6/bits/ctype_noninline.h
@@ -33,8 +33,7 @@
   
 // Information as gleaned from /usr/include/ctype.h
   
-  ctype<char>::ctype(const mask* __table = 0, bool __del = false, 
-	size_t __refs = 0) 
+  ctype<char>::ctype(const mask* __table, bool __del, size_t __refs) 
     : __ctype_abstract_base<char>(__refs), _M_del(__table != 0 && __del), 
       _M_toupper(__trans_upper), _M_tolower(__trans_lower),
       _M_ctable(__ctype_mask), _M_table(__table == 0 ? _M_ctable: __table) 
diff --git a/libstdc++-v3/config/os/solaris/solaris2.7/bits/ctype_noninline.h b/libstdc++-v3/config/os/solaris/solaris2.7/bits/ctype_noninline.h
index ae3d6fb07be..8b799219e0c 100644
--- a/libstdc++-v3/config/os/solaris/solaris2.7/bits/ctype_noninline.h
+++ b/libstdc++-v3/config/os/solaris/solaris2.7/bits/ctype_noninline.h
@@ -33,8 +33,7 @@
   
 // Information as gleaned from /usr/include/ctype.h
   
-  ctype<char>::ctype(const mask* __table = 0, bool __del = false, 
-	size_t __refs = 0)
+  ctype<char>::ctype(const mask* __table, bool __del, size_t __refs)
     : __ctype_abstract_base<char>(__refs), _M_del(__table != 0 && __del), 
       _M_toupper(__trans_upper), _M_tolower(__trans_lower),
       _M_ctable(__ctype_mask), _M_table(__table == 0 ? _M_ctable: __table) 
diff --git a/libstdc++-v3/include/bits/locale_facets.h b/libstdc++-v3/include/bits/locale_facets.h
index e7ba4941f56..7d9a3a6d9ec 100644
--- a/libstdc++-v3/include/bits/locale_facets.h
+++ b/libstdc++-v3/include/bits/locale_facets.h
@@ -223,7 +223,7 @@ namespace std
       __to_type const& 	       _M_toupper;
       __to_type const& 	       _M_tolower;
       const mask* const&       _M_ctable;
-      const mask*       _M_table;
+      const mask*              _M_table;
       
     public:
       static locale::id        id;