*** empty log message ***

From-SVN: r70235

* empty log message *
From-SVN: r70235
5a9ed693 · Doug Gregor · Doug Gregor · 7d73a2ba · 5a9ed693 · 5a9ed693
Commit 5a9ed693 authored Aug 07, 2003 by Doug Gregor Committed by Doug Gregor Aug 07, 2003
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletions

libstdc++-v3/ChangeLog
+5 -0

libstdc++-v3/include/bits/char_traits.h
+1 -1

No files found.
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
+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

--- 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>