From 2efeb6cdb734a1ec9d8b7d0d8d70d7b3161f799f Mon Sep 17 00:00:00 2001 From: thrust26 Date: Tue, 21 Nov 2017 09:25:12 +0100 Subject: [PATCH] fix for temporary macro labels ('...$') --- src/debugger/CartDebug.cxx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/debugger/CartDebug.cxx b/src/debugger/CartDebug.cxx index 3afd55999..8b88c45ae 100644 --- a/src/debugger/CartDebug.cxx +++ b/src/debugger/CartDebug.cxx @@ -816,7 +816,11 @@ string CartDebug::loadSymbolFile() if(pos != string::npos) addLabel(label.substr(pos), value); else - addLabel(label, value); + { + pos = label.find_last_of("$"); + if (pos == string::npos || pos != label.length() - 1) + addLabel(label, value); + } } } }