diff options
| author | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-05-21 01:12:00 +0000 |
|---|---|---|
| committer | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-05-21 01:12:00 +0000 |
| commit | a96ae95b708ffd50cb89a386c5962c948dcc708b (patch) | |
| tree | c56e29414015d8d362048f2600dec8925fe585b3 /libstdc++-v3/include/std/istream | |
| parent | 8750ee6ec744f0a8987ecbea7f7c6693a72e8fca (diff) | |
| download | ppe42-gcc-a96ae95b708ffd50cb89a386c5962c948dcc708b.tar.gz ppe42-gcc-a96ae95b708ffd50cb89a386c5962c948dcc708b.zip | |
2009-05-20 Benjamin Kosnik <bkoz@redhat.com>
* include/tr1_impl/functional (function): Use explicit operator bool.
* include/bits/shared_ptr.h (__shared_ptr): Same.
* include/bits/unique_ptr.h (unique_ptr): Same.
* include/std/mutex (unique_lock): Same.
* include/std/system_error (error_code): Same.
(error_condition): Same.
* include/std/ostream (sentry): Same.
* include/std/istream (sentry): Same.
* testsuite/19_diagnostics/error_condition/operators/bool.cc: Adjust.
* testsuite/19_diagnostics/error_condition/operators/bool_neg.cc: Same.
* testsuite/19_diagnostics/error_code/operators/bool.cc: Same.
* testsuite/19_diagnostics/error_code/operators/bool_neg.cc: Same.
* testsuite/20_util/unique_ptr/modifiers/reset_neg.cc: Same.
* testsuite/20_util/unique_ptr/assign/assign_neg.cc: Same.
* testsuite/20_util/shared_ptr/observers/bool_conv.cc: Same.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@147756 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/std/istream')
| -rw-r--r-- | libstdc++-v3/include/std/istream | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libstdc++-v3/include/std/istream b/libstdc++-v3/include/std/istream index 521be7fd506..1979a51327f 100644 --- a/libstdc++-v3/include/std/istream +++ b/libstdc++-v3/include/std/istream @@ -631,6 +631,9 @@ _GLIBCXX_BEGIN_NAMESPACE(std) template<typename _CharT, typename _Traits> class basic_istream<_CharT, _Traits>::sentry { + // Data Members. + bool _M_ok; + public: /// Easy access to dependant types. typedef _Traits traits_type; @@ -670,11 +673,11 @@ _GLIBCXX_BEGIN_NAMESPACE(std) * For ease of use, sentries may be converted to booleans. The * return value is that of the sentry state (true == okay). */ +#ifdef __GXX_EXPERIMENTAL_CXX0X__ + explicit +#endif operator bool() const { return _M_ok; } - - private: - bool _M_ok; }; // [27.6.1.2.3] character extraction templates |
