diff options
| author | 2014-12-03 12:57:57 -0600 | |
|---|---|---|
| committer | 2014-12-03 12:57:57 -0600 | |
| commit | 8a624239703c046d89ebeaf3ea13c87af75b550f (patch) | |
| tree | 19546d2b06c71add6140f322a8aab0c918bbd9ca /src/core/core_timing.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 'src/core/core_timing.cpp')
| -rw-r--r-- | src/core/core_timing.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/core/core_timing.cpp b/src/core/core_timing.cpp index 558c6cbf7..bf8acf41f 100644 --- a/src/core/core_timing.cpp +++ b/src/core/core_timing.cpp | |||
| @@ -67,7 +67,7 @@ s64 idledCycles; | |||
| 67 | static std::recursive_mutex externalEventSection; | 67 | static std::recursive_mutex externalEventSection; |
| 68 | 68 | ||
| 69 | // Warning: not included in save state. | 69 | // Warning: not included in save state. |
| 70 | void(*advanceCallback)(int cyclesExecuted) = NULL; | 70 | void(*advanceCallback)(int cyclesExecuted) = nullptr; |
| 71 | 71 | ||
| 72 | void SetClockFrequencyMHz(int cpuMhz) | 72 | void SetClockFrequencyMHz(int cpuMhz) |
| 73 | { | 73 | { |
| @@ -231,7 +231,7 @@ void ClearPendingEvents() | |||
| 231 | 231 | ||
| 232 | void AddEventToQueue(Event* ne) | 232 | void AddEventToQueue(Event* ne) |
| 233 | { | 233 | { |
| 234 | Event* prev = NULL; | 234 | Event* prev = nullptr; |
| 235 | Event** pNext = &first; | 235 | Event** pNext = &first; |
| 236 | for (;;) | 236 | for (;;) |
| 237 | { | 237 | { |
| @@ -327,7 +327,7 @@ s64 UnscheduleThreadsafeEvent(int event_type, u64 userdata) | |||
| 327 | } | 327 | } |
| 328 | if (!tsFirst) | 328 | if (!tsFirst) |
| 329 | { | 329 | { |
| 330 | tsLast = NULL; | 330 | tsLast = nullptr; |
| 331 | return result; | 331 | return result; |
| 332 | } | 332 | } |
| 333 | 333 | ||
| @@ -433,7 +433,7 @@ void RemoveThreadsafeEvent(int event_type) | |||
| 433 | } | 433 | } |
| 434 | if (!tsFirst) | 434 | if (!tsFirst) |
| 435 | { | 435 | { |
| 436 | tsLast = NULL; | 436 | tsLast = nullptr; |
| 437 | return; | 437 | return; |
| 438 | } | 438 | } |
| 439 | Event *prev = tsFirst; | 439 | Event *prev = tsFirst; |
| @@ -495,7 +495,7 @@ void MoveEvents() | |||
| 495 | AddEventToQueue(tsFirst); | 495 | AddEventToQueue(tsFirst); |
| 496 | tsFirst = next; | 496 | tsFirst = next; |
| 497 | } | 497 | } |
| 498 | tsLast = NULL; | 498 | tsLast = nullptr; |
| 499 | 499 | ||
| 500 | // Move free events to threadsafe pool | 500 | // Move free events to threadsafe pool |
| 501 | while (allocatedTsEvents > 0 && eventPool) | 501 | while (allocatedTsEvents > 0 && eventPool) |
| @@ -614,7 +614,7 @@ void DoState(PointerWrap &p) | |||
| 614 | // These (should) be filled in later by the modules. | 614 | // These (should) be filled in later by the modules. |
| 615 | event_types.resize(n, EventType(AntiCrashCallback, "INVALID EVENT")); | 615 | event_types.resize(n, EventType(AntiCrashCallback, "INVALID EVENT")); |
| 616 | 616 | ||
| 617 | p.DoLinkedList<BaseEvent, GetNewEvent, FreeEvent, Event_DoState>(first, (Event **)NULL); | 617 | p.DoLinkedList<BaseEvent, GetNewEvent, FreeEvent, Event_DoState>(first, (Event **)nullptr); |
| 618 | p.DoLinkedList<BaseEvent, GetNewTsEvent, FreeTsEvent, Event_DoState>(tsFirst, &tsLast); | 618 | p.DoLinkedList<BaseEvent, GetNewTsEvent, FreeTsEvent, Event_DoState>(tsFirst, &tsLast); |
| 619 | 619 | ||
| 620 | p.Do(g_clock_rate_arm11); | 620 | p.Do(g_clock_rate_arm11); |