*** empty log message ***

From-SVN: r70235

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index bae9e3dc3afe1dc57a8ee213f2c955d70c6cc21a..282ac010a76f9e8ca86b3a9ba89d85a787187bf6 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-07  Doug Gregor  <dgregor@apple.com>
+
+       * include/bits/char_traits.h (char_traits::not_eof): Match operand 
+        types in ? :.
+
 2003-08-07  Bernardo Innocenti  <bernie@develer.com>
 
        PR libstdc++/11784

diff --git a/libstdc++-v3/include/bits/char_traits.h b/libstdc++-v3/include/bits/char_traits.h
index 424fd08c730277304014a54eface56b63496faec..ba0499f12daa804b164cd2ba744eaf7f150088ea 100644 (file)
--- a/libstdc++-v3/include/bits/char_traits.h
+++ b/libstdc++-v3/include/bits/char_traits.h
@@ -140,7 +140,7 @@ namespace __gnu_cxx
 
       static int_type 
       not_eof(const int_type& __c)
-      { return !eq_int_type(__c, eof()) ? __c : char_type(); }
+      { return !eq_int_type(__c, eof()) ? __c : to_int_type(char_type()); }
     };
 
   template<typename _CharT>