diff options
| author | bunnei <bunneidev@gmail.com> | 2014-12-07 13:40:04 -0500 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2014-12-07 13:40:04 -0500 |
| commit | 2aa2d341d04b10a5ecb49acbcf3579cf2c2ae35c (patch) | |
| tree | 4beadeb20c206faf4f85c25d15eee39c964857f6 /src/common/common_funcs.h | |
| parent | f06922268a369c2b76ac2652c58516f915b71606 (diff) | |
| parent | 8a624239703c046d89ebeaf3ea13c87af75b550f (diff) | |
Merge pull request #245 from rohit-n/null-nullptr
Change NULLs to nullptrs.
Diffstat (limited to 'src/common/common_funcs.h')
| -rw-r--r-- | src/common/common_funcs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index d84ec4c42d..1139dc3b8a 100644 --- a/src/common/common_funcs.h +++ b/src/common/common_funcs.h @@ -106,7 +106,7 @@ inline u64 _rotr64(u64 x, unsigned int shift){ // Restore the global locale _configthreadlocale(_DISABLE_PER_THREAD_LOCALE); } - else if(new_locale != NULL) + else if(new_locale != nullptr) { // Configure the thread to set the locale only for this thread _configthreadlocale(_ENABLE_PER_THREAD_LOCALE); |