From 8893e5f14ab83e966e253cbefa46b1ef1882f4ed Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 20 Feb 2024 13:43:05 +0100 Subject: [PATCH] Debugger: Fix C++20 complaint about or-ing different enums Change-Id: Ie3648b3473476c3f71339006dff2c5dccf817b15 Reviewed-by: Jarek Kobus Reviewed-by: --- src/plugins/debugger/cdb/cdbengine.cpp | 2 +- src/plugins/debugger/cdb/cdbengine.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp index d292028050a..3d9777f51e1 100644 --- a/src/plugins/debugger/cdb/cdbengine.cpp +++ b/src/plugins/debugger/cdb/cdbengine.cpp @@ -2781,7 +2781,7 @@ void CdbEngine::setupScripting(const DebuggerResponse &response) showMessage("Reading " + codeFile.toUserOutput(), LogInput); runCommand({QString("module = types.ModuleType('%1')").arg(module), ScriptCommand}); runCommand({QString("code = bytes.fromhex('%1').decode('utf-8')") - .arg(QString::fromUtf8(code->toHex())), ScriptCommand | DebuggerCommand::Silent}); + .arg(QString::fromUtf8(code->toHex())), ScriptCommand | Silent}); runCommand({QString("exec(code, module.__dict__)"), ScriptCommand}); runCommand({QString("sys.modules['%1'] = module").arg(module), ScriptCommand}); runCommand({QString("import %1").arg(module), ScriptCommand}); diff --git a/src/plugins/debugger/cdb/cdbengine.h b/src/plugins/debugger/cdb/cdbengine.h index b8afe1e2d91..1cf499085e1 100644 --- a/src/plugins/debugger/cdb/cdbengine.h +++ b/src/plugins/debugger/cdb/cdbengine.h @@ -110,6 +110,7 @@ private: }; enum CommandFlags { NoFlags = 0, + Silent = DebuggerCommand::Silent, BuiltinCommand = DebuggerCommand::Silent << 1, ExtensionCommand = DebuggerCommand::Silent << 2, ScriptCommand = DebuggerCommand::Silent << 3