diff options
| author | 2014-12-03 12:57:57 -0600 | |
|---|---|---|
| committer | 2014-12-03 12:57:57 -0600 | |
| commit | 8a624239703c046d89ebeaf3ea13c87af75b550f (patch) | |
| tree | 19546d2b06c71add6140f322a8aab0c918bbd9ca /src/common/timer.cpp | |
| parent | Merge pull request #236 from rohit-n/sign-compare (diff) | |
| download | yuzu-8a624239703c046d89ebeaf3ea13c87af75b550f.tar.gz yuzu-8a624239703c046d89ebeaf3ea13c87af75b550f.tar.xz yuzu-8a624239703c046d89ebeaf3ea13c87af75b550f.zip | |
Change NULLs to nullptrs.
Diffstat (limited to '')
| -rw-r--r-- | src/common/timer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/common/timer.cpp b/src/common/timer.cpp index ded4a344e..4a797f751 100644 --- a/src/common/timer.cpp +++ b/src/common/timer.cpp | |||
| @@ -25,7 +25,7 @@ u32 Timer::GetTimeMs() | |||
| 25 | return timeGetTime(); | 25 | return timeGetTime(); |
| 26 | #else | 26 | #else |
| 27 | struct timeval t; | 27 | struct timeval t; |
| 28 | (void)gettimeofday(&t, NULL); | 28 | (void)gettimeofday(&t, nullptr); |
| 29 | return ((u32)(t.tv_sec * 1000 + t.tv_usec / 1000)); | 29 | return ((u32)(t.tv_sec * 1000 + t.tv_usec / 1000)); |
| 30 | #endif | 30 | #endif |
| 31 | } | 31 | } |
| @@ -183,7 +183,7 @@ std::string Timer::GetTimeFormatted() | |||
| 183 | return StringFromFormat("%s:%03i", tmp, tp.millitm); | 183 | return StringFromFormat("%s:%03i", tmp, tp.millitm); |
| 184 | #else | 184 | #else |
| 185 | struct timeval t; | 185 | struct timeval t; |
| 186 | (void)gettimeofday(&t, NULL); | 186 | (void)gettimeofday(&t, nullptr); |
| 187 | return StringFromFormat("%s:%03d", tmp, (int)(t.tv_usec / 1000)); | 187 | return StringFromFormat("%s:%03d", tmp, (int)(t.tv_usec / 1000)); |
| 188 | #endif | 188 | #endif |
| 189 | } | 189 | } |
| @@ -197,7 +197,7 @@ double Timer::GetDoubleTime() | |||
| 197 | (void)::ftime(&tp); | 197 | (void)::ftime(&tp); |
| 198 | #else | 198 | #else |
| 199 | struct timeval t; | 199 | struct timeval t; |
| 200 | (void)gettimeofday(&t, NULL); | 200 | (void)gettimeofday(&t, nullptr); |
| 201 | #endif | 201 | #endif |
| 202 | // Get continuous timestamp | 202 | // Get continuous timestamp |
| 203 | u64 TmpSeconds = Common::Timer::GetTimeSinceJan1970(); | 203 | u64 TmpSeconds = Common::Timer::GetTimeSinceJan1970(); |