RE: [PATCH next 02/11] minmax: Use _Static_assert() instead of static_assert()

[David Laight]

The wrapper just adds two more lines of error output when the test fails.

Signed-off-by: David Laight <david.lai...@aculab.com>
---
 include/linux/minmax.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/linux/minmax.h b/include/linux/minmax.h
index 63c45865b48a..900eec7a28e5 100644
--- a/include/linux/minmax.h
+++ b/include/linux/minmax.h
@@ -48,7 +48,7 @@
 #define __cmp_once(op, x, y, unique_x, unique_y) ({    \
        typeof(x) unique_x = (x);                       \
        typeof(y) unique_y = (y);                       \
-       static_assert(__types_ok(x, y),                 \
+       _Static_assert(__types_ok(x, y),                        \
                #op "(" #x ", " #y ") signedness error, fix types or consider 
u" #op "() before " #op "_t()"); \
        __cmp(op, unique_x, unique_y); })
 
@@ -137,11 +137,11 @@
        typeof(val) unique_val = (val);                                         
\
        typeof(lo) unique_lo = (lo);                                            
\
        typeof(hi) unique_hi = (hi);                                            
\
-       static_assert(__builtin_choose_expr(__is_constexpr((lo) > (hi)),        
\
+       _Static_assert(__builtin_choose_expr(__is_constexpr((lo) > (hi)),       
\
                        (lo) <= (hi), true),                                    
\
                "clamp() low limit " #lo " greater than high limit " #hi);      
\
-       static_assert(__types_ok(val, lo), "clamp() 'lo' signedness error");    
\
-       static_assert(__types_ok(val, hi), "clamp() 'hi' signedness error");    
\
+       _Static_assert(__types_ok(val, lo), "clamp() 'lo' signedness error");   
\
+       _Static_assert(__types_ok(val, hi), "clamp() 'hi' signedness error");   
\
        __clamp(unique_val, unique_lo, unique_hi); })
 
 #define __careful_clamp(val, lo, hi) ({                                        
\
-- 
2.17.1

-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, 
UK
Registration No: 1397386 (Wales)