diff options
| author | Lioncash <mathew1800@gmail.com> | 2018-08-07 13:31:57 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2018-08-07 19:34:47 -0400 |
| commit | a7d6efc5201960b351fee4760663388dd946ab8e (patch) | |
| tree | aea37b49caa9b3b71a98a1266d7786ac39079e2f /src/common/file_util.h | |
| parent | 825e8cb9252cdffd3f150ef667ecb95655ab0696 (diff) | |
common: Convert type traits templates over to variable template versions where applicable
Uses the C++17 inline variable variants
Diffstat (limited to 'src/common/file_util.h')
| -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 28697d527c..7f2a5cb639 100644 --- a/src/common/file_util.h +++ b/src/common/file_util.h @@ -207,7 +207,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()) @@ -218,7 +218,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 -1; @@ -227,19 +227,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); } |