summaryrefslogtreecommitdiff
path: root/src/os
diff options
context:
space:
mode:
authorHenry Wilson <m3henry@googlemail.com>2019-03-03 22:25:13 +0000
committerMichael Lutz <michi@icosahedron.de>2019-03-24 16:10:04 +0100
commitaf7d9020a15c1b1a14b3981ac73c70d2e58cc877 (patch)
tree1dcff3e01382ea3a0a4733a4637659dbbfd4bad5 /src/os
parent31260e66252fb4d0dda6f992520faeeb96929cfe (diff)
downloadopenttd-af7d9020a15c1b1a14b3981ac73c70d2e58cc877.tar.xz
Codechange: Use override specifer for overriding member declarations
This is a C++11 feature that allows the compiler to check that a virtual member declaration overrides a base-class member with the same signature. Also src/blitter/32bpp_anim_sse4.hpp +38 is no longer erroneously marked as virtual despite being a template.
Diffstat (limited to 'src/os')
-rw-r--r--src/os/macosx/crashlog_osx.cpp6
-rw-r--r--src/os/unix/crashlog_unix.cpp6
-rw-r--r--src/os/windows/crashlog_win.cpp12
3 files changed, 12 insertions, 12 deletions
diff --git a/src/os/macosx/crashlog_osx.cpp b/src/os/macosx/crashlog_osx.cpp
index ad258bbc9..c1b321340 100644
--- a/src/os/macosx/crashlog_osx.cpp
+++ b/src/os/macosx/crashlog_osx.cpp
@@ -52,7 +52,7 @@ class CrashLogOSX : public CrashLog {
char filename_save[MAX_PATH]; ///< Path of crash.sav
char filename_screenshot[MAX_PATH]; ///< Path of crash.(png|bmp|pcx)
- /* virtual */ char *LogOSVersion(char *buffer, const char *last) const
+ char *LogOSVersion(char *buffer, const char *last) const override
{
int ver_maj, ver_min, ver_bug;
GetMacOSVersion(&ver_maj, &ver_min, &ver_bug);
@@ -71,7 +71,7 @@ class CrashLogOSX : public CrashLog {
);
}
- /* virtual */ char *LogError(char *buffer, const char *last, const char *message) const
+ char *LogError(char *buffer, const char *last, const char *message) const override
{
return buffer + seprintf(buffer, last,
"Crash reason:\n"
@@ -83,7 +83,7 @@ class CrashLogOSX : public CrashLog {
);
}
- /* virtual */ char *LogStacktrace(char *buffer, const char *last) const
+ char *LogStacktrace(char *buffer, const char *last) const override
{
/* As backtrace() is only implemented in 10.5 or later,
* we're rolling our own here. Mostly based on
diff --git a/src/os/unix/crashlog_unix.cpp b/src/os/unix/crashlog_unix.cpp
index 47de057f7..2e9f4215f 100644
--- a/src/os/unix/crashlog_unix.cpp
+++ b/src/os/unix/crashlog_unix.cpp
@@ -40,7 +40,7 @@ class CrashLogUnix : public CrashLog {
/** Signal that has been thrown. */
int signum;
- /* virtual */ char *LogOSVersion(char *buffer, const char *last) const
+ char *LogOSVersion(char *buffer, const char *last) const override
{
struct utsname name;
if (uname(&name) < 0) {
@@ -60,7 +60,7 @@ class CrashLogUnix : public CrashLog {
);
}
- /* virtual */ char *LogError(char *buffer, const char *last, const char *message) const
+ char *LogError(char *buffer, const char *last, const char *message) const override
{
return buffer + seprintf(buffer, last,
"Crash reason:\n"
@@ -105,7 +105,7 @@ class CrashLogUnix : public CrashLog {
}
#endif
- /* virtual */ char *LogStacktrace(char *buffer, const char *last) const
+ char *LogStacktrace(char *buffer, const char *last) const override
{
buffer += seprintf(buffer, last, "Stacktrace:\n");
#if defined(__GLIBC__)
diff --git a/src/os/windows/crashlog_win.cpp b/src/os/windows/crashlog_win.cpp
index 1abb0e725..6bcaed837 100644
--- a/src/os/windows/crashlog_win.cpp
+++ b/src/os/windows/crashlog_win.cpp
@@ -43,14 +43,14 @@ class CrashLogWindows : public CrashLog {
/** Information about the encountered exception */
EXCEPTION_POINTERS *ep;
- /* virtual */ char *LogOSVersion(char *buffer, const char *last) const;
- /* virtual */ char *LogError(char *buffer, const char *last, const char *message) const;
- /* virtual */ char *LogStacktrace(char *buffer, const char *last) const;
- /* virtual */ char *LogRegisters(char *buffer, const char *last) const;
- /* virtual */ char *LogModules(char *buffer, const char *last) const;
+ char *LogOSVersion(char *buffer, const char *last) const override;
+ char *LogError(char *buffer, const char *last, const char *message) const override;
+ char *LogStacktrace(char *buffer, const char *last) const override;
+ char *LogRegisters(char *buffer, const char *last) const override;
+ char *LogModules(char *buffer, const char *last) const override;
public:
#if defined(_MSC_VER)
- /* virtual */ int WriteCrashDump(char *filename, const char *filename_last) const;
+ int WriteCrashDump(char *filename, const char *filename_last) const override;
char *AppendDecodedStacktrace(char *buffer, const char *last) const;
#else
char *AppendDecodedStacktrace(char *buffer, const char *last) const { return buffer; }