Remove old GCC version checks
This commit is contained in:
parent
eb9969a1e2
commit
8a00a9e149
|
@ -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<typename std::remove_volatile<T>::type>::value
|
||||
#elif __GNUC__
|
||||
#define IsTriviallyCopyable(T) std::has_trivial_copy_constructor<T>::value
|
||||
#else
|
||||
#error No version of is_trivially_copyable
|
||||
#endif
|
||||
|
||||
// Wrapper class
|
||||
class PointerWrap
|
||||
|
|
|
@ -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<K>::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<K>::value, "K must be a trivially copyable type");
|
||||
#endif
|
||||
|
||||
// close any currently opened file
|
||||
Close();
|
||||
|
|
|
@ -532,14 +532,8 @@ struct VK_PIPELINE_CACHE_HEADER
|
|||
u8 uuid[VK_UUID_SIZE];
|
||||
};
|
||||
#pragma pack(pop)
|
||||
// TODO: Remove the #if here when GCC 5 is a minimum build requirement.
|
||||
#if defined(__GNUC__) && !defined(__clang__) && __GNUC__ < 5
|
||||
static_assert(std::has_trivial_copy_constructor<VK_PIPELINE_CACHE_HEADER>::value,
|
||||
"VK_PIPELINE_CACHE_HEADER must be trivially copyable");
|
||||
#else
|
||||
static_assert(std::is_trivially_copyable<VK_PIPELINE_CACHE_HEADER>::value,
|
||||
"VK_PIPELINE_CACHE_HEADER must be trivially copyable");
|
||||
#endif
|
||||
|
||||
bool ShaderCache::ValidatePipelineCache(const u8* data, size_t data_length)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue