Merge branch 'master' of github.com:bkaradzic/bx

2026-02-17 20:52:37 +01:00 · 2019-03-21 09:39:07 -07:00
parent 20f39d9619 d021b3a49f
commit 36026711f9
5 changed files with 1 additions and 1 deletions
--- 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
--- a/tools/bin/darwin/bin2c
+++ b/tools/bin/darwin/bin2c
--- a/tools/bin/darwin/lemon
+++ b/tools/bin/darwin/lemon
--- a/tools/bin/windows/bin2c.exe
+++ b/tools/bin/windows/bin2c.exe
--- a/tools/bin/windows/lemon.exe
+++ b/tools/bin/windows/lemon.exe