flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Cleanup some workarounds and warnings (#4735)

Browse Source 
* Cleanup thread_local usage in FastRandom

* Use constexpr to avoid clang warning

* Fix more Wglobal-constructor warnings

* Make MSVC happy?
This commit is contained in:
peterbell10
2020-05-10 17:16:49 +01:00
committed by GitHub
parent 154df6b09d
commit 84289a2ba9
9 changed files with 63 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Simulator/FireSimulator.cpp
View File

@@ -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
};