mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-23 17:17:18 +02:00
Merge pull request #1705 from LittleWhite-tb/compat_gcc49
Protect use of std::is_trivially_copyable to compile with GCC 4.9
This commit is contained in:
commit
4c9ed98084
@ -192,7 +192,9 @@ public:
|
|||||||
size_t ReadArray(T* data, size_t length)
|
size_t ReadArray(T* data, size_t length)
|
||||||
{
|
{
|
||||||
static_assert(std::is_standard_layout<T>(), "Given array does not consist of standard layout objects");
|
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");
|
static_assert(std::is_trivially_copyable<T>(), "Given array does not consist of trivially copyable objects");
|
||||||
|
#endif
|
||||||
|
|
||||||
if (!IsOpen()) {
|
if (!IsOpen()) {
|
||||||
m_good = false;
|
m_good = false;
|
||||||
@ -210,7 +212,9 @@ public:
|
|||||||
size_t WriteArray(const T* data, size_t length)
|
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");
|
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");
|
static_assert(std::is_trivially_copyable<T>(), "Given array does not consist of trivially copyable objects");
|
||||||
|
#endif
|
||||||
|
|
||||||
if (!IsOpen()) {
|
if (!IsOpen()) {
|
||||||
m_good = false;
|
m_good = false;
|
||||||
|
Loading…
Reference in New Issue
Block a user