*** empty log message ***

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

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index bae9e3d..282ac01 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 424fd08..ba0499f 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>