summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2014-10-27 21:23:16 -0400
committerbunnei <bunneidev@gmail.com>2014-10-27 21:23:16 -0400
commit19d91a45f50b95e53369444b4a34758e58e96739 (patch)
tree04a99b93c5ed56d4cb9a2579032f5903dba3806b /src/common
parentae311eb3ef835307dbec4de4d3101bb23cf4c326 (diff)
parentd72708c1f58225f50c5ddecbd6f51580a2d9690b (diff)
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.h2
-rw-r--r--src/common/log_manager.h4
-rw-r--r--src/common/swap.h1
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:
#ifdef _WIN32
COORD GetCoordinates(int BytesRead, int BufferWidth);
#endif
- void Log(LogTypes::LOG_LEVELS, const char *Text);
+ void Log(LogTypes::LOG_LEVELS, const char *Text) override;
void ClearScreen(bool Cursor = true);
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
public:
FileLogListener(const char *filename);
- void Log(LogTypes::LOG_LEVELS, const char *msg);
+ void Log(LogTypes::LOG_LEVELS, const char *msg) override;
bool IsValid() { return !m_logfile.fail(); }
bool IsEnabled() const { return m_enable; }
@@ -47,7 +47,7 @@ private:
class DebuggerLogListener : public LogListener
{
public:
- void Log(LogTypes::LOG_LEVELS, const char *msg);
+ void Log(LogTypes::LOG_LEVELS, const char *msg) override;
};
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:
return *this;
}
- operator long() const { return (long)swap(); }
operator s8() const { return (s8)swap(); }
operator u8() const { return (u8)swap(); }
operator s16() const { return (s16)swap(); }