diff options
| author | 2014-12-07 13:40:04 -0500 | |
|---|---|---|
| committer | 2014-12-07 13:40:04 -0500 | |
| commit | 2aa2d341d04b10a5ecb49acbcf3579cf2c2ae35c (patch) | |
| tree | 4beadeb20c206faf4f85c25d15eee39c964857f6 /src/common/common_funcs.h | |
| parent | Merge pull request #252 from yuriks/patch-1 (diff) | |
| parent | Change NULLs to nullptrs. (diff) | |
| download | yuzu-2aa2d341d04b10a5ecb49acbcf3579cf2c2ae35c.tar.gz yuzu-2aa2d341d04b10a5ecb49acbcf3579cf2c2ae35c.tar.xz yuzu-2aa2d341d04b10a5ecb49acbcf3579cf2c2ae35c.zip | |
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 d84ec4c42..1139dc3b8 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){ | |||
| 106 | // Restore the global locale | 106 | // Restore the global locale |
| 107 | _configthreadlocale(_DISABLE_PER_THREAD_LOCALE); | 107 | _configthreadlocale(_DISABLE_PER_THREAD_LOCALE); |
| 108 | } | 108 | } |
| 109 | else if(new_locale != NULL) | 109 | else if(new_locale != nullptr) |
| 110 | { | 110 | { |
| 111 | // Configure the thread to set the locale only for this thread | 111 | // Configure the thread to set the locale only for this thread |
| 112 | _configthreadlocale(_ENABLE_PER_THREAD_LOCALE); | 112 | _configthreadlocale(_ENABLE_PER_THREAD_LOCALE); |