MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use constexpr to prevent attempts of linking static variable

develop
Pauli 2018-06-22 15:51:03 +03:00
parent 8a1979b8a7
commit 123de7fdf7
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/include/modules/MapCache.h
Unescape Escape View File

@ -55,7 +55,7 @@ class Block;
struct BiomeInfo { struct BiomeInfo {
// Determined by the 4-bit index in the designation bitfield // Determined by the 4-bit index in the designation bitfield
static const unsigned MAX_LAYERS = 16; static constexpr unsigned MAX_LAYERS = 16;
df::coord2d pos; df::coord2d pos;
int default_soil, default_stone, lava_stone; int default_soil, default_stone, lava_stone;

4
library/modules/MapCache.cpp
Unescape Escape View File

@ -79,10 +79,6 @@ using df::global::world;
extern bool GetLocalFeature(t_feature &feature, df::coord2d rgn_pos, int32_t index); extern bool GetLocalFeature(t_feature &feature, df::coord2d rgn_pos, int32_t index);
#ifdef LINUX_BUILD
const unsigned MapExtras::BiomeInfo::MAX_LAYERS;
#endif
const BiomeInfo MapCache::biome_stub = { const BiomeInfo MapCache::biome_stub = {
df::coord2d(), df::coord2d(),
-1, -1, -1, -1, -1, -1, -1, -1,