From 72b7b96571aa72da730bec6c6720e58a7ebfc977 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sun, 12 Nov 2017 17:21:11 +0100 Subject: [PATCH] Remove IsTriviallyCopyable hack for VS --- Source/Core/Common/ChunkFile.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Source/Core/Common/ChunkFile.h b/Source/Core/Common/ChunkFile.h index fdae41102b..ea4bb2cd54 100644 --- a/Source/Core/Common/ChunkFile.h +++ b/Source/Core/Common/ChunkFile.h @@ -41,14 +41,11 @@ #if (__has_feature(is_trivially_copyable) && \ (defined(_LIBCPP_VERSION) || defined(__GLIBCXX__))) || \ - (defined(__GNUC__) && __GNUC__ >= 5) + (defined(__GNUC__) && __GNUC__ >= 5) || defined(_MSC_VER) #define IsTriviallyCopyable(T) \ std::is_trivially_copyable::type>::value #elif __GNUC__ #define IsTriviallyCopyable(T) std::has_trivial_copy_constructor::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