diff options
author | Louis Dionne <ldionne@apple.com> | 2019-04-02 22:21:27 +0000 |
---|---|---|
committer | Louis Dionne <ldionne@apple.com> | 2019-04-02 22:21:27 +0000 |
commit | 38b7e74836e314ec15c16d9106d2e2cf295e349a (patch) | |
tree | 6cbd91c5f2eb570bb694c064936b4af4e8fa3d7d /libcxx/test/std/utilities | |
parent | cc525c97b7df198095124ee1fb68219e5a9189a5 (diff) | |
download | bcm5719-llvm-38b7e74836e314ec15c16d9106d2e2cf295e349a.tar.gz bcm5719-llvm-38b7e74836e314ec15c16d9106d2e2cf295e349a.zip |
Revert "[libc++] Fix error flags and exceptions propagated from input stream operations"
This reverts commits r357533 and r357531, which broke the LLDB
data formatters. I'll hold off until we know how to fix the data
formatters accordingly.
llvm-svn: 357536
Diffstat (limited to 'libcxx/test/std/utilities')
-rw-r--r-- | libcxx/test/std/utilities/template.bitset/bitset.operators/stream_in.pass.cpp | 55 | ||||
-rw-r--r-- | libcxx/test/std/utilities/template.bitset/bitset.operators/stream_out.pass.cpp | 4 |
2 files changed, 9 insertions, 50 deletions
diff --git a/libcxx/test/std/utilities/template.bitset/bitset.operators/stream_in.pass.cpp b/libcxx/test/std/utilities/template.bitset/bitset.operators/stream_in.pass.cpp index 1cb92ea3458..9abe19c7c87 100644 --- a/libcxx/test/std/utilities/template.bitset/bitset.operators/stream_in.pass.cpp +++ b/libcxx/test/std/utilities/template.bitset/bitset.operators/stream_in.pass.cpp @@ -9,60 +9,19 @@ // test: // template <class charT, class traits, size_t N> -// basic_istream<charT, traits>& -// operator>>(basic_istream<charT, traits>& is, bitset<N>& x); +// basic_ostream<charT, traits>& +// operator<<(basic_ostream<charT, traits>& os, const bitset<N>& x); #include <bitset> #include <sstream> #include <cassert> -#include "test_macros.h" int main(int, char**) { - { - std::istringstream in("01011010"); - std::bitset<8> b; - in >> b; - assert(b.to_ulong() == 0x5A); - } -#ifndef TEST_HAS_NO_EXCEPTIONS - { - std::stringbuf sb; - std::istream is(&sb); - is.exceptions(std::ios::failbit); + std::istringstream in("01011010"); + std::bitset<8> b; + in >> b; + assert(b.to_ulong() == 0x5A); - bool threw = false; - try { - std::bitset<8> b; - is >> b; - } catch (std::ios::failure const&) { - threw = true; - } - - assert(!is.bad()); - assert(is.fail()); - assert(is.eof()); - assert(threw); - } - { - std::stringbuf sb; - std::istream is(&sb); - is.exceptions(std::ios::eofbit); - - bool threw = false; - try { - std::bitset<8> b; - is >> b; - } catch (std::ios::failure const&) { - threw = true; - } - - assert(!is.bad()); - assert(is.fail()); - assert(is.eof()); - assert(threw); - } -#endif // TEST_HAS_NO_EXCEPTIONS - - return 0; + return 0; } diff --git a/libcxx/test/std/utilities/template.bitset/bitset.operators/stream_out.pass.cpp b/libcxx/test/std/utilities/template.bitset/bitset.operators/stream_out.pass.cpp index 43c20f848bb..2c4ce1e4881 100644 --- a/libcxx/test/std/utilities/template.bitset/bitset.operators/stream_out.pass.cpp +++ b/libcxx/test/std/utilities/template.bitset/bitset.operators/stream_out.pass.cpp @@ -9,8 +9,8 @@ // test: // template <class charT, class traits, size_t N> -// basic_ostream<charT, traits>& -// operator<<(basic_ostream<charT, traits>& os, const bitset<N>& x); +// basic_istream<charT, traits>& +// operator>>(basic_istream<charT, traits>& is, bitset<N>& x); #include <bitset> #include <sstream> |