summaryrefslogtreecommitdiff
path: root/src/core/mem_func.hpp
diff options
context:
space:
mode:
authorHenry Wilson <m3henry@googlemail.com>2019-04-10 22:07:06 +0100
committerMichael Lutz <michi@icosahedron.de>2019-04-10 23:22:20 +0200
commit7c8e7c6b6e16d4a26259a676db32d8776b99817e (patch)
tree99f134b7e66367cf11e10bc5061896eab4a3264f /src/core/mem_func.hpp
parent3b4f224c0bc50e7248050d4bcbb6d83fd510c1cc (diff)
downloadopenttd-7c8e7c6b6e16d4a26259a676db32d8776b99817e.tar.xz
Codechange: Use null pointer literal instead of the NULL macro
Diffstat (limited to 'src/core/mem_func.hpp')
-rw-r--r--src/core/mem_func.hpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/mem_func.hpp b/src/core/mem_func.hpp
index 687871164..5b3fe4cab 100644
--- a/src/core/mem_func.hpp
+++ b/src/core/mem_func.hpp
@@ -78,7 +78,7 @@ static inline int MemCmpT(const T *ptr1, const T *ptr2, size_t num = 1)
template <typename T>
static inline void MemReverseT(T *ptr1, T *ptr2)
{
- assert(ptr1 != NULL && ptr2 != NULL);
+ assert(ptr1 != nullptr && ptr2 != nullptr);
assert(ptr1 < ptr2);
do {
@@ -95,7 +95,7 @@ static inline void MemReverseT(T *ptr1, T *ptr2)
template <typename T>
static inline void MemReverseT(T *ptr, size_t num)
{
- assert(ptr != NULL);
+ assert(ptr != nullptr);
MemReverseT(ptr, ptr + (num - 1));
}