oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

fs/io/FileReader: add "noexcept"

Browse Source
This commit is contained in:
Max Kellermann 2018-08-21 18:24:30 +02:00
parent 21d621e7ad
commit 5ca0b7a28f
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/fs/io/FileReader.cxx
View File

@ -78,7 +78,7 @@ FileReader::Skip(off_t offset)
} }
void void
FileReader::Close() FileReader::Close() noexcept
{ {
assert(IsDefined()); assert(IsDefined());
@ -144,7 +144,7 @@ FileReader::Skip(off_t offset)
} }
void void
FileReader::Close() FileReader::Close() noexcept
{ {
assert(IsDefined()); assert(IsDefined());

12
src/fs/io/FileReader.hxx
View File

@ -47,27 +47,27 @@ public:
explicit FileReader(Path _path); explicit FileReader(Path _path);
#ifdef _WIN32 #ifdef _WIN32
FileReader(FileReader &&other) FileReader(FileReader &&other) noexcept
:path(std::move(other.path)), :path(std::move(other.path)),
handle(other.handle) { handle(other.handle) {
other.handle = INVALID_HANDLE_VALUE; other.handle = INVALID_HANDLE_VALUE;
} }
#else #else
FileReader(FileReader &&other) FileReader(FileReader &&other) noexcept
:path(std::move(other.path)), :path(std::move(other.path)),
fd(other.fd) { fd(other.fd) {
other.fd.SetUndefined(); other.fd.SetUndefined();
} }
#endif #endif
~FileReader() { ~FileReader() noexcept {
if (IsDefined()) if (IsDefined())
Close(); Close();
} }
protected: protected:
bool IsDefined() const { bool IsDefined() const noexcept {
#ifdef _WIN32 #ifdef _WIN32
return handle != INVALID_HANDLE_VALUE; return handle != INVALID_HANDLE_VALUE;
#else #else
@ -77,12 +77,12 @@ protected:
public: public:
#ifndef _WIN32 #ifndef _WIN32
FileDescriptor GetFD() const { FileDescriptor GetFD() const noexcept {
return fd; return fd;
} }
#endif #endif
void Close(); void Close() noexcept;
FileInfo GetFileInfo() const; FileInfo GetFileInfo() const;