diff options
| author | Vinson Lee <[email protected]> | 2016-11-13 22:53:54 -0800 |
|---|---|---|
| committer | Vinson Lee <[email protected]> | 2016-11-15 17:35:56 -0800 |
| commit | ed6694d5114e81cf1c413aec8265ddc8a5c52599 (patch) | |
| tree | 3536ab8a8e28a4e11292e327f93b80092ac54e98 | |
| parent | dafffd2f11889fa1d04149cb1f797ccfb06e2f05 (diff) | |
util: Fix Clang trivial destructor check.
Check for Clang before GCC.
Clang defines __GNUC__ == 4 and __GNUC_MINOR__ == 2 and matches the GCC
check but not the GCC version for trivial destructor.
Fixes: 98ab905af0e0 ("mesa: Define introspection macro to determine
whether a type is trivially destructible.")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=98526
Signed-off-by: Vinson Lee <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
Reviewed-by: Edward O'Callaghan <[email protected]>
Reviewed-by: Francisco Jerez <[email protected]>
| -rw-r--r-- | src/util/macros.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/util/macros.h b/src/util/macros.h index 0563fa59b59..733bf42cddd 100644 --- a/src/util/macros.h +++ b/src/util/macros.h @@ -167,12 +167,12 @@ do { \ * performs no action and all member variables and base classes are * trivially destructible themselves. */ -# if defined(__GNUC__) -# if ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))) +# if (defined(__clang__) && defined(__has_feature)) +# if __has_feature(has_trivial_destructor) # define HAS_TRIVIAL_DESTRUCTOR(T) __has_trivial_destructor(T) # endif -# elif (defined(__clang__) && defined(__has_feature)) -# if __has_feature(has_trivial_destructor) +# elif defined(__GNUC__) +# if ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 3))) # define HAS_TRIVIAL_DESTRUCTOR(T) __has_trivial_destructor(T) # endif # elif defined(_MSC_VER) && !defined(__INTEL_COMPILER) |