diff options
| author | 2018-08-07 13:31:57 -0400 | |
|---|---|---|
| committer | 2018-08-07 19:34:47 -0400 | |
| commit | a7d6efc5201960b351fee4760663388dd946ab8e (patch) | |
| tree | aea37b49caa9b3b71a98a1266d7786ac39079e2f /src/common/file_util.h | |
| parent | Merge pull request #971 from DarkLordZach/mbedtls-2.12.0 (diff) | |
| download | yuzu-a7d6efc5201960b351fee4760663388dd946ab8e.tar.gz yuzu-a7d6efc5201960b351fee4760663388dd946ab8e.tar.xz yuzu-a7d6efc5201960b351fee4760663388dd946ab8e.zip | |
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 28697d527..7f2a5cb63 100644 --- a/src/common/file_util.h +++ b/src/common/file_util.h | |||
| @@ -207,7 +207,7 @@ public: | |||
| 207 | 207 | ||
| 208 | template <typename T> | 208 | template <typename T> |
| 209 | size_t ReadArray(T* data, size_t length) const { | 209 | size_t ReadArray(T* data, size_t length) const { |
| 210 | static_assert(std::is_trivially_copyable<T>(), | 210 | static_assert(std::is_trivially_copyable_v<T>, |
| 211 | "Given array does not consist of trivially copyable objects"); | 211 | "Given array does not consist of trivially copyable objects"); |
| 212 | 212 | ||
| 213 | if (!IsOpen()) | 213 | if (!IsOpen()) |
| @@ -218,7 +218,7 @@ public: | |||
| 218 | 218 | ||
| 219 | template <typename T> | 219 | template <typename T> |
| 220 | size_t WriteArray(const T* data, size_t length) { | 220 | size_t WriteArray(const T* data, size_t length) { |
| 221 | static_assert(std::is_trivially_copyable<T>(), | 221 | static_assert(std::is_trivially_copyable_v<T>, |
| 222 | "Given array does not consist of trivially copyable objects"); | 222 | "Given array does not consist of trivially copyable objects"); |
| 223 | if (!IsOpen()) | 223 | if (!IsOpen()) |
| 224 | return -1; | 224 | return -1; |
| @@ -227,19 +227,19 @@ public: | |||
| 227 | 227 | ||
| 228 | template <typename T> | 228 | template <typename T> |
| 229 | size_t ReadBytes(T* data, size_t length) const { | 229 | size_t ReadBytes(T* data, size_t length) const { |
| 230 | static_assert(std::is_trivially_copyable<T>(), "T must be trivially copyable"); | 230 | static_assert(std::is_trivially_copyable_v<T>, "T must be trivially copyable"); |
| 231 | return ReadArray(reinterpret_cast<char*>(data), length); | 231 | return ReadArray(reinterpret_cast<char*>(data), length); |
| 232 | } | 232 | } |
| 233 | 233 | ||
| 234 | template <typename T> | 234 | template <typename T> |
| 235 | size_t WriteBytes(const T* data, size_t length) { | 235 | size_t WriteBytes(const T* data, size_t length) { |
| 236 | static_assert(std::is_trivially_copyable<T>(), "T must be trivially copyable"); | 236 | static_assert(std::is_trivially_copyable_v<T>, "T must be trivially copyable"); |
| 237 | return WriteArray(reinterpret_cast<const char*>(data), length); | 237 | return WriteArray(reinterpret_cast<const char*>(data), length); |
| 238 | } | 238 | } |
| 239 | 239 | ||
| 240 | template <typename T> | 240 | template <typename T> |
| 241 | size_t WriteObject(const T& object) { | 241 | size_t WriteObject(const T& object) { |
| 242 | static_assert(!std::is_pointer<T>::value, "Given object is a pointer"); | 242 | static_assert(!std::is_pointer_v<T>, "WriteObject arguments must not be a pointer"); |
| 243 | return WriteArray(&object, 1); | 243 | return WriteArray(&object, 1); |
| 244 | } | 244 | } |
| 245 | 245 | ||