From 68fd225b91446d0eba0c362f70ec56163ef6b28c Mon Sep 17 00:00:00 2001
From: ilor <kailoran@gmail.com>
Date: Thu, 5 May 2011 15:01:50 +0200
Subject: [PATCH] check !istream::good() instead of istream::bad() (not
equivalent)
---
libcorpus2/io/cclreader.cpp | 2 +-
libcorpus2/io/fastxces.cpp | 2 +-
libcorpus2/io/rft.cpp | 2 +-
libcorpus2/io/xcesreader.cpp | 3 +--
4 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/libcorpus2/io/cclreader.cpp b/libcorpus2/io/cclreader.cpp
index eadd580..4559ed8 100644
--- a/libcorpus2/io/cclreader.cpp
+++ b/libcorpus2/io/cclreader.cpp
@@ -82,7 +82,7 @@ CclReader::CclReader(const Tagset& tagset, const std::string& filename, bool dis
{
this->is_owned_.reset(new std::ifstream(filename.c_str(), std::ifstream::in));
- if (this->is_owned_->bad()) {
+ if (!this->is_owned_->good()) {
throw Corpus2Error("File not found!");
}
else {
diff --git a/libcorpus2/io/fastxces.cpp b/libcorpus2/io/fastxces.cpp
index a4813bb..6eaedaf 100644
--- a/libcorpus2/io/fastxces.cpp
+++ b/libcorpus2/io/fastxces.cpp
@@ -175,7 +175,7 @@ FastXcesReader::FastXcesReader(const Tagset &tagset, const std::string &filename
{
this->is_owned_.reset(new std::ifstream(filename.c_str(), std::ifstream::in));
- if (this->is_owned_->bad()) {
+ if (!this->is_owned_->good()) {
throw Corpus2Error("File not found!");
}
else {
diff --git a/libcorpus2/io/rft.cpp b/libcorpus2/io/rft.cpp
index 73003a6..ead4021 100644
--- a/libcorpus2/io/rft.cpp
+++ b/libcorpus2/io/rft.cpp
@@ -116,7 +116,7 @@ RftReader::RftReader(const Tagset& tagset, const std::string& filename, bool dis
, mbt_dialect_(mbt_dialect)
{
is_owned_.reset(new std::ifstream(filename.c_str(), std::ifstream::in));
- if (this->is_owned_->bad()) {
+ if (!this->is_owned_->good()) {
throw Corpus2Error("File not found!");
}
else {
diff --git a/libcorpus2/io/xcesreader.cpp b/libcorpus2/io/xcesreader.cpp
index bf14d9d..6db3428 100644
--- a/libcorpus2/io/xcesreader.cpp
+++ b/libcorpus2/io/xcesreader.cpp
@@ -52,8 +52,7 @@ XcesReader::XcesReader(const Tagset& tagset, const std::string& filename, bool d
impl_(new XcesReaderImpl(*this, chunk_buf_, disamb_only, disamb_sh))
{
this->is_owned_.reset(new std::ifstream(filename.c_str(), std::ifstream::in));
-
- if (this->is_owned_->bad()) {
+ if (!this->is_owned_->good()) {
throw Corpus2Error("File not found!");
}
else {
--
GitLab