summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-08-21 21:22:39 +0300
committerAndrei Karas <akaras@inbox.ru>2017-08-21 21:22:39 +0300
commit860728a6949cb06191c3f3fee8df091768e7f154 (patch)
treecb5cb17b0f1fc157d2163a6a73c3c0e16d8cedad
parent9decb63d5e8e3b4a080f6095233ba4b470af7bf6 (diff)
downloadmv-860728a6949cb06191c3f3fee8df091768e7f154.tar.gz
mv-860728a6949cb06191c3f3fee8df091768e7f154.tar.bz2
mv-860728a6949cb06191c3f3fee8df091768e7f154.tar.xz
mv-860728a6949cb06191c3f3fee8df091768e7f154.zip
Add support for if constexpr.
-rw-r--r--src/localconsts.h6
-rw-r--r--src/resources/sdlimagehelper.cpp4
2 files changed, 8 insertions, 2 deletions
diff --git a/src/localconsts.h b/src/localconsts.h
index 63865afc8..dc7723ae3 100644
--- a/src/localconsts.h
+++ b/src/localconsts.h
@@ -300,6 +300,12 @@
#endif // ENABLE_CHECKS
+#if __cpp_if_constexpr >= 201606
+#define ifconstexpr if constexpr
+#else // __cpp_if_constexpr >= 201606
+#define ifconstexpr if
+#endif // __cpp_if_constexpr >= 201606
+
#ifdef USE_SDL2
PRAGMA45(GCC diagnostic push)
PRAGMA45(GCC diagnostic ignored "-Wswitch-default")
diff --git a/src/resources/sdlimagehelper.cpp b/src/resources/sdlimagehelper.cpp
index 5459062f9..21bc75b0b 100644
--- a/src/resources/sdlimagehelper.cpp
+++ b/src/resources/sdlimagehelper.cpp
@@ -266,7 +266,7 @@ Image *SDLImageHelper::_SDLload(SDL_Surface *tmpImage)
}
else
{
- if (SDL_ALPHA_OPAQUE != 255)
+ ifconstexpr (SDL_ALPHA_OPAQUE != 255)
{
hasAlpha = true;
memset(alphaChannel, SDL_ALPHA_OPAQUE, sz);
@@ -275,7 +275,7 @@ Image *SDLImageHelper::_SDLload(SDL_Surface *tmpImage)
}
else
{
- if (SDL_ALPHA_OPAQUE != 255)
+ ifconstexpr (SDL_ALPHA_OPAQUE != 255)
{
hasAlpha = true;
memset(alphaChannel, SDL_ALPHA_OPAQUE, sz);