diff options
| author |  Yuri Kunde Schlesner | 2017-01-29 15:40:50 -0800 |
|---|---|---|
| committer |  GitHub | 2017-01-29 15:40:50 -0800 |
| commit | 5bb6753f2edd7cd8727db8ed9f820fb7c571a3ac (patch) | |
| tree | 15ae7583dba1d3cf2f6ca1bf5dd263eff8e91cdc | |
| parent | Merge pull request #2492 from Kloen/killing-warnings-HD1.5ReMIX (diff) | |
| parent | core: inline CPU, 132 warnings fixed on GCC (diff) | |
| download | yuzu-5bb6753f2edd7cd8727db8ed9f820fb7c571a3ac.tar.gz yuzu-5bb6753f2edd7cd8727db8ed9f820fb7c571a3ac.tar.xz yuzu-5bb6753f2edd7cd8727db8ed9f820fb7c571a3ac.zip | |
Merge pull request #2494 from Kloen/killing-warnings-2-final-mix
core: inline CPU, 132 warnings fixed on GCC
| -rw-r--r-- | src/core/core.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/core.h b/src/core/core.h index 1015e8847..17572a74f 100644 --- a/src/core/core.h +++ b/src/core/core.h | |||
| @@ -115,7 +115,7 @@ private: | |||
| 115 | static System s_instance; | 115 | static System s_instance; |
| 116 | }; | 116 | }; |
| 117 | 117 | ||
| 118 | static ARM_Interface& CPU() { | 118 | inline ARM_Interface& CPU() { |
| 119 | return System::GetInstance().CPU(); | 119 | return System::GetInstance().CPU(); |
| 120 | } | 120 | } |
| 121 | 121 | ||