diff options
| author | 2016-09-21 00:21:23 +0900 | |
|---|---|---|
| committer | 2016-09-21 11:15:47 +0900 | |
| commit | ebdae19fd226104baec712b9da9939ff82ef3c3a (patch) | |
| tree | e046c0f562fc4400480b2e3257f140e973a9ce6a /src/core/core_timing.h | |
| parent | Manually tweak source formatting and then re-run clang-format (diff) | |
| download | yuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.tar.gz yuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.tar.xz yuzu-ebdae19fd226104baec712b9da9939ff82ef3c3a.zip | |
Remove empty newlines in #include blocks.
This makes clang-format useful on those.
Also add a bunch of forgotten transitive includes, which otherwise
prevented compilation.
Diffstat (limited to 'src/core/core_timing.h')
| -rw-r--r-- | src/core/core_timing.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/core/core_timing.h b/src/core/core_timing.h index 64fd8dcd0..b72a1b500 100644 --- a/src/core/core_timing.h +++ b/src/core/core_timing.h | |||
| @@ -4,7 +4,9 @@ | |||
| 4 | 4 | ||
| 5 | #pragma once | 5 | #pragma once |
| 6 | 6 | ||
| 7 | #include <functional> | ||
| 7 | #include <string> | 8 | #include <string> |
| 9 | #include "common/common_types.h" | ||
| 8 | 10 | ||
| 9 | // This is a system to schedule events into the emulated machine's future. Time is measured | 11 | // This is a system to schedule events into the emulated machine's future. Time is measured |
| 10 | // in main CPU clock cycles. | 12 | // in main CPU clock cycles. |
| @@ -19,10 +21,6 @@ | |||
| 19 | // inside callback: | 21 | // inside callback: |
| 20 | // ScheduleEvent(periodInCycles - cycles_late, callback, "whatever") | 22 | // ScheduleEvent(periodInCycles - cycles_late, callback, "whatever") |
| 21 | 23 | ||
| 22 | #include <functional> | ||
| 23 | |||
| 24 | #include "common/common_types.h" | ||
| 25 | |||
| 26 | extern int g_clock_rate_arm11; | 24 | extern int g_clock_rate_arm11; |
| 27 | 25 | ||
| 28 | inline s64 msToCycles(int ms) { | 26 | inline s64 msToCycles(int ms) { |