From 8a00a9e1497c75b3cff7247bd6e86280ab9c85b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Lam?= Date: Mon, 25 Dec 2017 22:53:44 +0100 Subject: Remove old GCC version checks --- Source/Core/Common/ChunkFile.h | 12 ------------ Source/Core/Common/LinearDiskCache.h | 10 ++-------- 2 files changed, 2 insertions(+), 20 deletions(-) (limited to 'Source/Core/Common') diff --git a/Source/Core/Common/ChunkFile.h b/Source/Core/Common/ChunkFile.h index 80247849ab..0a71bf30cb 100644 --- a/Source/Core/Common/ChunkFile.h +++ b/Source/Core/Common/ChunkFile.h @@ -35,20 +35,8 @@ // ewww -#ifndef __has_feature -#define __has_feature(x) (0) -#endif - -#if (__has_feature(is_trivially_copyable) && \ - (defined(_LIBCPP_VERSION) || defined(__GLIBCXX__))) || \ - (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 -#else -#error No version of is_trivially_copyable -#endif // Wrapper class class PointerWrap diff --git a/Source/Core/Common/LinearDiskCache.h b/Source/Core/Common/LinearDiskCache.h index 4268d2b516..81c146ec9a 100644 --- a/Source/Core/Common/LinearDiskCache.h +++ b/Source/Core/Common/LinearDiskCache.h @@ -56,15 +56,9 @@ public: { using std::ios_base; -// Since we're reading/writing directly to the storage of K instances, -// K must be trivially copyable. TODO: Remove #if once GCC 5.0 is a -// minimum requirement. -#if defined(__GNUC__) && !defined(__clang__) && __GNUC__ < 5 - static_assert(std::has_trivial_copy_constructor::value, - "K must be a trivially copyable type"); -#else + // Since we're reading/writing directly to the storage of K instances, + // K must be trivially copyable. static_assert(std::is_trivially_copyable::value, "K must be a trivially copyable type"); -#endif // close any currently opened file Close(); -- cgit v1.2.3