From 4cf4c837dba86c0c0f9e9c7ac75e9c79f984eea3 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Fri, 7 Mar 2014 10:13:39 -0800 Subject: [PATCH 1/1] mempool: use GCC push/pop_options The include file should not change the GCC compile options for the whole file being compiled, but only for the one inline function that needs it. Using the push_options/pop_options fixes this. Signed-off-by: Stephen Hemminger Acked-by: Thomas Monjalon --- lib/librte_mempool/rte_mempool.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/librte_mempool/rte_mempool.h b/lib/librte_mempool/rte_mempool.h index 7668671c60..1f9243c737 100644 --- a/lib/librte_mempool/rte_mempool.h +++ b/lib/librte_mempool/rte_mempool.h @@ -314,6 +314,7 @@ static inline void __mempool_write_trailer_cookie(void *obj) */ #ifdef RTE_LIBRTE_MEMPOOL_DEBUG #ifndef __INTEL_COMPILER +#pragma GCC push_options #pragma GCC diagnostic ignored "-Wcast-qual" #endif static inline void __mempool_check_cookies(const struct rte_mempool *mp, @@ -380,7 +381,7 @@ static inline void __mempool_check_cookies(const struct rte_mempool *mp, } } #ifndef __INTEL_COMPILER -#pragma GCC diagnostic error "-Wcast-qual" +#pragma GCC pop_options #endif #else #define __mempool_check_cookies(mp, obj_table_const, n, free) do {} while(0) -- 2.20.1