2005-03-23 Benjamin Kosnik <bkoz@redhat.com>

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / include / c_std / std_cwctype.h

diff --git a/libstdc++-v3/include/c_std/std_cwctype.h b/libstdc++-v3/include/c_std/std_cwctype.h
index 79cd801..86d0dfd 100644 (file)
--- a/libstdc++-v3/include/c_std/std_cwctype.h
+++ b/libstdc++-v3/include/c_std/std_cwctype.h
@@ -1,6 +1,6 @@
 // -*- C++ -*- forwarding header.
 
 // -*- C++ -*- forwarding header.
 

-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005

 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free


@@ -57,28 +57,27 @@
 #undef iswalpha
 #if _GLIBCXX_HAVE_ISWBLANK
 # undef iswblank
 #undef iswalpha
 #if _GLIBCXX_HAVE_ISWBLANK
 # undef iswblank

-#endif 
+#endif

 #undef iswcntrl
 #undef iswcntrl

+#undef iswctype

 #undef iswdigit
 #undef iswgraph
 #undef iswlower
 #undef iswprint
 #undef iswdigit
 #undef iswgraph
 #undef iswlower
 #undef iswprint

-#undef iswprint

 #undef iswpunct
 #undef iswspace
 #undef iswupper
 #undef iswxdigit
 #undef iswpunct
 #undef iswspace
 #undef iswupper
 #undef iswxdigit

-#undef iswctype  
+#undef towctrans

 #undef towlower
 #undef towupper
 #undef towlower
 #undef towupper

-#undef towctrans

 #undef wctrans
 #undef wctype
 
 #if _GLIBCXX_USE_WCHAR_T
 namespace std
 {
 #undef wctrans
 #undef wctype
 
 #if _GLIBCXX_USE_WCHAR_T
 namespace std
 {

-  using ::wint_t;        // cwchar
+  using ::wint_t;        // cwchar

 
   using ::wctype_t;
   using ::wctrans_t;
 
   using ::wctype_t;
   using ::wctrans_t;


@@ -87,24 +86,23 @@ namespace std
   using ::iswalpha;
 #if _GLIBCXX_HAVE_ISWBLANK
   using ::iswblank;
   using ::iswalpha;
 #if _GLIBCXX_HAVE_ISWBLANK
   using ::iswblank;

-#endif 
+#endif

   using ::iswcntrl;
   using ::iswcntrl;

+  using ::iswctype;

   using ::iswdigit;
   using ::iswgraph;
   using ::iswlower;
   using ::iswprint;
   using ::iswdigit;
   using ::iswgraph;
   using ::iswlower;
   using ::iswprint;

-  using ::iswprint;

   using ::iswpunct;
   using ::iswspace;
   using ::iswupper;
   using ::iswxdigit;
   using ::iswpunct;
   using ::iswspace;
   using ::iswupper;
   using ::iswxdigit;

-  using ::iswctype;
+  using ::towctrans;

   using ::towlower;
   using ::towupper;
   using ::towlower;
   using ::towupper;

-  using ::towctrans;

   using ::wctrans;
   using ::wctype;
 }
 #endif //_GLIBCXX_USE_WCHAR_T
 
   using ::wctrans;
   using ::wctype;
 }
 #endif //_GLIBCXX_USE_WCHAR_T
 

-#endif 
+#endif