diff options
author | Jakub Jelinek <jakub@redhat.com> | 2018-07-12 16:50:41 +0000 |
---|---|---|
committer | Jakub Jelinek <jakub@redhat.com> | 2018-07-12 16:50:41 +0000 |
commit | 1ed159550621e4b1cf35ab868e0a7d51e2837724 (patch) | |
tree | 9bad8e165e1df1b26197b4700f9f51566152a405 /libstdc++-v3/testsuite/27_io/basic_istream/sentry/wchar_t/12297.cc | |
parent | c1e7aa1d88a3110f71b740fc8ea11f3274cae433 (diff) | |
parent | f7d3a6a6300a4c330afca4d8772ac80ab09ac21c (diff) |
svn merge -r258208:262569 svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-7-branchredhat/gcc-7-branch
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/redhat/gcc-7-branch@262599 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/testsuite/27_io/basic_istream/sentry/wchar_t/12297.cc')
-rw-r--r-- | libstdc++-v3/testsuite/27_io/basic_istream/sentry/wchar_t/12297.cc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/libstdc++-v3/testsuite/27_io/basic_istream/sentry/wchar_t/12297.cc b/libstdc++-v3/testsuite/27_io/basic_istream/sentry/wchar_t/12297.cc index e72fe1a03a0..6e572cc653d 100644 --- a/libstdc++-v3/testsuite/27_io/basic_istream/sentry/wchar_t/12297.cc +++ b/libstdc++-v3/testsuite/27_io/basic_istream/sentry/wchar_t/12297.cc @@ -26,19 +26,12 @@ int main() wistringstream stream; stream.exceptions(ios_base::eofbit); - // The library throws the new definition of std::ios::failure -#if _GLIBCXX_USE_CXX11_ABI - typedef std::ios_base::failure exception_type; -#else - typedef std::exception exception_type; -#endif - try { wistream::sentry sentry(stream, false); VERIFY( false ); } - catch (exception_type&) + catch (std::ios_base::failure&) { VERIFY( stream.rdstate() == (ios_base::eofbit | ios_base::failbit) ); } |