diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2017-01-29 15:40:50 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-29 15:40:50 -0800 |
| commit | 5bb6753f2edd7cd8727db8ed9f820fb7c571a3ac (patch) | |
| tree | 15ae7583dba1d3cf2f6ca1bf5dd263eff8e91cdc /src/core | |
| parent | f111cd66cec3e03ce9e7236a0325f1e0b2c59855 (diff) | |
| parent | b3a0b1489b662a65b9cf3f96510436eb2974e443 (diff) | |
Merge pull request #2494 from Kloen/killing-warnings-2-final-mix
core: inline CPU, 132 warnings fixed on GCC
Diffstat (limited to 'src/core')
| -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: static System s_instance; }; -static ARM_Interface& CPU() { +inline ARM_Interface& CPU() { return System::GetInstance().CPU(); } |