diff options
author | bunnei <bunneidev@gmail.com> | 2018-08-08 21:28:34 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-08 21:28:34 +0200 |
commit | d224eb7c39c43754929972d07998db79ba093279 (patch) | |
tree | 4059c27a33d3595cfc37f6316a4e29290221e3d3 /src/common/file_util.h | |
parent | Merge pull request #850 from DarkLordZach/icon-meta (diff) | |
parent | common: Convert type traits templates over to variable template versions where applicable (diff) | |
download | yuzu-d224eb7c39c43754929972d07998db79ba093279.tar yuzu-d224eb7c39c43754929972d07998db79ba093279.tar.gz yuzu-d224eb7c39c43754929972d07998db79ba093279.tar.bz2 yuzu-d224eb7c39c43754929972d07998db79ba093279.tar.lz yuzu-d224eb7c39c43754929972d07998db79ba093279.tar.xz yuzu-d224eb7c39c43754929972d07998db79ba093279.tar.zst yuzu-d224eb7c39c43754929972d07998db79ba093279.zip |
Diffstat (limited to '')
-rw-r--r-- | src/common/file_util.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/common/file_util.h b/src/common/file_util.h index 430dac41c..d0987fb57 100644 --- a/src/common/file_util.h +++ b/src/common/file_util.h @@ -208,7 +208,7 @@ public: template <typename T> size_t ReadArray(T* data, size_t length) const { - static_assert(std::is_trivially_copyable<T>(), + static_assert(std::is_trivially_copyable_v<T>, "Given array does not consist of trivially copyable objects"); if (!IsOpen()) { @@ -220,7 +220,7 @@ public: template <typename T> size_t WriteArray(const T* data, size_t length) { - static_assert(std::is_trivially_copyable<T>(), + static_assert(std::is_trivially_copyable_v<T>, "Given array does not consist of trivially copyable objects"); if (!IsOpen()) { return std::numeric_limits<size_t>::max(); @@ -231,19 +231,19 @@ public: template <typename T> size_t ReadBytes(T* data, size_t length) const { - static_assert(std::is_trivially_copyable<T>(), "T must be trivially copyable"); + static_assert(std::is_trivially_copyable_v<T>, "T must be trivially copyable"); return ReadArray(reinterpret_cast<char*>(data), 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"); + static_assert(std::is_trivially_copyable_v<T>, "T must be trivially copyable"); return WriteArray(reinterpret_cast<const char*>(data), length); } template <typename T> size_t WriteObject(const T& object) { - static_assert(!std::is_pointer<T>::value, "Given object is a pointer"); + static_assert(!std::is_pointer_v<T>, "WriteObject arguments must not be a pointer"); return WriteArray(&object, 1); } |