diff options
| author | Markus Wick <markus+github@selfnet.de> | 2015-05-26 20:13:14 +0200 |
|---|---|---|
| committer | Markus Wick <markus+github@selfnet.de> | 2015-05-26 20:13:14 +0200 |
| commit | 85e706b4ec418a23289e418ba2a30a2d300079a7 (patch) | |
| tree | 1df17861d99460a963f343780b82734dac96e22b /Source/Core | |
| parent | 49ecb01c7e89a988c074ec4932e9c934486e31c1 (diff) | |
| parent | ebad10f2a14c3e06076c6487cd852d21543f6eee (diff) | |
Merge pull request #2459 from degasus/master
Common: Fix IsTriviallyCopyable macro for GCC 5
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Common/ChunkFile.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/Common/ChunkFile.h b/Source/Core/Common/ChunkFile.h index 8b64244a9c..cd02192c86 100644 --- a/Source/Core/Common/ChunkFile.h +++ b/Source/Core/Common/ChunkFile.h @@ -29,7 +29,7 @@ #include "Common/Flag.h" // ewww -#if _LIBCPP_VERSION +#if _LIBCPP_VERSION || __GNUC__ >= 5 #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 |