diff options
| author | Mark Rowe <mark@vector35.com> | 2026-03-24 18:27:28 -0700 |
|---|---|---|
| committer | Mark Rowe <mark@vector35.com> | 2026-03-30 09:03:00 -0700 |
| commit | dca922496f96d18f9060b1f7a349ecb5c1c1a9a1 (patch) | |
| tree | a60c70c6329104e808d6a8189f50edc62ca41ada /arch | |
| parent | 5a99579b1a903d3738bb82450ec40c52f1ea5594 (diff) | |
Fix compiler warnings seen with Clang 21
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/armv7/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | arch/armv7/arch_armv7.cpp | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/arch/armv7/CMakeLists.txt b/arch/armv7/CMakeLists.txt index 25847dfe..1e899d01 100644 --- a/arch/armv7/CMakeLists.txt +++ b/arch/armv7/CMakeLists.txt @@ -44,7 +44,7 @@ if(BN_INTERNAL_BUILD) RUNTIME_OUTPUT_DIRECTORY ${BN_CORE_PLUGIN_DIR}) endif() -if(CMAKE_CXX_COMPILER_ID MATCHES "GNU") +if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang") target_compile_options(arch_armv7 PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-Wno-deprecated-enum-enum-conversion> ) diff --git a/arch/armv7/arch_armv7.cpp b/arch/armv7/arch_armv7.cpp index f9fc250e..9f7831a2 100644 --- a/arch/armv7/arch_armv7.cpp +++ b/arch/armv7/arch_armv7.cpp @@ -884,12 +884,10 @@ protected: const InstructionOperand& op, vector<InstructionTextToken>& result) { - const char* reg = NULL; - reg = GetRegisterName((enum Register)op.reg).c_str(); - if (reg == NULL) + auto reg = GetRegisterName((enum Register)op.reg); + if (reg.empty()) return FAILED_TO_DISASSEMBLE_REGISTER; - result.emplace_back(RegisterToken, reg); tokenize_shift(op, result); return DISASM_SUCCESS; |