From 5a9ed69383021b1af803d3cc162174b5af4832af Mon Sep 17 00:00:00 2001
From: Doug Gregor <dgregor@apple.com>
Date: Thu, 7 Aug 2003 23:01:26 +0000
Subject: [PATCH] *** empty log message ***

From-SVN: r70235
---
 libstdc++-v3/ChangeLog                  | 5 +++++
 libstdc++-v3/include/bits/char_traits.h | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index bae9e3dc3af..282ac010a76 100644
--- 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 424fd08c730..ba0499f12da 100644
--- 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>
-- 
2.30.2