summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Alessandrelli <fabio.alessandrelli@gmail.com>2020-03-10 12:09:02 +0100
committerGitHub <noreply@github.com>2020-03-10 12:09:02 +0100
commit002d821e6e66f67966193c7297347b8d4f56c536 (patch)
tree2dedb89b1693f6f25b8373ebc6748177d415f527
parent1500e40ccf88b0bca34667e3113e4d6c18b3de29 (diff)
parente1c3c6ba45956a6738868d6d0ffe8082c99f5671 (diff)
Merge pull request #36959 from akien-mga/enginedebugger-Wshadow=local
Fix -Wshadow=local warning in EngineDebugger
-rw-r--r--core/debugger/engine_debugger.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/debugger/engine_debugger.cpp b/core/debugger/engine_debugger.cpp
index 305802e5f2..c64d886800 100644
--- a/core/debugger/engine_debugger.cpp
+++ b/core/debugger/engine_debugger.cpp
@@ -146,8 +146,8 @@ void EngineDebugger::initialize(const String &p_uri, bool p_skip_breakpoints, Ve
return;
// There is a debugger, parse breakpoints.
- ScriptDebugger *script_debugger = singleton->get_script_debugger();
- script_debugger->set_skip_breakpoints(p_skip_breakpoints);
+ ScriptDebugger *singleton_script_debugger = singleton->get_script_debugger();
+ singleton_script_debugger->set_skip_breakpoints(p_skip_breakpoints);
for (int i = 0; i < p_breakpoints.size(); i++) {
@@ -155,7 +155,7 @@ void EngineDebugger::initialize(const String &p_uri, bool p_skip_breakpoints, Ve
int sp = bp.find_last(":");
ERR_CONTINUE_MSG(sp == -1, "Invalid breakpoint: '" + bp + "', expected file:line format.");
- script_debugger->insert_breakpoint(bp.substr(sp + 1, bp.length()).to_int(), bp.substr(0, sp));
+ singleton_script_debugger->insert_breakpoint(bp.substr(sp + 1, bp.length()).to_int(), bp.substr(0, sp));
}
}