From 357087770752f75336f65355a207bbb28e4cb3a9 Mon Sep 17 00:00:00 2001 From: Charles Dang Date: Fri, 25 Aug 2017 10:57:41 +1100 Subject: [PATCH] GUI2/Generator: use static_assert to have actual compile-time assertions --- src/gui/widgets/generator.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/widgets/generator.cpp b/src/gui/widgets/generator.cpp index 286d7c98de3d..06ce5947d86a 100644 --- a/src/gui/widgets/generator.cpp +++ b/src/gui/widgets/generator.cpp @@ -1133,7 +1133,7 @@ void show::init(grid* grid, /***** ***** ***** ***** Helper macros ***** ***** ***** *****/ #ifdef GENERATE_PLACEMENT -char compile_assert[0]; +static_assert(false, "GUI2/Generator: GENERATE_PLACEMENT already defined!"); #else #define GENERATE_PLACEMENT \ switch(placement) { \ @@ -1167,7 +1167,7 @@ char compile_assert[0]; #endif #ifdef GENERATE_SELECT -char compile_assert[0]; +static_assert(false, "GUI2/Generator: GENERATE_SELECT already defined!"); #else #define GENERATE_SELECT \ if(select) { \ @@ -1180,7 +1180,7 @@ char compile_assert[0]; #endif #ifdef GENERATE_MAXIMUM -char compile_assert[0]; +static_assert(false, "GUI2/Generator: GENERATE_MAXIMUM already defined!"); #else #define GENERATE_MAXIMUM \ if(has_maximum) { \ @@ -1193,7 +1193,7 @@ char compile_assert[0]; #endif #ifdef GENERATE_BODY -char compile_assert[0]; +static_assert(false, "GUI2/Generator: GENERATE_BODY already defined!"); #else #define GENERATE_BODY \ if(has_minimum) { \