diff options
| author | Max Horn | 2009-07-29 21:39:16 +0000 |
|---|---|---|
| committer | Max Horn | 2009-07-29 21:39:16 +0000 |
| commit | eedce48aa39b424c7b93c5f5069fd1be89878bdc (patch) | |
| tree | 9bc4cf2959a1b00475d9adb716c3943caab6fb85 | |
| parent | 6df25f47c3a794eb7d10ecebc7d05cab8552dc9f (diff) | |
| download | scummvm-rg350-eedce48aa39b424c7b93c5f5069fd1be89878bdc.tar.gz scummvm-rg350-eedce48aa39b424c7b93c5f5069fd1be89878bdc.tar.bz2 scummvm-rg350-eedce48aa39b424c7b93c5f5069fd1be89878bdc.zip | |
Removed redundant File::ioFailed() implementation; also turned ReadStream::ioFailed from a virtual into an inline method
svn-id: r42911
| -rw-r--r-- | common/file.cpp | 4 | ||||
| -rw-r--r-- | common/file.h | 7 | ||||
| -rw-r--r-- | common/stream.h | 2 |
3 files changed, 1 insertions, 12 deletions
diff --git a/common/file.cpp b/common/file.cpp index 69338f32f9..dd4281bd03 100644 --- a/common/file.cpp +++ b/common/file.cpp @@ -120,10 +120,6 @@ bool File::isOpen() const { return _handle != NULL; } -bool File::ioFailed() const { - return !_handle || (eos() || err()); -} - bool File::err() const { assert(_handle); return _handle->err(); diff --git a/common/file.h b/common/file.h index 892395a184..6ac633c462 100644 --- a/common/file.h +++ b/common/file.h @@ -126,13 +126,6 @@ public: */ const char *getName() const { return _name.c_str(); } - /** - * DEPRECATED: Use err() or eos() instead. - * Returns true if any I/O failure occurred or the end of the - * stream was reached while reading. - */ - bool ioFailed() const; - bool err() const; // implement abstract Stream method void clearErr(); // implement abstract Stream method bool eos() const; // implement abstract SeekableReadStream method diff --git a/common/stream.h b/common/stream.h index 80e2978fb9..9b03c20bd2 100644 --- a/common/stream.h +++ b/common/stream.h @@ -179,7 +179,7 @@ public: * DEPRECATED * Default implementation for backward compatibility */ - virtual bool ioFailed() { return (eos() || err()); } + inline bool ioFailed() { return (eos() || err()); } /** * Read an unsigned byte from the stream and return it. |