diff options
| author | 2014-10-27 21:23:16 -0400 | |
|---|---|---|
| committer | 2014-10-27 21:23:16 -0400 | |
| commit | 19d91a45f50b95e53369444b4a34758e58e96739 (patch) | |
| tree | 04a99b93c5ed56d4cb9a2579032f5903dba3806b /src/common | |
| parent | Merge pull request #154 from lioncash/dyncom (diff) | |
| parent | Add `override` keyword through the code. (diff) | |
| download | yuzu-19d91a45f50b95e53369444b4a34758e58e96739.tar.gz yuzu-19d91a45f50b95e53369444b4a34758e58e96739.tar.xz yuzu-19d91a45f50b95e53369444b4a34758e58e96739.zip | |
Merge pull request #153 from yuriks/add-override
Add override keyword where appropriate
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/console_listener.h | 2 | ||||
| -rw-r--r-- | src/common/log_manager.h | 4 | ||||
| -rw-r--r-- | src/common/swap.h | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/common/console_listener.h b/src/common/console_listener.h index 3c0e420c6..ebd90a105 100644 --- a/src/common/console_listener.h +++ b/src/common/console_listener.h | |||
| @@ -26,7 +26,7 @@ public: | |||
| 26 | #ifdef _WIN32 | 26 | #ifdef _WIN32 |
| 27 | COORD GetCoordinates(int BytesRead, int BufferWidth); | 27 | COORD GetCoordinates(int BytesRead, int BufferWidth); |
| 28 | #endif | 28 | #endif |
| 29 | void Log(LogTypes::LOG_LEVELS, const char *Text); | 29 | void Log(LogTypes::LOG_LEVELS, const char *Text) override; |
| 30 | void ClearScreen(bool Cursor = true); | 30 | void ClearScreen(bool Cursor = true); |
| 31 | 31 | ||
| 32 | private: | 32 | private: |
diff --git a/src/common/log_manager.h b/src/common/log_manager.h index ce62d0361..de1d16ee5 100644 --- a/src/common/log_manager.h +++ b/src/common/log_manager.h | |||
| @@ -30,7 +30,7 @@ class FileLogListener : public LogListener | |||
| 30 | public: | 30 | public: |
| 31 | FileLogListener(const char *filename); | 31 | FileLogListener(const char *filename); |
| 32 | 32 | ||
| 33 | void Log(LogTypes::LOG_LEVELS, const char *msg); | 33 | void Log(LogTypes::LOG_LEVELS, const char *msg) override; |
| 34 | 34 | ||
| 35 | bool IsValid() { return !m_logfile.fail(); } | 35 | bool IsValid() { return !m_logfile.fail(); } |
| 36 | bool IsEnabled() const { return m_enable; } | 36 | bool IsEnabled() const { return m_enable; } |
| @@ -47,7 +47,7 @@ private: | |||
| 47 | class DebuggerLogListener : public LogListener | 47 | class DebuggerLogListener : public LogListener |
| 48 | { | 48 | { |
| 49 | public: | 49 | public: |
| 50 | void Log(LogTypes::LOG_LEVELS, const char *msg); | 50 | void Log(LogTypes::LOG_LEVELS, const char *msg) override; |
| 51 | }; | 51 | }; |
| 52 | 52 | ||
| 53 | class LogContainer | 53 | class LogContainer |
diff --git a/src/common/swap.h b/src/common/swap.h index 123019fd1..4f8f39efb 100644 --- a/src/common/swap.h +++ b/src/common/swap.h | |||
| @@ -85,7 +85,6 @@ public: | |||
| 85 | return *this; | 85 | return *this; |
| 86 | } | 86 | } |
| 87 | 87 | ||
| 88 | operator long() const { return (long)swap(); } | ||
| 89 | operator s8() const { return (s8)swap(); } | 88 | operator s8() const { return (s8)swap(); } |
| 90 | operator u8() const { return (u8)swap(); } | 89 | operator u8() const { return (u8)swap(); } |
| 91 | operator s16() const { return (s16)swap(); } | 90 | operator s16() const { return (s16)swap(); } |