summaryrefslogtreecommitdiffstats
path: root/src/common
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2016-04-14 01:48:03 +0200
committerLioncash <mathew1800@gmail.com>2016-04-14 02:17:24 +0200
commit5f51622e9de0483519f47c749888fe7d5b120c79 (patch)
tree69ccb0da7b4176b24bcc576c13ed1e58caadf885 /src/common
parentfile_util: const qualify IOFile's Tell and GetSize functions (diff)
downloadyuzu-5f51622e9de0483519f47c749888fe7d5b120c79.tar
yuzu-5f51622e9de0483519f47c749888fe7d5b120c79.tar.gz
yuzu-5f51622e9de0483519f47c749888fe7d5b120c79.tar.bz2
yuzu-5f51622e9de0483519f47c749888fe7d5b120c79.tar.lz
yuzu-5f51622e9de0483519f47c749888fe7d5b120c79.tar.xz
yuzu-5f51622e9de0483519f47c749888fe7d5b120c79.tar.zst
yuzu-5f51622e9de0483519f47c749888fe7d5b120c79.zip
Diffstat (limited to 'src/common')
-rw-r--r--src/common/file_util.cpp6
-rw-r--r--src/common/file_util.h4
2 files changed, 4 insertions, 6 deletions
diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp
index 7d96d04d9..53700c865 100644
--- a/src/common/file_util.cpp
+++ b/src/common/file_util.cpp
@@ -876,11 +876,10 @@ void SplitFilename83(const std::string& filename, std::array<char, 9>& short_nam
}
IOFile::IOFile()
- : m_file(nullptr), m_good(true)
-{}
+{
+}
IOFile::IOFile(const std::string& filename, const char openmode[])
- : m_file(nullptr), m_good(true)
{
Open(filename, openmode);
}
@@ -891,7 +890,6 @@ IOFile::~IOFile()
}
IOFile::IOFile(IOFile&& other)
- : m_file(nullptr), m_good(true)
{
Swap(other);
}
diff --git a/src/common/file_util.h b/src/common/file_util.h
index d520130ce..b54a9fb72 100644
--- a/src/common/file_util.h
+++ b/src/common/file_util.h
@@ -256,8 +256,8 @@ public:
void Clear() { m_good = true; std::clearerr(m_file); }
private:
- std::FILE* m_file;
- bool m_good;
+ std::FILE* m_file = nullptr;
+ bool m_good = true;
};
} // namespace