From d021b3a49f8ac81a3ffa16451f2f0b39f18bbc89 Mon Sep 17 00:00:00 2001 From: alekseyt Date: Sat, 16 Mar 2019 17:46:51 +0200 Subject: [PATCH] Added __cpluplus check for GCC to disable constexpr similarly to VS2015 check (#202) --- include/bx/macros.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/bx/macros.h b/include/bx/macros.h index 7a9b643..1509925 100644 --- a/include/bx/macros.h +++ b/include/bx/macros.h @@ -115,7 +115,7 @@ /// The return value of the function is solely a function of the arguments. /// -#if BX_COMPILER_MSVC && (BX_COMPILER_MSVC <= 1900) +#if (BX_COMPILER_MSVC && (BX_COMPILER_MSVC <= 1900)) || (BX_COMPILER_GCC && (__cplusplus < 201402L)) # define BX_CONSTEXPR_FUNC BX_CONST_FUNC #else # define BX_CONSTEXPR_FUNC constexpr BX_CONST_FUNC