From 3a72c9aa33c38b2005edd23834be2d2ecac050fc Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Fri, 31 May 2019 08:12:21 -0600 Subject: Cleanup: use static_assert on MSVC versions that support it. This greatly improves the error message --- source/blender/blenlib/BLI_assert.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'source/blender/blenlib') diff --git a/source/blender/blenlib/BLI_assert.h b/source/blender/blenlib/BLI_assert.h index 6942c87caec..7fb91656edb 100644 --- a/source/blender/blenlib/BLI_assert.h +++ b/source/blender/blenlib/BLI_assert.h @@ -89,7 +89,11 @@ extern "C" { # define BLI_STATIC_ASSERT(a, msg) static_assert(a, msg); #elif defined(_MSC_VER) /* Visual Studio */ -# define BLI_STATIC_ASSERT(a, msg) _STATIC_ASSERT(a); +# if _MSC_VER > 1910 +# define BLI_STATIC_ASSERT(a, msg) static_assert(a, msg); +# else +# define BLI_STATIC_ASSERT(a, msg) _STATIC_ASSERT(a); +# endif #elif defined(__COVERITY__) /* Workaround error with coverity */ # define BLI_STATIC_ASSERT(a, msg) -- cgit v1.2.3