Mesa (master): util: use STATIC_ASSERT instead of static_assert

Tapani Pälli tpalli at kemper.freedesktop.org
Fri Nov 11 06:00:31 UTC 2016


Module: Mesa
Branch: master
Commit: ec725dc140592f0d3e4fc3e830cfd1edaf5546c0
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ec725dc140592f0d3e4fc3e830cfd1edaf5546c0

Author: Tapani Pälli <tapani.palli at intel.com>
Date:   Wed Nov  9 08:58:12 2016 +0200

util: use STATIC_ASSERT instead of static_assert

fixes following compilation warnings on Android build:

"warning: implicit declaration of function 'static_assert' is invalid in
C99 [-Wimplicit-function-declaration]"

Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>

---

 src/util/u_vector.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/util/u_vector.h b/src/util/u_vector.h
index 8fa4ec4..f97a8b4 100644
--- a/src/util/u_vector.h
+++ b/src/util/u_vector.h
@@ -82,7 +82,7 @@ u_vector_finish(struct u_vector *queue)
 }
 
 #define u_vector_foreach(elem, queue)                                  \
-   static_assert(__builtin_types_compatible_p(__typeof__(queue), struct u_vector *), ""); \
+   STATIC_ASSERT(__builtin_types_compatible_p(__typeof__(queue), struct u_vector *)); \
    for (uint32_t __u_vector_offset = (queue)->tail;                                \
         elem = (queue)->data + (__u_vector_offset & ((queue)->size - 1)), __u_vector_offset < (queue)->head; \
         __u_vector_offset += (queue)->element_size)




More information about the mesa-commit mailing list