Skip to content

Commit 80a07ff

Browse files
authored
Merge pull request #325 from past-due/trivially_copyable
Allow defining BASISU_HAVE_STD_TRIVIALLY_COPYABLE
2 parents 9c5da86 + 4dc6a8c commit 80a07ff

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

transcoder/basisu_containers.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ namespace basisu
188188

189189
#define BASISU_IS_SCALAR_TYPE(T) (scalar_type<T>::cFlag)
190190

191-
#if defined(__GNUC__) && __GNUC__<5
191+
#if !defined(BASISU_HAVE_STD_TRIVIALLY_COPYABLE) && defined(__GNUC__) && __GNUC__<5
192192
#define BASISU_IS_TRIVIALLY_COPYABLE(...) __has_trivial_copy(__VA_ARGS__)
193193
#else
194194
#define BASISU_IS_TRIVIALLY_COPYABLE(...) std::is_trivially_copyable<__VA_ARGS__>::value

0 commit comments

Comments
 (0)