diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/basic_string.h | 14 |
2 files changed, 10 insertions, 8 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index c808738..1e51963 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,7 @@ +2013-05-15 Jonathan Wakely <jwakely.gcc@gmail.com> + + * include/bits/basic_string.h (getline): Fix doxygen comments. + 2013-05-14 Paolo Carlini <paolo.carlini@oracle.com> * include/bits/stl_iterator.h (__normal_iterator<>::_M_const_cast): diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h index aa188f5..23bd9b9 100644 --- a/libstdc++-v3/include/bits/basic_string.h +++ b/libstdc++-v3/include/bits/basic_string.h @@ -2767,10 +2767,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * * Stores characters from @a __is into @a __str until @a __delim is * found, the end of the stream is encountered, or str.max_size() - * is reached. If is.width() is non-zero, that is the limit on the - * number of characters stored into @a __str. Any previous - * contents of @a __str are erased. If @a __delim was encountered, - * it is extracted but not stored into @a __str. + * is reached. Any previous contents of @a __str are erased. If + * @a __delim is encountered, it is extracted but not stored into + * @a __str. */ template<typename _CharT, typename _Traits, typename _Alloc> basic_istream<_CharT, _Traits>& @@ -2785,10 +2784,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * * Stores characters from is into @a __str until '\n' is * found, the end of the stream is encountered, or str.max_size() - * is reached. If __is.width() is non-zero, that is the limit on - * the number of characters stored into @a __str. Any previous - * contents of @a __str are erased. If end of line was - * encountered, it is extracted but not stored into @a __str. + * is reached. Any previous contents of @a __str are erased. If + * end of line is encountered, it is extracted but not stored into + * @a __str. */ template<typename _CharT, typename _Traits, typename _Alloc> inline basic_istream<_CharT, _Traits>& |