Commit 23e4c4ee by Paolo Carlini Committed by Paolo Carlini

streambuf_iterator.h: Use noexcept per the FDIS.

2011-05-23  Paolo Carlini  <paolo.carlini@oracle.com>

	* include/bits/streambuf_iterator.h: Use noexcept per the FDIS.
	(istreambuf_iterator<>::istreambuf_iterator(const
	istreambuf_iterator&),  ~istreambuf_iterator()): Add defaulted
	in C++0x mode.

From-SVN: r174094
parent 8e3fb544
2011-05-23 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/streambuf_iterator.h: Use noexcept per the FDIS.
(istreambuf_iterator<>::istreambuf_iterator(const
istreambuf_iterator&), ~istreambuf_iterator()): Add defaulted
in C++0x mode.
2011-05-23 Jason Merrill <jason@redhat.com> 2011-05-23 Jason Merrill <jason@redhat.com>
* libsupc++/exception_ptr.h: Fix compilation in C++0x mode. * libsupc++/exception_ptr.h: Fix compilation in C++0x mode.
......
...@@ -95,15 +95,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -95,15 +95,21 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
public: public:
/// Construct end of input stream iterator. /// Construct end of input stream iterator.
_GLIBCXX_CONSTEXPR istreambuf_iterator() throw() _GLIBCXX_CONSTEXPR istreambuf_iterator() _GLIBCXX_USE_NOEXCEPT
: _M_sbuf(0), _M_c(traits_type::eof()) { } : _M_sbuf(0), _M_c(traits_type::eof()) { }
#ifdef __GXX_EXPERIMENTAL_CXX0X__
istreambuf_iterator(const istreambuf_iterator&) noexcept = default;
~istreambuf_iterator() = default;
#endif
/// Construct start of input stream iterator. /// Construct start of input stream iterator.
istreambuf_iterator(istream_type& __s) throw() istreambuf_iterator(istream_type& __s) _GLIBCXX_USE_NOEXCEPT
: _M_sbuf(__s.rdbuf()), _M_c(traits_type::eof()) { } : _M_sbuf(__s.rdbuf()), _M_c(traits_type::eof()) { }
/// Construct start of streambuf iterator. /// Construct start of streambuf iterator.
istreambuf_iterator(streambuf_type* __s) throw() istreambuf_iterator(streambuf_type* __s) _GLIBCXX_USE_NOEXCEPT
: _M_sbuf(__s), _M_c(traits_type::eof()) { } : _M_sbuf(__s), _M_c(traits_type::eof()) { }
/// Return the current character pointed to by iterator. This returns /// Return the current character pointed to by iterator. This returns
...@@ -228,11 +234,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -228,11 +234,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
public: public:
/// Construct output iterator from ostream. /// Construct output iterator from ostream.
ostreambuf_iterator(ostream_type& __s) throw () ostreambuf_iterator(ostream_type& __s) _GLIBCXX_USE_NOEXCEPT
: _M_sbuf(__s.rdbuf()), _M_failed(!_M_sbuf) { } : _M_sbuf(__s.rdbuf()), _M_failed(!_M_sbuf) { }
/// Construct output iterator from streambuf. /// Construct output iterator from streambuf.
ostreambuf_iterator(streambuf_type* __s) throw () ostreambuf_iterator(streambuf_type* __s) _GLIBCXX_USE_NOEXCEPT
: _M_sbuf(__s), _M_failed(!_M_sbuf) { } : _M_sbuf(__s), _M_failed(!_M_sbuf) { }
/// Write character to streambuf. Calls streambuf.sputc(). /// Write character to streambuf. Calls streambuf.sputc().
...@@ -262,7 +268,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -262,7 +268,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/// Return true if previous operator=() failed. /// Return true if previous operator=() failed.
bool bool
failed() const throw() failed() const _GLIBCXX_USE_NOEXCEPT
{ return _M_failed; } { return _M_failed; }
ostreambuf_iterator& ostreambuf_iterator&
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment