summaryrefslogtreecommitdiff
path: root/src/misc/blob.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/misc/blob.hpp
parent3b4f224c0bc50e7248050d4bcbb6d83fd510c1cc (diff)
downloadopenttd-7c8e7c6b6e16d4a26259a676db32d8776b99817e.tar.xz
Codechange: Use null pointer literal instead of the NULL macro
Diffstat (limited to 'src/misc/blob.hpp')
-rw-r--r--src/misc/blob.hpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/misc/blob.hpp b/src/misc/blob.hpp
index b1a5b667d..e725ccd27 100644
--- a/src/misc/blob.hpp
+++ b/src/misc/blob.hpp
@@ -86,9 +86,9 @@ public:
/** move constructor - take ownership of blob data */
inline ByteBlob(BlobHeader * const & src)
{
- assert(src != NULL);
+ assert(src != nullptr);
header = src;
- *const_cast<BlobHeader**>(&src) = NULL;
+ *const_cast<BlobHeader**>(&src) = nullptr;
}
/** destructor */
@@ -221,7 +221,7 @@ public:
/** append new bytes at the end of existing data bytes - reallocates if necessary */
inline void AppendRaw(const void *p, size_t num_bytes)
{
- assert(p != NULL);
+ assert(p != nullptr);
if (num_bytes > 0) {
memcpy(Append(num_bytes), p, num_bytes);
}
@@ -317,8 +317,8 @@ public:
OnTransfer(const OnTransfer& src) : header(src.header)
{
- assert(src.header != NULL);
- *const_cast<typename base::BlobHeader**>(&src.header) = NULL;
+ assert(src.header != nullptr);
+ *const_cast<typename base::BlobHeader**>(&src.header) = nullptr;
}
OnTransfer(CBlobT& src) : header(src.header)
@@ -328,7 +328,7 @@ public:
~OnTransfer()
{
- assert(header == NULL);
+ assert(header == nullptr);
}
};