ctype_base.h (ctype_base): Change space mask.

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.

From-SVN: r38115

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 686a3501140e03d555d4bd2cd4a63f40ef23b265..dd0949b791811911d9e7df625770e80395046d5a 100644 (file)
--- 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 54f546c75cb29b63cc863e4bbd6ee651f5224d31..30a36d2784683b5465aba7ef7dde5b15a9af8a62 100644 (file)
--- 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 5de223ba8529c08e52329c6ecf8cbac204382253..40262f7ce2688286145aadadda5452ced2aaf6dc 100644 (file)
--- 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 395c066da53f6e10a0719a3043135416380dfa87..8ea1b8d9827a72472c833d13b676a33dc731d48f 100644 (file)
--- 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 8b5e0a07252e391e0987f96f4d541bb6ea699699..08b85344390105f2d64da1dfe66edbc8752132ed 100644 (file)
--- 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 38edd40c7a9122c18ea3bae78f8fa60366b8723f..e8da46269dde3dba2cd7aa525436361efc436cde 100644 (file)
--- 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 38edd40c7a9122c18ea3bae78f8fa60366b8723f..e8da46269dde3dba2cd7aa525436361efc436cde 100644 (file)
--- 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 0fb25d189c0c963db524426eec564673846c16e1..8045feb089071c5bc7ed639435a02ceaf75d3b5d 100644 (file)
--- 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 30494d34b30738ddf0ebd311d2422c97341f2ba3..803e6d43dfccd40aef7a43f0ea76854f5b7935f7 100644 (file)
--- 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 867607742b860f7c65281b9b14bd1202fda61869..dd0d4fb7729181daea2f603753159e2d54227943 100644 (file)
--- 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 29ecc9eb7a1e55515414ce6342e2c3d9a6094b7a..e436eb066b30acfe6c172786d2f53ebdb593bce0 100644 (file)
--- 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 ae3d6fb07beaeabac7ff43194e7e6067bc418763..8b799219e0ce473886a259ce9502b02d9b2ad336 100644 (file)
--- 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 e7ba4941f56edac50fbb909c8a546905b95b0f14..7d9a3a6d9ec7e2dbf671cb3f81464bec06175041 100644 (file)
--- 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;