summaryrefslogtreecommitdiffstats
path: root/src/Simulator
diff options
context:
space:
mode:
authorpeterbell10 <peterbell10@live.co.uk>2020-05-10 18:16:49 +0200
committerGitHub <noreply@github.com>2020-05-10 18:16:49 +0200
commit84289a2ba996b41815f148f27aecc52a7864066d (patch)
tree7434a6b14dde1597bd687e0a71a28135a1d31adc /src/Simulator
parentCleanup unneeded globals (#4736) (diff)
downloadcuberite-84289a2ba996b41815f148f27aecc52a7864066d.tar
cuberite-84289a2ba996b41815f148f27aecc52a7864066d.tar.gz
cuberite-84289a2ba996b41815f148f27aecc52a7864066d.tar.bz2
cuberite-84289a2ba996b41815f148f27aecc52a7864066d.tar.lz
cuberite-84289a2ba996b41815f148f27aecc52a7864066d.tar.xz
cuberite-84289a2ba996b41815f148f27aecc52a7864066d.tar.zst
cuberite-84289a2ba996b41815f148f27aecc52a7864066d.zip
Diffstat (limited to 'src/Simulator')
-rw-r--r--src/Simulator/FireSimulator.cpp15
1 files changed, 3 insertions, 12 deletions
diff --git a/src/Simulator/FireSimulator.cpp b/src/Simulator/FireSimulator.cpp
index 2a9d6c289..f1b31ab8b 100644
--- a/src/Simulator/FireSimulator.cpp
+++ b/src/Simulator/FireSimulator.cpp
@@ -36,12 +36,7 @@
-#ifdef __clang__
- #pragma clang diagnostic push
- #pragma clang diagnostic ignored "-Wglobal-constructors"
-#endif
-
-static const Vector3i gCrossCoords[] =
+static constexpr Vector3i gCrossCoords[] =
{
{ 1, 0, 0},
{-1, 0, 0},
@@ -53,7 +48,7 @@ static const Vector3i gCrossCoords[] =
-static const Vector3i gNeighborCoords[] =
+static constexpr Vector3i gNeighborCoords[] =
{
{ 1, 0, 0},
{-1, 0, 0},
@@ -61,11 +56,7 @@ static const Vector3i gNeighborCoords[] =
{ 0, -1, 0},
{ 0, 0, 1},
{ 0, 0, -1},
-} ;
-
-#ifdef __clang__
- #pragma clang diagnostic pop
-#endif
+};