diff options
author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-03-29 13:34:57 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-29 13:34:57 +0200 |
commit | b605b95749aad90b53e6c58a1ee43b50f8217e7c (patch) | |
tree | f036a6d80ea539aad95e55443720b97b74668a9b /src/reflowscan.cpp | |
parent | 5e806690fc5e0067247bbc1e541ba03b83fb761b (diff) | |
download | minetest-b605b95749aad90b53e6c58a1ee43b50f8217e7c.tar.gz minetest-b605b95749aad90b53e6c58a1ee43b50f8217e7c.tar.bz2 minetest-b605b95749aad90b53e6c58a1ee43b50f8217e7c.zip |
Add CPP11 header to define nullptr & constexpr (#5471)
This header permit to use nullptr & constexpr keywords in portable code segments and benefit from nullptr & constexpr when using C++11 and greater
Diffstat (limited to 'src/reflowscan.cpp')
-rw-r--r-- | src/reflowscan.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/reflowscan.cpp b/src/reflowscan.cpp index 49b9406d7..eec371022 100644 --- a/src/reflowscan.cpp +++ b/src/reflowscan.cpp @@ -22,12 +22,13 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "mapblock.h" #include "nodedef.h" #include "util/timetaker.h" +#include "util/cpp11.h" ReflowScan::ReflowScan(Map *map, INodeDefManager *ndef) : m_map(map), m_ndef(ndef), - m_liquid_queue(NULL) + m_liquid_queue(nullptr) { } @@ -41,7 +42,7 @@ void ReflowScan::scan(MapBlock *block, UniqueQueue<v3s16> *liquid_queue) // scanned block. Blocks are only added to the lookup if they are really // needed. The lookup is indexed manually to use the same index in a // bit-array (of uint32 type) which stores for unloaded blocks that they - // were already fetched from Map but were actually NULL. + // were already fetched from Map but were actually nullptr. memset(m_lookup, 0, sizeof(m_lookup)); int block_idx = 1 + (1 * 9) + (1 * 3); m_lookup[block_idx] = block; |