From 9572652ddce1ff51f48829d787ebe33272c6aff6 Mon Sep 17 00:00:00 2001 From: LittleWhite Date: Sat, 23 Apr 2016 15:45:35 +0200 Subject: Protect use of std::is_trivially_copyable to compile with GCC 4.9 --- src/common/file_util.h | 4 ++++ 1 file changed, 4 insertions(+) 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(), "Given array does not consist of standard layout objects"); +#if (__GNUC__ >= 5) || defined(__clang__) || defined(_MSC_VER) static_assert(std::is_trivially_copyable(), "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(), "Given array does not consist of standard layout objects"); +#if (__GNUC__ >= 5) || defined(__clang__) || defined(_MSC_VER) static_assert(std::is_trivially_copyable(), "Given array does not consist of trivially copyable objects"); +#endif if (!IsOpen()) { m_good = false; -- cgit v1.2.3