diff options
| -rw-r--r-- | src/common/symbols.h | 2 | ||||
| -rw-r--r-- | src/common/thread.h | 2 | ||||
| -rw-r--r-- | src/core/core_timing.h | 2 | ||||
| -rw-r--r-- | src/core/file_sys/archive_romfs.cpp | 2 | ||||
| -rw-r--r-- | src/core/file_sys/archive_romfs.h | 2 | ||||
| -rw-r--r-- | src/core/file_sys/archive_sdmc.h | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/kernel.h | 2 | ||||
| -rw-r--r-- | src/core/system.h | 22 |
8 files changed, 18 insertions, 18 deletions
diff --git a/src/common/symbols.h b/src/common/symbols.h index b13a8001a..4560f5240 100644 --- a/src/common/symbols.h +++ b/src/common/symbols.h | |||
| @@ -33,5 +33,5 @@ namespace Symbols | |||
| 33 | const std::string GetName(u32 _address); | 33 | const std::string GetName(u32 _address); |
| 34 | void Remove(u32 _address); | 34 | void Remove(u32 _address); |
| 35 | void Clear(); | 35 | void Clear(); |
| 36 | }; | 36 | } |
| 37 | 37 | ||
diff --git a/src/common/thread.h b/src/common/thread.h index f7ace21b4..5e7bc1f9c 100644 --- a/src/common/thread.h +++ b/src/common/thread.h | |||
| @@ -36,7 +36,7 @@ class Event | |||
| 36 | public: | 36 | public: |
| 37 | Event() | 37 | Event() |
| 38 | : is_set(false) | 38 | : is_set(false) |
| 39 | {}; | 39 | {} |
| 40 | 40 | ||
| 41 | void Set() | 41 | void Set() |
| 42 | { | 42 | { |
diff --git a/src/core/core_timing.h b/src/core/core_timing.h index 09fdf7a90..b197cf40c 100644 --- a/src/core/core_timing.h +++ b/src/core/core_timing.h | |||
| @@ -106,4 +106,4 @@ void SetClockFrequencyMHz(int cpuMhz); | |||
| 106 | int GetClockFrequencyMHz(); | 106 | int GetClockFrequencyMHz(); |
| 107 | extern int slicelength; | 107 | extern int slicelength; |
| 108 | 108 | ||
| 109 | }; // namespace | 109 | } // namespace |
diff --git a/src/core/file_sys/archive_romfs.cpp b/src/core/file_sys/archive_romfs.cpp index 3ea60134f..551913a42 100644 --- a/src/core/file_sys/archive_romfs.cpp +++ b/src/core/file_sys/archive_romfs.cpp | |||
| @@ -41,7 +41,7 @@ std::unique_ptr<File> Archive_RomFS::OpenFile(const Path& path, const Mode mode) | |||
| 41 | bool Archive_RomFS::CreateDirectory(const Path& path) const { | 41 | bool Archive_RomFS::CreateDirectory(const Path& path) const { |
| 42 | ERROR_LOG(FILESYS, "Attempted to create a directory in ROMFS."); | 42 | ERROR_LOG(FILESYS, "Attempted to create a directory in ROMFS."); |
| 43 | return false; | 43 | return false; |
| 44 | }; | 44 | } |
| 45 | 45 | ||
| 46 | /** | 46 | /** |
| 47 | * Open a directory specified by its path | 47 | * Open a directory specified by its path |
diff --git a/src/core/file_sys/archive_romfs.h b/src/core/file_sys/archive_romfs.h index 8d5715734..b0dd421b7 100644 --- a/src/core/file_sys/archive_romfs.h +++ b/src/core/file_sys/archive_romfs.h | |||
| @@ -26,7 +26,7 @@ public: | |||
| 26 | * Get the IdCode of the archive (e.g. RomFS, SaveData, etc.) | 26 | * Get the IdCode of the archive (e.g. RomFS, SaveData, etc.) |
| 27 | * @return IdCode of the archive | 27 | * @return IdCode of the archive |
| 28 | */ | 28 | */ |
| 29 | IdCode GetIdCode() const override { return IdCode::RomFS; }; | 29 | IdCode GetIdCode() const override { return IdCode::RomFS; } |
| 30 | 30 | ||
| 31 | /** | 31 | /** |
| 32 | * Open a file specified by its path, using the specified mode | 32 | * Open a file specified by its path, using the specified mode |
diff --git a/src/core/file_sys/archive_sdmc.h b/src/core/file_sys/archive_sdmc.h index 1f621b3f7..17b9209b4 100644 --- a/src/core/file_sys/archive_sdmc.h +++ b/src/core/file_sys/archive_sdmc.h | |||
| @@ -30,7 +30,7 @@ public: | |||
| 30 | * Get the IdCode of the archive (e.g. RomFS, SaveData, etc.) | 30 | * Get the IdCode of the archive (e.g. RomFS, SaveData, etc.) |
| 31 | * @return IdCode of the archive | 31 | * @return IdCode of the archive |
| 32 | */ | 32 | */ |
| 33 | IdCode GetIdCode() const override { return IdCode::SDMC; }; | 33 | IdCode GetIdCode() const override { return IdCode::SDMC; } |
| 34 | 34 | ||
| 35 | /** | 35 | /** |
| 36 | * Open a file specified by its path, using the specified mode | 36 | * Open a file specified by its path, using the specified mode |
diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h index 867d1b89c..dd7c91d4f 100644 --- a/src/core/hle/kernel/kernel.h +++ b/src/core/hle/kernel/kernel.h | |||
| @@ -87,7 +87,7 @@ public: | |||
| 87 | delete pool[handle - HANDLE_OFFSET]; | 87 | delete pool[handle - HANDLE_OFFSET]; |
| 88 | } | 88 | } |
| 89 | return error; | 89 | return error; |
| 90 | }; | 90 | } |
| 91 | 91 | ||
| 92 | bool IsValid(Handle handle); | 92 | bool IsValid(Handle handle); |
| 93 | 93 | ||
diff --git a/src/core/system.h b/src/core/system.h index 8f8ddf87b..0be8711e4 100644 --- a/src/core/system.h +++ b/src/core/system.h | |||
| @@ -11,16 +11,16 @@ | |||
| 11 | namespace System { | 11 | namespace System { |
| 12 | 12 | ||
| 13 | // State of the full emulator | 13 | // State of the full emulator |
| 14 | typedef enum { | 14 | enum State { |
| 15 | STATE_NULL = 0, ///< System is in null state, nothing initialized | 15 | STATE_NULL = 0, ///< System is in null state, nothing initialized |
| 16 | STATE_IDLE, ///< System is in an initialized state, but not running | 16 | STATE_IDLE, ///< System is in an initialized state, but not running |
| 17 | STATE_RUNNING, ///< System is running | 17 | STATE_RUNNING, ///< System is running |
| 18 | STATE_LOADING, ///< System is loading a ROM | 18 | STATE_LOADING, ///< System is loading a ROM |
| 19 | STATE_HALTED, ///< System is halted (error) | 19 | STATE_HALTED, ///< System is halted (error) |
| 20 | STATE_STALLED, ///< System is stalled (unused) | 20 | STATE_STALLED, ///< System is stalled (unused) |
| 21 | STATE_DEBUG, ///< System is in a special debug mode (unused) | 21 | STATE_DEBUG, ///< System is in a special debug mode (unused) |
| 22 | STATE_DIE ///< System is shutting down | 22 | STATE_DIE ///< System is shutting down |
| 23 | } State; | 23 | }; |
| 24 | 24 | ||
| 25 | extern volatile State g_state; | 25 | extern volatile State g_state; |
| 26 | 26 | ||
| @@ -30,4 +30,4 @@ void RunLoopFor(int cycles); | |||
| 30 | void RunLoopUntil(u64 global_cycles); | 30 | void RunLoopUntil(u64 global_cycles); |
| 31 | void Shutdown(); | 31 | void Shutdown(); |
| 32 | 32 | ||
| 33 | }; | 33 | } |