Revert r290750 - Fix PR19460 - std::ios is convertible to int.
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@290752 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/ios b/include/ios
index dfeb1f6..cbea478 100644
--- a/include/ios
+++ b/include/ios
@@ -585,22 +585,9 @@
typedef typename traits_type::pos_type pos_type;
typedef typename traits_type::off_type off_type;
-#if defined(_LIBCPP_CXX03_LANG)
-private:
- struct __bool_tag {};
- typedef void (basic_ios::*_BoolType)(__bool_tag) const;
- void __true_value(__bool_tag) const {}
-
-public:
_LIBCPP_ALWAYS_INLINE
- operator _BoolType() const {
- return !fail() ? &basic_ios::__true_value : nullptr;
- }
-#else
- _LIBCPP_ALWAYS_INLINE
- _LIBCPP_EXPLICIT operator bool() const {return !fail();}
-#endif
-
+ _LIBCPP_EXPLICIT
+ operator bool() const {return !fail();}
_LIBCPP_ALWAYS_INLINE bool operator!() const {return fail();}
_LIBCPP_ALWAYS_INLINE iostate rdstate() const {return ios_base::rdstate();}
_LIBCPP_ALWAYS_INLINE void clear(iostate __state = goodbit) {ios_base::clear(__state);}
diff --git a/test/std/input.output/iostreams.base/ios/iostate.flags/bool.pass.cpp b/test/std/input.output/iostreams.base/ios/iostate.flags/bool.pass.cpp
index 4e3faa2..0de889e 100644
--- a/test/std/input.output/iostreams.base/ios/iostate.flags/bool.pass.cpp
+++ b/test/std/input.output/iostreams.base/ios/iostate.flags/bool.pass.cpp
@@ -14,21 +14,12 @@
// operator unspecified-bool-type() const;
#include <ios>
-#include <type_traits>
#include <cassert>
-#include "test_macros.h"
-
int main()
{
std::ios ios(0);
assert(static_cast<bool>(ios) == !ios.fail());
ios.setstate(std::ios::failbit);
assert(static_cast<bool>(ios) == !ios.fail());
- static_assert((!std::is_convertible<std::ios, void*>::value), "");
- static_assert((!std::is_convertible<std::ios, int>::value), "");
- static_assert((!std::is_convertible<std::ios const&, int>::value), "");
-#if TEST_STD_VER >= 11
- static_assert((!std::is_convertible<std::ios, bool>::value), "");
-#endif
}
