diff options
author | bunnei <bunneidev@gmail.com> | 2018-04-30 03:47:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-30 03:47:28 +0200 |
commit | b3962e7d1e585f33461f1a0f11c825cf261f6c7d (patch) | |
tree | 5396d4f28614f5b346a21776935597ec466f117f /src | |
parent | Merge pull request #421 from Subv/sh_pred3 (diff) | |
parent | file_util: Make move constructor/assignment operator and related functions noexcept (diff) | |
download | yuzu-b3962e7d1e585f33461f1a0f11c825cf261f6c7d.tar yuzu-b3962e7d1e585f33461f1a0f11c825cf261f6c7d.tar.gz yuzu-b3962e7d1e585f33461f1a0f11c825cf261f6c7d.tar.bz2 yuzu-b3962e7d1e585f33461f1a0f11c825cf261f6c7d.tar.lz yuzu-b3962e7d1e585f33461f1a0f11c825cf261f6c7d.tar.xz yuzu-b3962e7d1e585f33461f1a0f11c825cf261f6c7d.tar.zst yuzu-b3962e7d1e585f33461f1a0f11c825cf261f6c7d.zip |
Diffstat (limited to '')
-rw-r--r-- | src/common/file_util.cpp | 6 | ||||
-rw-r--r-- | src/common/file_util.h | 14 |
2 files changed, 12 insertions, 8 deletions
diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp index cd852bfd8..2d0b81c6e 100644 --- a/src/common/file_util.cpp +++ b/src/common/file_util.cpp @@ -809,16 +809,16 @@ IOFile::~IOFile() { Close(); } -IOFile::IOFile(IOFile&& other) { +IOFile::IOFile(IOFile&& other) noexcept { Swap(other); } -IOFile& IOFile::operator=(IOFile&& other) { +IOFile& IOFile::operator=(IOFile&& other) noexcept { Swap(other); return *this; } -void IOFile::Swap(IOFile& other) { +void IOFile::Swap(IOFile& other) noexcept { std::swap(m_file, other.m_file); std::swap(m_good, other.m_good); } diff --git a/src/common/file_util.h b/src/common/file_util.h index 4c11849ee..fc6b3ea46 100644 --- a/src/common/file_util.h +++ b/src/common/file_util.h @@ -160,10 +160,10 @@ public: ~IOFile(); - IOFile(IOFile&& other); - IOFile& operator=(IOFile&& other); + IOFile(IOFile&& other) noexcept; + IOFile& operator=(IOFile&& other) noexcept; - void Swap(IOFile& other); + void Swap(IOFile& other) noexcept; bool Open(const std::string& filename, const char openmode[]); bool Close(); @@ -202,11 +202,15 @@ public: return items_written; } - size_t ReadBytes(void* data, size_t length) { + template <typename T> + size_t ReadBytes(T* data, size_t length) { + static_assert(std::is_trivially_copyable<T>(), "T must be trivially copyable"); return ReadArray(reinterpret_cast<char*>(data), length); } - size_t WriteBytes(const void* data, size_t length) { + template <typename T> + size_t WriteBytes(const T* data, size_t length) { + static_assert(std::is_trivially_copyable<T>(), "T must be trivially copyable"); return WriteArray(reinterpret_cast<const char*>(data), length); } |