diff options
| author | Vincent Glize <vincentglize@hotmail.fr> | 2017-06-19 23:54:58 +0200 |
|---|---|---|
| committer | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-06-19 23:54:58 +0200 |
| commit | 4a5e8ad343079f6552fab639770e5771ed7c4e7a (patch) | |
| tree | eeab3adec1fc3e7a3b06d9f53b92ab99a5e0d290 /src/util/serialize.cpp | |
| parent | 4a789490834157baa8788a2f36c95b86c1e4440e (diff) | |
| download | minetest-4a5e8ad343079f6552fab639770e5771ed7c4e7a.tar.gz minetest-4a5e8ad343079f6552fab639770e5771ed7c4e7a.tar.bz2 minetest-4a5e8ad343079f6552fab639770e5771ed7c4e7a.zip | |
C++11 cleanup on constructors (#6000)
* C++11 cleanup on constructors dir script
Diffstat (limited to 'src/util/serialize.cpp')
| -rw-r--r-- | src/util/serialize.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/util/serialize.cpp b/src/util/serialize.cpp index 61d369bc4..75843cb1b 100644 --- a/src/util/serialize.cpp +++ b/src/util/serialize.cpp @@ -422,7 +422,7 @@ bool deSerializeStringToStruct(std::string valstr, char *fmtpos, *fmt = &format[0]; while ((f = strtok_r(fmt, ",", &fmtpos)) && s) { - fmt = NULL; + fmt = nullptr; bool is_unsigned = false; int width = 0; @@ -510,7 +510,7 @@ bool deSerializeStringToStruct(std::string valstr, bufpos += sizeof(std::string *); strs_alloced.push_back(str); - s = *snext ? snext + 1 : NULL; + s = *snext ? snext + 1 : nullptr; break; case 'v': while (*s == ' ' || *s == '\t') @@ -582,7 +582,7 @@ bool serializeStructToString(std::string *out, char *bufpos = (char *) value; char *fmtpos, *fmt = &format[0]; while ((f = strtok_r(fmt, ",", &fmtpos))) { - fmt = NULL; + fmt = nullptr; bool is_unsigned = false; int width = 0; char valtype = *f; |