Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add error on missing 'override' #9785

Merged
merged 1 commit into from Feb 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions Utilities/JIT.h
Expand Up @@ -177,6 +177,10 @@ inline FT build_function_asm(F&& builder)
#pragma GCC diagnostic ignored "-Wall"
#pragma GCC diagnostic ignored "-Wextra"
#pragma GCC diagnostic ignored "-Wold-style-cast"
#pragma GCC diagnostic ignored "-Wsuggest-override"
#ifdef __clang__
#pragma clang diagnostic ignored "-Winconsistent-missing-override"
#endif
#endif
#include "llvm/IR/LLVMContext.h"
#include "llvm/IR/Module.h"
Expand Down
2 changes: 1 addition & 1 deletion rpcs3/Emu/Cell/PPCDisAsm.h
Expand Up @@ -9,7 +9,7 @@ class PPCDisAsm : public CPUDisAsm
{
}

virtual u32 DisAsmBranchTarget(const s32 imm)=0;
virtual u32 DisAsmBranchTarget(const s32 imm) override = 0;

void DisAsm_V4(const std::string& op, u32 v0, u32 v1, u32 v2, u32 v3)
{
Expand Down
4 changes: 4 additions & 0 deletions rpcs3/Emu/RSX/VK/VKCommonDecompiler.cpp
Expand Up @@ -8,6 +8,10 @@
#pragma GCC diagnostic ignored "-Wall"
#pragma GCC diagnostic ignored "-Wextra"
#pragma GCC diagnostic ignored "-Wold-style-cast"
#pragma GCC diagnostic ignored "-Wsuggest-override"
#ifdef __clang__
#pragma clang diagnostic ignored "-Winconsistent-missing-override"
#endif
#endif
#include "SPIRV/GlslangToSpv.h"
#include "spirv-tools/optimizer.hpp"
Expand Down
4 changes: 4 additions & 0 deletions rpcs3/Emu/RSX/VK/VKMemAlloc.cpp
Expand Up @@ -43,6 +43,10 @@ class VmaRWMutex
#pragma GCC diagnostic ignored "-Wextra"
#pragma GCC diagnostic ignored "-Wold-style-cast"
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wsuggest-override"
#ifdef __clang__
#pragma clang diagnostic ignored "-Winconsistent-missing-override"
#endif
#endif
#include "3rdparty/GPUOpen/include/vk_mem_alloc.h"
#ifdef _MSC_VER
Expand Down
6 changes: 6 additions & 0 deletions rpcs3/cmake_modules/ConfigureCompiler.cmake
Expand Up @@ -33,6 +33,12 @@ else()
add_compile_options(-Werror=return-type)
add_compile_options(-Werror=overloaded-virtual)

if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
add_compile_options(-Werror=inconsistent-missing-override)
else()
add_compile_options(-Werror=suggest-override)
endif()

#TODO Clean the code so these are removed
add_compile_options(-Wno-attributes)

Expand Down
2 changes: 1 addition & 1 deletion rpcs3/rpcs3qt/custom_table_widget_item.h
Expand Up @@ -14,7 +14,7 @@ class custom_table_widget_item : public QTableWidgetItem
custom_table_widget_item(const std::string& text, int sort_role = Qt::DisplayRole, const QVariant& sort_value = 0);
custom_table_widget_item(const QString& text, int sort_role = Qt::DisplayRole, const QVariant& sort_value = 0);

bool operator<(const QTableWidgetItem& other) const;
bool operator<(const QTableWidgetItem& other) const override;

void setData(int role, const QVariant& value, bool assign_sort_role);
};
2 changes: 1 addition & 1 deletion rpcs3/rpcs3qt/log_frame.cpp
Expand Up @@ -51,7 +51,7 @@ struct gui_listener : logs::listener
{
}

void log(u64 stamp, const logs::message& msg, const std::string& prefix, const std::string& text)
void log(u64 stamp, const logs::message& msg, const std::string& prefix, const std::string& text) override
{
Q_UNUSED(stamp);

Expand Down