diff options
| author | bunnei <bunneidev@gmail.com> | 2016-04-23 16:57:13 +0200 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2016-04-23 16:57:13 +0200 |
| commit | 4c9ed98084e50d093399db03bada1906d06cd765 (patch) | |
| tree | 66f79b7d5ebc0f0c99190350faa6a028d2fd7897 /src | |
| parent | Merge pull request #1697 from tfarley/hw-lighting-sync (diff) | |
| parent | Protect use of std::is_trivially_copyable to compile with GCC 4.9 (diff) | |
| download | yuzu-4c9ed98084e50d093399db03bada1906d06cd765.tar yuzu-4c9ed98084e50d093399db03bada1906d06cd765.tar.gz yuzu-4c9ed98084e50d093399db03bada1906d06cd765.tar.bz2 yuzu-4c9ed98084e50d093399db03bada1906d06cd765.tar.lz yuzu-4c9ed98084e50d093399db03bada1906d06cd765.tar.xz yuzu-4c9ed98084e50d093399db03bada1906d06cd765.tar.zst yuzu-4c9ed98084e50d093399db03bada1906d06cd765.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/file_util.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/common/file_util.h b/src/common/file_util.h index b54a9fb72..3aac4fa46 100644 --- a/src/common/file_util.h +++ b/src/common/file_util.h @@ -192,7 +192,9 @@ public: size_t ReadArray(T* data, size_t length) { static_assert(std::is_standard_layout<T>(), "Given array does not consist of standard layout objects"); +#if (__GNUC__ >= 5) || defined(__clang__) || defined(_MSC_VER) static_assert(std::is_trivially_copyable<T>(), "Given array does not consist of trivially copyable objects"); +#endif if (!IsOpen()) { m_good = false; @@ -210,7 +212,9 @@ public: size_t WriteArray(const T* data, size_t length) { static_assert(std::is_standard_layout<T>(), "Given array does not consist of standard layout objects"); +#if (__GNUC__ >= 5) || defined(__clang__) || defined(_MSC_VER) static_assert(std::is_trivially_copyable<T>(), "Given array does not consist of trivially copyable objects"); +#endif if (!IsOpen()) { m_good = false; |