diff options
| author |  bunnei | 2014-06-06 00:35:49 -0400 |
|---|---|---|
| committer | bunnei | 2014-06-13 09:51:13 -0400 |
| commit | c95972275e276abe3afcac79d956ea29a0879c8e (patch) | |
| tree | f902b895aa25142f94001674baedfdac9794d548 /src/core/core.cpp | |
| parent | Kernel: Updated various kernel function "name" arguments to be const references. (diff) | |
| download | yuzu-c95972275e276abe3afcac79d956ea29a0879c8e.tar.gz yuzu-c95972275e276abe3afcac79d956ea29a0879c8e.tar.xz yuzu-c95972275e276abe3afcac79d956ea29a0879c8e.zip | |
HLE: Updated all uses of NULL to nullptr (to be C++11 compliant)
Diffstat (limited to 'src/core/core.cpp')
| -rw-r--r-- | src/core/core.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 26d52f7be..d366498a5 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp | |||
| @@ -18,10 +18,10 @@ | |||
| 18 | 18 | ||
| 19 | namespace Core { | 19 | namespace Core { |
| 20 | 20 | ||
| 21 | u64 g_last_ticks = 0; ///< Last CPU ticks | 21 | u64 g_last_ticks = 0; ///< Last CPU ticks |
| 22 | ARM_Disasm* g_disasm = NULL; ///< ARM disassembler | 22 | ARM_Disasm* g_disasm = nullptr; ///< ARM disassembler |
| 23 | ARM_Interface* g_app_core = NULL; ///< ARM11 application core | 23 | ARM_Interface* g_app_core = nullptr; ///< ARM11 application core |
| 24 | ARM_Interface* g_sys_core = NULL; ///< ARM11 system (OS) core | 24 | ARM_Interface* g_sys_core = nullptr; ///< ARM11 system (OS) core |
| 25 | 25 | ||
| 26 | /// Run the core CPU loop | 26 | /// Run the core CPU loop |
| 27 | void RunLoop() { | 27 | void RunLoop() { |