diff options
| author | hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-07-17 13:17:45 +0000 |
|---|---|---|
| committer | hjl <hjl@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-07-17 13:17:45 +0000 |
| commit | b2e65bdad05f60007bfc89d0c1ef3a0ad0ac29ba (patch) | |
| tree | 3850da8afaf791a5517a8db424079c92db6f2ecc /libstdc++-v3/src | |
| parent | c371ebb0ba5e8f03691653e2479bfb9fa2c33e37 (diff) | |
| download | gcc-b2e65bdad05f60007bfc89d0c1ef3a0ad0ac29ba.tar.gz | |
Merged r149586 through r149745 into branch.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/ifunc@149747 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/src')
| -rw-r--r-- | libstdc++-v3/src/compatibility.cc | 4 | ||||
| -rw-r--r-- | libstdc++-v3/src/istream.cc | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/libstdc++-v3/src/compatibility.cc b/libstdc++-v3/src/compatibility.cc index 6b3c19b31e4..73432681ecf 100644 --- a/libstdc++-v3/src/compatibility.cc +++ b/libstdc++-v3/src/compatibility.cc @@ -64,7 +64,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) sentry __cerb(*this, true); if (__cerb && __n > 0) { - ios_base::iostate __err = ios_base::iostate(ios_base::goodbit); + ios_base::iostate __err = ios_base::goodbit; __try { const int_type __eof = traits_type::eof(); @@ -136,7 +136,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) sentry __cerb(*this, true); if (__cerb && __n > 0) { - ios_base::iostate __err = ios_base::iostate(ios_base::goodbit); + ios_base::iostate __err = ios_base::goodbit; __try { const int_type __eof = traits_type::eof(); diff --git a/libstdc++-v3/src/istream.cc b/libstdc++-v3/src/istream.cc index 6b06df2594d..7b7f0bf9278 100644 --- a/libstdc++-v3/src/istream.cc +++ b/libstdc++-v3/src/istream.cc @@ -37,7 +37,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) getline(char_type* __s, streamsize __n, char_type __delim) { _M_gcount = 0; - ios_base::iostate __err = ios_base::iostate(ios_base::goodbit); + ios_base::iostate __err = ios_base::goodbit; sentry __cerb(*this, true); if (__cerb) { @@ -118,7 +118,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) sentry __cerb(*this, true); if (__cerb && __n > 0) { - ios_base::iostate __err = ios_base::iostate(ios_base::goodbit); + ios_base::iostate __err = ios_base::goodbit; __try { const char_type __cdelim = traits_type::to_char_type(__delim); @@ -203,7 +203,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) typedef __istream_type::__ctype_type __ctype_type; streamsize __extracted = 0; - ios_base::iostate __err = ios_base::iostate(ios_base::goodbit); + ios_base::iostate __err = ios_base::goodbit; __istream_type::sentry __cerb(__in, false); if (__cerb) { @@ -286,7 +286,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) typedef __string_type::size_type __size_type; __size_type __extracted = 0; - ios_base::iostate __err = ios_base::iostate(ios_base::goodbit); + ios_base::iostate __err = ios_base::goodbit; __istream_type::sentry __cerb(__in, false); if (__cerb) { @@ -368,7 +368,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) __size_type __extracted = 0; const __size_type __n = __str.max_size(); - ios_base::iostate __err = ios_base::iostate(ios_base::goodbit); + ios_base::iostate __err = ios_base::goodbit; __istream_type::sentry __cerb(__in, true); if (__cerb) { @@ -444,7 +444,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) getline(char_type* __s, streamsize __n, char_type __delim) { _M_gcount = 0; - ios_base::iostate __err = ios_base::iostate(ios_base::goodbit); + ios_base::iostate __err = ios_base::goodbit; sentry __cerb(*this, true); if (__cerb) { @@ -525,7 +525,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) sentry __cerb(*this, true); if (__cerb && __n > 0) { - ios_base::iostate __err = ios_base::iostate(ios_base::goodbit); + ios_base::iostate __err = ios_base::goodbit; __try { const char_type __cdelim = traits_type::to_char_type(__delim); @@ -614,7 +614,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) __size_type __extracted = 0; const __size_type __n = __str.max_size(); - ios_base::iostate __err = ios_base::iostate(ios_base::goodbit); + ios_base::iostate __err = ios_base::goodbit; __istream_type::sentry __cerb(__in, true); if (__cerb) { |