From 66a3951c3b2751227e607fa5324e66f002a21c9b Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Wed, 29 Apr 2015 22:19:04 +0000 Subject: [PATCH] [windows] Add workaround(HACK) for vs2015 implementating a conformant std::is_trivially_copyable... see https://github.com/dolphin-emu/dolphin/pull/2218 --- Source/Core/Common/ChunkFile.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Source/Core/Common/ChunkFile.h b/Source/Core/Common/ChunkFile.h index cd02192c86..fcf1bdb3e4 100644 --- a/Source/Core/Common/ChunkFile.h +++ b/Source/Core/Common/ChunkFile.h @@ -33,11 +33,9 @@ #define IsTriviallyCopyable(T) std::is_trivially_copyable::type>::value #elif __GNUC__ #define IsTriviallyCopyable(T) std::has_trivial_copy_constructor::value -#elif _MSC_VER >= 1800 -// work around bug -#define IsTriviallyCopyable(T) (std::is_trivially_copyable::value || std::is_pod::value) -#elif defined(_MSC_VER) -#define IsTriviallyCopyable(T) std::has_trivial_copy::value +#elif _MSC_VER +// (shuffle2) see https://github.com/dolphin-emu/dolphin/pull/2218 +#define IsTriviallyCopyable(T) 1 #else #error No version of is_trivially_copyable #endif