From 6303a099aa91d37d3d023b55f6cbc2500aa64b22 Mon Sep 17 00:00:00 2001 From: Olly Betts Date: Fri, 4 Aug 2017 17:01:35 +1200 Subject: [PATCH] Fix previous commit to compile with older compilers Not all "C++11" compilers will also support C++17. --- Examples/test-suite/cpp11_static_assert.i | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Examples/test-suite/cpp11_static_assert.i b/Examples/test-suite/cpp11_static_assert.i index 1533d4210..7ca452d85 100644 --- a/Examples/test-suite/cpp11_static_assert.i +++ b/Examples/test-suite/cpp11_static_assert.i @@ -8,14 +8,24 @@ static_assert(sizeof(int) >= 2, "What? int size is invalid!"); namespace dummy { // C++17 allows the message to be omitted, so check that works too. +// But only show the C++17 version to SWIG, as the compiler may +// lack C++17 support. +#ifdef SWIG static_assert(sizeof(int) >= sizeof(short)); +#else +static_assert(sizeof(int) >= sizeof(short), "blah"); +#endif } template struct Check1 { static_assert(sizeof(int) <= sizeof(T), "not big enough"); Check1() { +#ifdef SWIG static_assert(true); +#else + static_assert(true, "true"); +#endif } };