From b4d4598ff0e21ebf7a68030ac6b7e9d0f227cca2 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 22 Aug 2017 04:10:33 +0300
Subject: Fix compilation with old compilers.
---
src/localconsts.h | 6 +++---
src/particle/particleengine.cpp | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
(limited to 'src')
diff --git a/src/localconsts.h b/src/localconsts.h
index dc7723ae3..5b53d364c 100644
--- a/src/localconsts.h
+++ b/src/localconsts.h
@@ -300,11 +300,11 @@
#endif // ENABLE_CHECKS
-#if __cpp_if_constexpr >= 201606
+#if defined(__cpp_if_constexpr) && __cpp_if_constexpr >= 201606
#define ifconstexpr if constexpr
-#else // __cpp_if_constexpr >= 201606
+#else // defined(__cpp_if_constexpr) && __cpp_if_constexpr >= 201606
#define ifconstexpr if
-#endif // __cpp_if_constexpr >= 201606
+#endif // defined(__cpp_if_constexpr) && __cpp_if_constexpr >= 201606
#ifdef USE_SDL2
PRAGMA45(GCC diagnostic push)
diff --git a/src/particle/particleengine.cpp b/src/particle/particleengine.cpp
index b54e36d27..25e85fe94 100644
--- a/src/particle/particleengine.cpp
+++ b/src/particle/particleengine.cpp
@@ -69,7 +69,7 @@ void ParticleEngine::setupEngine() restrict2
ParticleEngine::maxCount = config.getIntValue("particleMaxCount");
ParticleEngine::fastPhysics = fromInt(config.getIntValue(
"particleFastPhysics"),
- ParticlePhysics);
+ ParticlePhysicsT);
ParticleEngine::emitterSkip =
config.getIntValue("particleEmitterSkip") + 1;
if (ParticleEngine::emitterSkip == 0)
--
cgit v1.2.3-70-g09d2