From c7703600bee4df0f6767363f392a9c80120e1123 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Mon, 15 Sep 2014 15:33:24 +0200 Subject: [PATCH] Debugger: Quieten warning on testing this for non-0 Clang used to complain about this several dozen times when building Qt Creator. Change-Id: I4dadd40de1133fe8558d6b50730f68b40e07de55 Reviewed-by: hjk --- src/plugins/debugger/namedemangler/parsetreenodes.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/plugins/debugger/namedemangler/parsetreenodes.cpp b/src/plugins/debugger/namedemangler/parsetreenodes.cpp index e0a33b2121..2d5bb780e1 100644 --- a/src/plugins/debugger/namedemangler/parsetreenodes.cpp +++ b/src/plugins/debugger/namedemangler/parsetreenodes.cpp @@ -47,9 +47,17 @@ (parentNode)->addChild(parseState->popFromStack()); \ } while (0) +#define PARSE_RULE_AND_ADD_RESULT_AS_CHILD_TO_THIS(NodeType, parseState) \ + do { \ + ParseTreeNode::parseRule(parseState); \ + DEMANGLER_ASSERT(parseState->stackElementCount() > 0); \ + DEMANGLER_ASSERT(parseState->stackTop().dynamicCast()); \ + addChild(parseState->popFromStack()); \ + } while (0) + #define PARSE_RULE_AND_ADD_RESULT_AS_CHILD(nodeType) \ - PARSE_RULE_AND_ADD_RESULT_AS_CHILD_TO_NODE(nodeType, parseState(), this) + PARSE_RULE_AND_ADD_RESULT_AS_CHILD_TO_THIS(nodeType, parseState()) #define CHILD_AT(obj, index) obj->childAt(index, QLatin1String(Q_FUNC_INFO), QLatin1String(__FILE__), __LINE__) #define MY_CHILD_AT(index) CHILD_AT(this, index) #define CHILD_TO_BYTEARRAY(index) MY_CHILD_AT(index)->toByteArray() -- GitLab