From c09b7217f621ab50428d657429e8da8b4eb333d4 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 25 Sep 2008 16:50:48 +0000 Subject: [PATCH] don't test for both stream.fail() and stream.bad() as the latter implies the former; also use operator!() instead of fail() to make it more clear what's going on git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55876 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/docview.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/docview.cpp b/src/common/docview.cpp index e308d867c0..a4e3f5df60 100644 --- a/src/common/docview.cpp +++ b/src/common/docview.cpp @@ -582,10 +582,10 @@ bool wxDocument::DoSaveDocument(const wxString& file) { #if wxUSE_STD_IOSTREAM wxSTD ofstream store(file.mb_str(), wxSTD ios::binary); - if (store.fail() || store.bad()) + if ( !store ) #else wxFileOutputStream store(file); - if (store.GetLastError() != wxSTREAM_NO_ERROR) + if ( store.GetLastError() != wxSTREAM_NO_ERROR ) #endif { wxLogError(_("File \"%s\" could not be opened for writing."), file); @@ -605,7 +605,7 @@ bool wxDocument::DoOpenDocument(const wxString& file) { #if wxUSE_STD_IOSTREAM wxSTD ifstream store(file.mb_str(), wxSTD ios::binary); - if ( store.fail() || store.bad() ) + if ( !store ) #else wxFileInputStream store(file); if (store.GetLastError() != wxSTREAM_NO_ERROR) @@ -617,7 +617,7 @@ bool wxDocument::DoOpenDocument(const wxString& file) #if wxUSE_STD_IOSTREAM LoadObject(store); - if ( store.fail() || store.bad() ) + if ( !store ) #else int res = LoadObject(store).GetLastError(); if ( res != wxSTREAM_NO_ERROR && res != wxSTREAM_EOF ) -- 2.45.2