From a96ae95b708ffd50cb89a386c5962c948dcc708b Mon Sep 17 00:00:00 2001 From: bkoz Date: Thu, 21 May 2009 01:12:00 +0000 Subject: 2009-05-20 Benjamin Kosnik * 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 --- libstdc++-v3/include/std/ostream | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'libstdc++-v3/include/std/ostream') diff --git a/libstdc++-v3/include/std/ostream b/libstdc++-v3/include/std/ostream index c49b36fc77f..b9ea4a8ce19 100644 --- a/libstdc++-v3/include/std/ostream +++ b/libstdc++-v3/include/std/ostream @@ -376,7 +376,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std) template class basic_ostream<_CharT, _Traits>::sentry { - // Data Members: + // Data Members. bool _M_ok; basic_ostream<_CharT, _Traits>& _M_os; @@ -420,6 +420,9 @@ _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; } }; -- cgit v1.2.1