fix building with clang 6.0.1 (nw)

This commit is contained in:
smf- 2018-07-07 11:25:52 +01:00
parent 32ee215a38
commit b747b711bb
11 changed files with 18 additions and 20 deletions

View File

@ -1017,6 +1017,11 @@ end
"-Wno-ignored-qualifiers"
}
end
if (version >= 60000) then
buildoptions {
"-Wno-pragma-pack" -- clang 6.0 complains when the packing change lifetime is not contained within a header file.
}
end
else
if (version < 50000) then
print("GCC version 5.0 or later needed")

View File

@ -471,15 +471,6 @@ void arm7_cpu_device::cfunc_unimplemented()
void arm7_cpu_device::static_generate_entry_point()
{
drcuml_state *drcuml = m_impstate.drcuml;
uml::code_label nodabt;
uml::code_label nofiq;
uml::code_label noirq;
uml::code_label irq32;
uml::code_label nopabd;
uml::code_label nound;
uml::code_label swi32;
uml::code_label irqadjust;
uml::code_label done;
drcuml_block &block(drcuml->begin_block(110));
@ -1160,8 +1151,6 @@ void arm7_cpu_device::generate_update_cycles(drcuml_block &block, compiler_state
/* check full interrupts if pending */
if (compiler.checkints)
{
uml::code_label skip;
compiler.checkints = false;
UML_CALLH(block, *m_impstate.check_irq);
}

View File

@ -470,7 +470,6 @@ void arm7_cpu_device::drctg04_00_04(drcuml_block &block, compiler_state &compile
uint32_t rs = (op & THUMB_ADDSUB_RS) >> THUMB_ADDSUB_RS_SHIFT;
uint32_t rd = (op & THUMB_ADDSUB_RD) >> THUMB_ADDSUB_RD_SHIFT;
uml::code_label skip;
uml::code_label offsg32;
uml::code_label offs32;
UML_MOV(block, uml::I0, DRC_REG(rd));

View File

@ -56,8 +56,8 @@ protected:
static u8 convert_to_bcd(int val);
static int bcd_to_integer(u8 val);
void set_clock_register(int register, int value);
int get_clock_register(int register);
void set_clock_register(int reg, int value);
int get_clock_register(int reg);
void clock_updated();
void advance_seconds();

View File

@ -132,6 +132,8 @@ public:
m_path_end = m_query == std::string::npos ? m_query_end : m_query;
}
virtual ~http_request_impl() = default;
/** Retrieves the requested resource. */
virtual const std::string get_resource() {
// The entire resource: path, query and fragment.
@ -190,6 +192,8 @@ struct http_response_impl : public http_manager::http_response {
http_response_impl(std::shared_ptr<webpp::Response> response) : m_response(response) { }
virtual ~http_response_impl() = default;
/** Sets the HTTP status to be returned to the client. */
virtual void set_status(int status) {
m_status = status;

View File

@ -284,7 +284,6 @@ public:
, m_width(0)
, m_height(0)
, m_depth(0)
, m_interlace(0)
, m_huffyuv()
, m_channels(0)
, m_samplebits(0)
@ -396,7 +395,6 @@ private:
std::uint32_t m_width; /* width of video */
std::uint32_t m_height; /* height of video */
std::uint32_t m_depth; /* depth of video */
std::uint8_t m_interlace; /* interlace parameters */
std::unique_ptr<huffyuv_data const> m_huffyuv; /* huffyuv decompression data */
std::uint16_t m_channels; /* audio channels */

View File

@ -21,6 +21,8 @@ namespace util {
class disasm_interface
{
public:
virtual ~disasm_interface() = default;
// independence from emu.h
using u8 = osd::u8;
using u16 = osd::u16;

View File

@ -96,7 +96,8 @@ public:
typedef std::unique_ptr<m7z_file_impl> ptr;
m7z_file_impl(const std::string &filename);
~m7z_file_impl()
virtual ~m7z_file_impl()
{
if (m_out_buffer)
IAlloc_Free(&m_alloc_imp, m_out_buffer);

View File

@ -184,7 +184,7 @@ static const int8_t outLvlTbl[16][16] = {
{ 0, 2, 4, 6, 8, 10, 12, 14, 16, 17, 19, 21, 23, 25, 27, 29}
};
static inline uint8_t mgetb(register uint8_t *ptr) { return *ptr; }
static inline uint8_t mgetb(uint8_t *ptr) { return *ptr; }
static inline void mputb(uint8_t *ptr, int8_t data) { *ptr = data; }
//**************************************************************************

View File

@ -1236,8 +1236,6 @@ void debug_imgui::draw_create_dialog(const char* label)
void debug_imgui::draw_console()
{
rgb_t bg, fg;
rgb_t base(0xe6, 0xff, 0xff, 0xff);
ImGuiWindowFlags flags = ImGuiWindowFlags_MenuBar | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollWithMouse;
ImGui::SetNextWindowSize(ImVec2(view_main_regs->width + view_main_disasm->width,view_main_disasm->height + view_main_console->height + ImGui::GetTextLineHeight()*3),ImGuiCond_Once);

View File

@ -88,6 +88,8 @@ public:
VMS
};
virtual ~cleaner_base() = default;
template <typename InputIt>
void process(InputIt begin, InputIt end);
void finalise();