From fc23dc14f00665374046f5e17b386106399ee83b Mon Sep 17 00:00:00 2001 From: Clark Coleman <clc@zephyr-software.com> Date: Thu, 3 Jun 2021 15:16:26 -0700 Subject: [PATCH] Changes for Ubuntu 20 compilation of IDA Pro 7.6 service pack 1. --- include/interfaces/idapro/STARSFunction.h | 4 ++++ include/interfaces/idapro/all.h | 1 + src/interfaces/idapro/STARSIDAInstruction.cpp | 3 +++ 3 files changed, 8 insertions(+) diff --git a/include/interfaces/idapro/STARSFunction.h b/include/interfaces/idapro/STARSFunction.h index b3a54465..fd5824c0 100644 --- a/include/interfaces/idapro/STARSFunction.h +++ b/include/interfaces/idapro/STARSFunction.h @@ -1,10 +1,14 @@ #ifndef STARS_IDA_Function_h #define STARS_IDA_Function_h +#pragma GCC diagnostic ignored "-Wclass-memaccess" + #include <pro.h> #include <funcs.hpp> #include <frame.hpp> +#pragma GCC diagnostic pop + #include "interfaces/STARSTypes.h" class SMPFunction; diff --git a/include/interfaces/idapro/all.h b/include/interfaces/idapro/all.h index c1e0e87d..f8b3134a 100644 --- a/include/interfaces/idapro/all.h +++ b/include/interfaces/idapro/all.h @@ -25,6 +25,7 @@ #pragma GCC diagnostic pop #pragma GCC diagnostic pop #pragma GCC diagnostic pop +#pragma GCC diagnostic pop #include <assert.h> diff --git a/src/interfaces/idapro/STARSIDAInstruction.cpp b/src/interfaces/idapro/STARSIDAInstruction.cpp index 6413893d..ed9053e6 100644 --- a/src/interfaces/idapro/STARSIDAInstruction.cpp +++ b/src/interfaces/idapro/STARSIDAInstruction.cpp @@ -61,7 +61,10 @@ void STARS_IDA_Instruction_t::InitOperand(op_t &InitOp) const { InitOp.specflag3 = 0; InitOp.specflag4 = 0; #else +#pragma GCC diagnostic ignored "-Wclass-memaccess" (void) memset(&InitOp, 0, sizeof(op_t)); +#pragma GCC diagnostic pop + #if (IDA_SDK_VERSION < 700) InitOp.dtyp = global_STARS_program->GetSTARS_ISA_dtyp(); #else -- GitLab