diff options
| author | Doug Gregor <dgregor@apple.com> | 2003-08-07 23:01:26 +0000 |
|---|---|---|
| committer | Doug Gregor <dgregor@gcc.gnu.org> | 2003-08-07 23:01:26 +0000 |
| commit | 5a9ed69383021b1af803d3cc162174b5af4832af (patch) | |
| tree | d34533ab965ff79d62f80cd9c06edd55a763e1e4 | |
| parent | 7d73a2bae9ca5a839059e88058686d36c8b094a7 (diff) | |
| download | gcc-5a9ed69383021b1af803d3cc162174b5af4832af.zip gcc-5a9ed69383021b1af803d3cc162174b5af4832af.tar.gz gcc-5a9ed69383021b1af803d3cc162174b5af4832af.tar.bz2 | |
*** empty log message ***
From-SVN: r70235
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/char_traits.h | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index bae9e3d..282ac01 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 424fd08..ba0499f 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> |