diff options
| author |  bunnei | 2014-12-07 13:40:04 -0500 |
|---|---|---|
| committer | bunnei | 2014-12-07 13:40:04 -0500 |
| commit | 2aa2d341d04b10a5ecb49acbcf3579cf2c2ae35c (patch) | |
| tree | 4beadeb20c206faf4f85c25d15eee39c964857f6 /src/common/misc.cpp | |
| 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 '')
| -rw-r--r-- | src/common/misc.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/misc.cpp b/src/common/misc.cpp index cf6df44e8..bc9d26188 100644 --- a/src/common/misc.cpp +++ b/src/common/misc.cpp | |||
| @@ -23,9 +23,9 @@ const char* GetLastErrorMsg() | |||
| 23 | #ifdef _WIN32 | 23 | #ifdef _WIN32 |
| 24 | static __declspec(thread) char err_str[buff_size] = {}; | 24 | static __declspec(thread) char err_str[buff_size] = {}; |
| 25 | 25 | ||
| 26 | FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, NULL, GetLastError(), | 26 | FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, nullptr, GetLastError(), |
| 27 | MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), | 27 | MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), |
| 28 | err_str, buff_size, NULL); | 28 | err_str, buff_size, nullptr); |
| 29 | #else | 29 | #else |
| 30 | static __thread char err_str[buff_size] = {}; | 30 | static __thread char err_str[buff_size] = {}; |
| 31 | 31 | ||