diff options
| author | Craig Robbins <kde.psych@gmail.com> | 2015-03-06 20:21:51 +1000 |
|---|---|---|
| committer | Craig Robbins <kde.psych@gmail.com> | 2015-03-07 22:41:47 +1000 |
| commit | ced6d20295a8263757d57c02a07ffcb66688a163 (patch) | |
| tree | a44527357c1ffccb88bf479686735aef168d15c1 /src/util/string.cpp | |
| parent | a603a767877b94b4d3bc4d3de8d762fbc56a583d (diff) | |
| download | minetest-ced6d20295a8263757d57c02a07ffcb66688a163.tar.gz minetest-ced6d20295a8263757d57c02a07ffcb66688a163.tar.bz2 minetest-ced6d20295a8263757d57c02a07ffcb66688a163.zip | |
For usages of assert() that are meant to persist in Release builds (when NDEBUG is defined), replace those usages with persistent alternatives
Diffstat (limited to 'src/util/string.cpp')
| -rw-r--r-- | src/util/string.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/util/string.cpp b/src/util/string.cpp index 651293bfe..02a0586e7 100644 --- a/src/util/string.cpp +++ b/src/util/string.cpp @@ -320,7 +320,7 @@ char *mystrtok_r(char *s, const char *sep, char **lasts) } t++; } - + *lasts = t; return s; } @@ -329,15 +329,15 @@ u64 read_seed(const char *str) { char *endptr; u64 num; - + if (str[0] == '0' && str[1] == 'x') num = strtoull(str, &endptr, 16); else num = strtoull(str, &endptr, 10); - + if (*endptr) num = murmur_hash_64_ua(str, (int)strlen(str), 0x1337); - + return num; } @@ -614,4 +614,3 @@ void str_replace(std::string &str, char from, char to) { std::replace(str.begin(), str.end(), from, to); } - |