4 files changed, 15 insertions, 11 deletions
diff --git a/libstdc++-v3/config/cpu/ia64/bits/atomicity.h b/libstdc++-v3/config/cpu/ia64/bits/atomicity.h
index d229331de72..18b3ac05ec3 100644
--- a/libstdc++-v3/config/cpu/ia64/bits/atomicity.h
+++ b/libstdc++-v3/config/cpu/ia64/bits/atomicity.h
@@ -25,7 +25,7 @@
 typedef int _Atomic_word;
 
 static inline _Atomic_word 
-__attribute__ ((__unused__))
+__attribute__ ((unused))
 __exchange_and_add (volatile _Atomic_word *__mem, int __val)
 {
   return __sync_fetch_and_add (__mem, __val);
diff --git a/libstdc++-v3/config/gnu-linux/bits/ctype_base.h b/libstdc++-v3/config/gnu-linux/bits/ctype_base.h
index 8d4a65bd040..fbbf376608f 100644
--- a/libstdc++-v3/config/gnu-linux/bits/ctype_base.h
+++ b/libstdc++-v3/config/gnu-linux/bits/ctype_base.h
@@ -35,11 +35,15 @@
   
   struct ctype_base
   {
-    typedef unsigned short 	mask;
     // Non-standard typedefs.
+    // XXX
+    typedef unsigned short 	mask;   
+    typedef unsigned short 	__table_type;   
     typedef const int* 		__to_type;
 
-    enum
+    // XXX
+    //    enum mask
+    enum 
     {
       space = _ISspace,
       print = _ISprint,
diff --git a/libstdc++-v3/config/gnu-linux/bits/ctype_specializations.h b/libstdc++-v3/config/gnu-linux/bits/ctype_specializations.h
index 76d4cbcbb79..fdba4e7535e 100644
--- a/libstdc++-v3/config/gnu-linux/bits/ctype_specializations.h
+++ b/libstdc++-v3/config/gnu-linux/bits/ctype_specializations.h
@@ -70,4 +70,3 @@
 
 
 
-
diff --git a/libstdc++-v3/config/gnu-linux/ctype.cc b/libstdc++-v3/config/gnu-linux/ctype.cc
index dc10a63a684..d6a819d68bc 100644
--- a/libstdc++-v3/config/gnu-linux/ctype.cc
+++ b/libstdc++-v3/config/gnu-linux/ctype.cc
@@ -32,9 +32,8 @@
 //
   
 // Information as gleaned from /usr/include/ctype.h
-  
-  ctype<char>::ctype(const mask* __table = 0, bool __del = false, 
-	size_t __refs = 0) throw()
+
+  ctype<char>::ctype(const mask* __table, bool __del, size_t __refs)
     : _Ctype_nois<char>(__refs), _M_del(__table != 0 && __del), 
       _M_toupper(__ctype_toupper), _M_tolower(__ctype_tolower),
       _M_ctable(__ctype_b), _M_table(__table == 0 ? _M_ctable: __table) 
@@ -42,14 +41,14 @@
 
   char
   ctype<char>::do_toupper(char __c) const
-  { return _M_toupper[(int) __c]; }
+  { return _M_toupper[static_cast<int>(__c)]; }
 
   const char*
   ctype<char>::do_toupper(char* __low, const char* __high) const
   {
     while (__low < __high)
       {
-	*__low = _M_toupper[(int) *__low];
+	*__low = _M_toupper[static_cast<int>(*__low)];
 	++__low;
       }
     return __high;
@@ -57,16 +56,18 @@
 
   char
   ctype<char>::do_tolower(char __c) const
-  { return _M_tolower[(int) __c]; }
+  { return _M_tolower[static_cast<int>(__c)]; }
 
   const char* 
   ctype<char>::do_tolower(char* __low, const char* __high) const
   {
     while (__low < __high)
       {
-	*__low = _M_tolower[(int) *__low];
+	*__low = _M_tolower[static_cast<int>(*__low)];
 	++__low;
       }
     return __high;
   }
 
+
+