Remove redundant semicolons

Fix "-Wextra-semi" warnings
This commit is contained in:
scribam 2019-05-11 10:14:56 +02:00 committed by Ivan
parent 1f82a26a9c
commit 6c5ea068c9
25 changed files with 62 additions and 62 deletions

View File

@ -58,12 +58,12 @@ namespace utils
return (start1 >= start2 && end1 <= end2); return (start1 >= start2 && end1 <= end2);
} }
address_range(u32 _start, u32 _end) : start(_start), end(_end) {}; address_range(u32 _start, u32 _end) : start(_start), end(_end) {}
public: public:
// Constructors // Constructors
address_range() = default; address_range() = default;
address_range(const address_range &other) : start(other.start), end(other.end) {}; address_range(const address_range &other) : start(other.start), end(other.end) {}
static inline address_range start_length(u32 _start, u32 _length) static inline address_range start_length(u32 _start, u32 _length)
{ {

View File

@ -95,7 +95,7 @@ public:
bool trunc(u64 length) override bool trunc(u64 length) override
{ {
return true; return true;
}; }
u64 read(void* buffer, u64 size) override u64 read(void* buffer, u64 size) override
{ {
u64 bytesRead = ReadData(pos, (u8*)buffer, size); u64 bytesRead = ReadData(pos, (u8*)buffer, size);

View File

@ -24,10 +24,10 @@ public:
OpenALBackend(); OpenALBackend();
virtual ~OpenALBackend() override; virtual ~OpenALBackend() override;
virtual const char* GetName() const override { return "OpenAL"; }; virtual const char* GetName() const override { return "OpenAL"; }
static const u32 capabilities = PLAY_PAUSE_FLUSH | IS_PLAYING | GET_NUM_ENQUEUED_SAMPLES | SET_FREQUENCY_RATIO; static const u32 capabilities = PLAY_PAUSE_FLUSH | IS_PLAYING | GET_NUM_ENQUEUED_SAMPLES | SET_FREQUENCY_RATIO;
virtual u32 GetCapabilities() const override { return capabilities; }; virtual u32 GetCapabilities() const override { return capabilities; }
virtual void Open(u32 num_buffers) override; virtual void Open(u32 num_buffers) override;
virtual void Close() override; virtual void Close() override;

View File

@ -16,10 +16,10 @@ public:
ALSABackend(); ALSABackend();
virtual ~ALSABackend() override; virtual ~ALSABackend() override;
virtual const char* GetName() const override { return "ALSA"; }; virtual const char* GetName() const override { return "ALSA"; }
static const u32 capabilities = 0; static const u32 capabilities = 0;
virtual u32 GetCapabilities() const override { return capabilities; }; virtual u32 GetCapabilities() const override { return capabilities; }
virtual void Open(u32) override; virtual void Open(u32) override;
virtual void Close() override; virtual void Close() override;

View File

@ -8,17 +8,17 @@ public:
NullAudioBackend() {} NullAudioBackend() {}
virtual ~NullAudioBackend() {} virtual ~NullAudioBackend() {}
virtual const char* GetName() const override { return "Null"; } virtual const char* GetName() const override { return "Null"; }
static const u32 capabilities = PLAY_PAUSE_FLUSH; static const u32 capabilities = PLAY_PAUSE_FLUSH;
virtual u32 GetCapabilities() const override { return capabilities; }; virtual u32 GetCapabilities() const override { return capabilities; }
virtual void Open(u32) override {}; virtual void Open(u32) override {}
virtual void Close() override {}; virtual void Close() override {}
virtual void Play() override {}; virtual void Play() override {}
virtual void Pause() override {}; virtual void Pause() override {}
virtual bool AddData(const void*, u32) override { return true; }; virtual bool AddData(const void*, u32) override { return true; }
virtual void Flush() override {}; virtual void Flush() override {}
}; };

View File

@ -10,10 +10,10 @@ public:
PulseBackend(); PulseBackend();
virtual ~PulseBackend() override; virtual ~PulseBackend() override;
virtual const char* GetName() const override { return "Pulse"; }; virtual const char* GetName() const override { return "Pulse"; }
static const u32 capabilities = 0; static const u32 capabilities = 0;
virtual u32 GetCapabilities() const override { return capabilities; }; virtual u32 GetCapabilities() const override { return capabilities; }
virtual void Open(u32) override; virtual void Open(u32) override;
virtual void Close() override; virtual void Close() override;

View File

@ -89,7 +89,7 @@ struct CellSyncBarrier
} }
return true; return true;
}; }
static inline bool try_wait(ctrl_t& ctrl) static inline bool try_wait(ctrl_t& ctrl)
{ {

View File

@ -259,7 +259,7 @@ struct Pad
struct cfg_player final : cfg::node struct cfg_player final : cfg::node
{ {
pad_handler def_handler = pad_handler::null; pad_handler def_handler = pad_handler::null;
cfg_player(node* owner, const std::string& name, pad_handler type) : cfg::node(owner, name), def_handler(type) {}; cfg_player(node* owner, const std::string& name, pad_handler type) : cfg::node(owner, name), def_handler(type) {}
cfg::_enum<pad_handler> handler{ this, "Handler", def_handler }; cfg::_enum<pad_handler> handler{ this, "Handler", def_handler };
cfg::string device{ this, "Device", handler.to_string() }; cfg::string device{ this, "Device", handler.to_string() };
@ -288,12 +288,12 @@ struct cfg_input final : cfg::node
} }
return false; return false;
}; }
void save() void save()
{ {
fs::file(cfg_name, fs::rewrite).write(to_string()); fs::file(cfg_name, fs::rewrite).write(to_string());
}; }
}; };
extern cfg_input g_cfg_input; extern cfg_input g_cfg_input;
@ -463,13 +463,13 @@ public:
static std::string get_config_dir(pad_handler type); static std::string get_config_dir(pad_handler type);
static std::string get_config_filename(int i); static std::string get_config_filename(int i);
virtual bool Init() { return true; }; virtual bool Init() { return true; }
PadHandlerBase(pad_handler type = pad_handler::null); PadHandlerBase(pad_handler type = pad_handler::null);
virtual ~PadHandlerBase() = default; virtual ~PadHandlerBase() = default;
//Sets window to config the controller(optional) //Sets window to config the controller(optional)
virtual void GetNextButtonPress(const std::string& /*padId*/, const std::function<void(u16, std::string, std::string, int[])>& /*callback*/, const std::function<void(std::string)>& /*fail_callback*/, bool /*get_blacklist*/ = false, const std::vector<std::string>& /*buttons*/ = {}) {}; virtual void GetNextButtonPress(const std::string& /*padId*/, const std::function<void(u16, std::string, std::string, int[])>& /*callback*/, const std::function<void(std::string)>& /*fail_callback*/, bool /*get_blacklist*/ = false, const std::vector<std::string>& /*buttons*/ = {}) {}
virtual void TestVibration(const std::string& /*padId*/, u32 /*largeMotor*/, u32 /*smallMotor*/) {}; virtual void TestVibration(const std::string& /*padId*/, u32 /*largeMotor*/, u32 /*smallMotor*/) {}
virtual void SetLED(const std::string& /*padId*/, s32 /*r*/, s32 /*g*/, s32 /*b*/){}; virtual void SetLED(const std::string& /*padId*/, s32 /*r*/, s32 /*g*/, s32 /*b*/) {}
//Return list of devices for that handler //Return list of devices for that handler
virtual std::vector<std::string> ListDevices() = 0; virtual std::vector<std::string> ListDevices() = 0;
//Callback called during pad_thread::ThreadFunc //Callback called during pad_thread::ThreadFunc
@ -479,7 +479,7 @@ public:
virtual void init_config(pad_config* /*cfg*/, const std::string& /*name*/) = 0; virtual void init_config(pad_config* /*cfg*/, const std::string& /*name*/) = 0;
private: private:
virtual void TranslateButtonPress(u64 /*keyCode*/, bool& /*pressed*/, u16& /*val*/, bool /*ignore_threshold*/ = false) {}; virtual void TranslateButtonPress(u64 /*keyCode*/, bool& /*pressed*/, u16& /*val*/, bool /*ignore_threshold*/ = false) {}
protected: protected:
void init_configs(); void init_configs();

View File

@ -979,7 +979,7 @@ bool FragmentProgramDecompiler::handle_tex_srb(u32 opcode)
case RSX_FP_OPCODE_UPB: SetDst("(unpackUnorm4x8(floatBitsToUint($0.x)))"); return true; case RSX_FP_OPCODE_UPB: SetDst("(unpackUnorm4x8(floatBitsToUint($0.x)))"); return true;
} }
return false; return false;
}; }
std::string FragmentProgramDecompiler::Decompile() std::string FragmentProgramDecompiler::Decompile()
{ {

View File

@ -317,7 +317,7 @@ public:
{ {
free(pair.first.addr); free(pair.first.addr);
} }
}; }
const vertex_program_type& get_transform_program(const RSXVertexProgram& rsx_vp) const const vertex_program_type& get_transform_program(const RSXVertexProgram& rsx_vp) const
{ {

View File

@ -266,7 +266,7 @@ namespace rsx
return 1; return 1;
default: default:
return 2; return 2;
}; }
} }
public: public:

View File

@ -342,7 +342,7 @@ namespace rsx
// Constructors // Constructors
texture_cache_predictor(texture_cache_type* tex_cache) texture_cache_predictor(texture_cache_type* tex_cache)
: m_tex_cache(tex_cache){}; : m_tex_cache(tex_cache) {}
~texture_cache_predictor() = default; ~texture_cache_predictor() = default;
// Trait wrappers // Trait wrappers
@ -413,4 +413,4 @@ namespace std
return result; return result;
} }
}; };
}; // namespace std } // namespace std

View File

@ -57,7 +57,7 @@ namespace
case rsx::comparison_function::greater_or_equal: return GL_GEQUAL; case rsx::comparison_function::greater_or_equal: return GL_GEQUAL;
case rsx::comparison_function::always: return GL_ALWAYS; case rsx::comparison_function::always: return GL_ALWAYS;
} }
fmt::throw_exception("Unsupported comparison op 0x%X" HERE, (u32)op);; fmt::throw_exception("Unsupported comparison op 0x%X" HERE, (u32)op);
} }
GLenum stencil_op(rsx::stencil_op op) GLenum stencil_op(rsx::stencil_op op)

View File

@ -174,5 +174,5 @@ public:
void flip(int buffer, bool emu_flip = false) override; void flip(int buffer, bool emu_flip = false) override;
GSFrameBase* get_frame() { return m_frame; }; GSFrameBase* get_frame() { return m_frame; }
}; };

View File

@ -760,8 +760,8 @@ namespace rsx
* TODO: It's more efficient to combine multiple call of this function into one. * TODO: It's more efficient to combine multiple call of this function into one.
*/ */
virtual std::array<std::vector<gsl::byte>, 4> copy_render_targets_to_memory() { virtual std::array<std::vector<gsl::byte>, 4> copy_render_targets_to_memory() {
return std::array<std::vector<gsl::byte>, 4>(); return std::array<std::vector<gsl::byte>, 4>();
}; }
/** /**
* Copy depth and stencil content to buffers. * Copy depth and stencil content to buffers.
@ -769,11 +769,11 @@ namespace rsx
*/ */
virtual std::array<std::vector<gsl::byte>, 2> copy_depth_stencil_buffer_to_memory() { virtual std::array<std::vector<gsl::byte>, 2> copy_depth_stencil_buffer_to_memory() {
return std::array<std::vector<gsl::byte>, 2>(); return std::array<std::vector<gsl::byte>, 2>();
}; }
virtual std::pair<std::string, std::string> get_programs() const { return std::make_pair("", ""); }; virtual std::pair<std::string, std::string> get_programs() const { return std::make_pair("", ""); }
virtual bool scaled_image_from_memory(blit_src_info& /*src_info*/, blit_dst_info& /*dst_info*/, bool /*interpolate*/){ return false; } virtual bool scaled_image_from_memory(blit_src_info& /*src_info*/, blit_dst_info& /*dst_info*/, bool /*interpolate*/) { return false; }
public: public:
void reset(); void reset();

View File

@ -263,7 +263,7 @@ namespace vk
default: default:
fmt::throw_exception("Unknown blend factor 0x%x" HERE, (u32)factor); fmt::throw_exception("Unknown blend factor 0x%x" HERE, (u32)factor);
} }
}; }
VkBlendOp get_blend_op(rsx::blend_equation op) VkBlendOp get_blend_op(rsx::blend_equation op)
{ {
@ -2162,7 +2162,7 @@ void VKGSRender::clear_surface(u32 mask)
default: default:
use_fast_clear = (colormask == (0x10 | 0x20 | 0x40 | 0x80)); use_fast_clear = (colormask == (0x10 | 0x20 | 0x40 | 0x80));
break; break;
}; }
if (!ignore_clear) if (!ignore_clear)
{ {

View File

@ -247,7 +247,7 @@ namespace vk
vmaCreateAllocator(&allocatorInfo, &m_allocator); vmaCreateAllocator(&allocatorInfo, &m_allocator);
} }
~mem_allocator_vma() {}; ~mem_allocator_vma() {}
void destroy() override void destroy() override
{ {
@ -314,10 +314,10 @@ namespace vk
class mem_allocator_vk : public mem_allocator_base class mem_allocator_vk : public mem_allocator_base
{ {
public: public:
mem_allocator_vk(VkDevice dev, VkPhysicalDevice pdev) : mem_allocator_base(dev, pdev) {}; mem_allocator_vk(VkDevice dev, VkPhysicalDevice pdev) : mem_allocator_base(dev, pdev) {}
~mem_allocator_vk() {}; ~mem_allocator_vk() {}
void destroy() override {}; void destroy() override {}
mem_handle_t alloc(u64 block_sz, u64 /*alignment*/, uint32_t memory_type_index) override mem_handle_t alloc(u64 block_sz, u64 /*alignment*/, uint32_t memory_type_index) override
{ {

View File

@ -83,8 +83,8 @@ namespace rsx
public: public:
buffered_section() {}; buffered_section() {}
~buffered_section() {}; ~buffered_section() {}
void reset(const address_range &memory_range) void reset(const address_range &memory_range)
{ {
@ -489,7 +489,7 @@ namespace rsx
} }
virtual void refresh() virtual void refresh()
{}; {}
virtual void close() virtual void close()
{ {
@ -863,7 +863,7 @@ namespace rsx
class default_vertex_cache class default_vertex_cache
{ {
public: public:
virtual ~default_vertex_cache() {}; virtual ~default_vertex_cache() {}
virtual storage_type* find_vertex_range(uintptr_t /*local_addr*/, upload_format, u32 /*data_length*/) { return nullptr; } virtual storage_type* find_vertex_range(uintptr_t /*local_addr*/, upload_format, u32 /*data_length*/) { return nullptr; }
virtual void store_range(uintptr_t /*local_addr*/, upload_format, u32 /*data_length*/, u32 /*offset_in_heap*/) {} virtual void store_range(uintptr_t /*local_addr*/, upload_format, u32 /*data_length*/, u32 /*offset_in_heap*/) {}
virtual void purge() {} virtual void purge() {}

View File

@ -4209,7 +4209,7 @@ struct registers_decoder<NV4097_NO_OPERATION>
{ {
struct decoded_type struct decoded_type
{ {
decoded_type(u32) {}; decoded_type(u32) {}
}; };
static std::string dump(u32 &&) static std::string dump(u32 &&)
@ -4223,7 +4223,7 @@ struct registers_decoder<NV4097_INVALIDATE_VERTEX_CACHE_FILE>
{ {
struct decoded_type struct decoded_type
{ {
decoded_type(u32) {}; decoded_type(u32) {}
}; };
static std::string dump(u32 &&) static std::string dump(u32 &&)
@ -4237,7 +4237,7 @@ struct registers_decoder<NV4097_INVALIDATE_VERTEX_FILE>
{ {
struct decoded_type struct decoded_type
{ {
decoded_type(u32) {}; decoded_type(u32) {}
}; };
static std::string dump(u32 &&) static std::string dump(u32 &&)

View File

@ -746,7 +746,7 @@ namespace rsx
atomic_t<bitmask_type> m_data; atomic_t<bitmask_type> m_data;
public: public:
atomic_bitmask_t() { m_data.store(0); }; atomic_bitmask_t() { m_data.store(0); }
~atomic_bitmask_t() {} ~atomic_bitmask_t() {}
T load() const T load() const

View File

@ -41,7 +41,7 @@ class pup_object
public: public:
pup_object(const fs::file& file); pup_object(const fs::file& file);
explicit operator bool() const { return isValid; }; explicit operator bool() const { return isValid; }
fs::file get_file(u64 entry_id); fs::file get_file(u64 entry_id);
}; };

View File

@ -153,10 +153,10 @@ public:
bool supported = true; bool supported = true;
bool has_adapters = true; bool has_adapters = true;
Render_Info() {}; Render_Info() {}
Render_Info(const QString& name) : name(name), has_adapters(false) {}; Render_Info(const QString& name) : name(name), has_adapters(false) {}
Render_Info(const QString& name, const QStringList& adapters, bool supported, SettingsType type) Render_Info(const QString& name, const QStringList& adapters, bool supported, SettingsType type)
: name(name), adapters(adapters), supported(supported), type(type) {}; : name(name), adapters(adapters), supported(supported), type(type) {}
}; };
struct Render_Creator struct Render_Creator

View File

@ -19,14 +19,14 @@ struct gui_save
key = ""; key = "";
name = ""; name = "";
def = QVariant(); def = QVariant();
}; }
gui_save(const QString& k, const QString& n, const QVariant& d) gui_save(const QString& k, const QString& n, const QVariant& d)
{ {
key = k; key = k;
name = n; name = n;
def = d; def = d;
}; }
}; };
typedef std::map<std::string, const QString> q_from_char; typedef std::map<std::string, const QString> q_from_char;

View File

@ -9,7 +9,7 @@
class trophy_notification_helper : public TrophyNotificationBase class trophy_notification_helper : public TrophyNotificationBase
{ {
public: public:
trophy_notification_helper(QWindow* game_window) : m_game_window(game_window) { }; trophy_notification_helper(QWindow* game_window) : m_game_window(game_window) { }
s32 ShowTrophyNotification(const SceNpTrophyDetails& trophy, const std::vector<uchar>& trophy_icon_buffer) override; s32 ShowTrophyNotification(const SceNpTrophyDetails& trophy, const std::vector<uchar>& trophy_icon_buffer) override;
private: private:
QWindow* m_game_window; QWindow* m_game_window;

View File

@ -13,9 +13,9 @@ class UserAccount
public: public:
explicit UserAccount(const std::string& user_id = "00000001"); explicit UserAccount(const std::string& user_id = "00000001");
std::string GetUserId() { return m_user_id; }; std::string GetUserId() { return m_user_id; }
std::string GetUserDir() { return m_user_dir; }; std::string GetUserDir() { return m_user_dir; }
std::string GetUsername() { return m_username; }; std::string GetUsername() { return m_username; }
~UserAccount(); ~UserAccount();
private: private: