diff options
| author | JosJuice <josjuice@gmail.com> | 2017-11-12 17:21:11 +0100 |
|---|---|---|
| committer | JosJuice <josjuice@gmail.com> | 2017-11-13 19:51:16 +0100 |
| commit | 72b7b96571aa72da730bec6c6720e58a7ebfc977 (patch) | |
| tree | 92c95e5340af2b3585e880760a7b49c04c7c49c8 /Source/Core | |
| parent | 8ad5ea2ede6c19bf3ea9f0ad0ef9c65d7982378f (diff) | |
Remove IsTriviallyCopyable hack for VS
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Common/ChunkFile.h | 5 |
1 files changed, 1 insertions, 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<typename std::remove_volatile<T>::type>::value #elif __GNUC__ #define IsTriviallyCopyable(T) std::has_trivial_copy_constructor<T>::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 |