From c0d60bd4964701402aacf98390e0936c9dcba953 Mon Sep 17 00:00:00 2001 From: Khaled Hosny Date: Tue, 19 Jul 2022 18:21:09 +0200 Subject: [PATCH] [meta] Fix warning with emscripten For whatever reason, em++ takes the first branch and spouts a gazillion warnings like: ./harfbuzz/src/hb-vector.hh:229:20: warning: builtin __has_trivial_assign is deprecated; use __is_trivially_assignable instead [-Wdeprecated-builtins] hb_enable_if (hb_is_trivially_copy_assignable(T))> ^ ./harfbuzz/src/hb-meta.hh:193:44: note: expanded from macro 'hb_is_trivially_copy_assignable' --- src/hb-meta.hh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/hb-meta.hh b/src/hb-meta.hh index e97d790fc..1921ccbb6 100644 --- a/src/hb-meta.hh +++ b/src/hb-meta.hh @@ -188,7 +188,7 @@ template <> struct hb_int_max : hb_integral_constant struct hb_int_max : hb_integral_constant {}; #define hb_int_max(T) hb_int_max::value -#if defined(__GNUC__) && __GNUC__ < 5 +#if defined(__GNUC__) && __GNUC__ < 5 && !defined(__clang__) #define hb_is_trivially_copyable(T) __has_trivial_copy(T) #define hb_is_trivially_copy_assignable(T) __has_trivial_assign(T) #define hb_is_trivially_constructible(T) __has_trivial_constructor(T)