From fec5ef3df9f7e2828627c1ed9ef7fa986f0338db Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgads@gmail.com>
Date: Wed, 15 Aug 2012 11:06:40 +0300
Subject: [PATCH] NameDemangler: Fix compilation with MSVC
parsetreenodes.cpp(1464) : error C2899: typename cannot be used outside a template declaration
Change-Id: Ie3235d186b2865a15e57439467e2bab7389dab1d
Reviewed-by: hjk <qthjk@ovi.com>
---
src/plugins/debugger/namedemangler/parsetreenodes.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/plugins/debugger/namedemangler/parsetreenodes.cpp b/src/plugins/debugger/namedemangler/parsetreenodes.cpp
index 65e7f96fe1c..5e59aec8864 100644
--- a/src/plugins/debugger/namedemangler/parsetreenodes.cpp
+++ b/src/plugins/debugger/namedemangler/parsetreenodes.cpp
@@ -60,7 +60,7 @@ namespace Internal {
template<int base> static int getNonNegativeNumber(GlobalParseState *parseState)
{
ParseTreeNode::parseRule<NonNegativeNumberNode<base> >(parseState);
- const typename NonNegativeNumberNode<base>::Ptr numberNode
+ const NonNegativeNumberNode<base>::Ptr numberNode
= DEMANGLER_CAST(NonNegativeNumberNode<base>, parseState->popFromStack());
const int value = static_cast<int>(numberNode->number());
return value;
@@ -1461,7 +1461,7 @@ QByteArray LocalNameNode::toByteArray() const
= DEMANGLER_CAST(BareFunctionTypeNode, CHILD_AT(encodingNode, 1));
const int functionParamCount
= funcNode->hasReturnType() ? funcNode->childCount() - 1 : funcNode->childCount();
- const typename NonNegativeNumberNode<10>::Ptr numberNode
+ const NonNegativeNumberNode<10>::Ptr numberNode
= MY_CHILD_AT(1).dynamicCast<NonNegativeNumberNode<10> >();
// "_" means last argument, "n" means (n+1)th to last.
@@ -2815,7 +2815,7 @@ QByteArray ClosureTypeNameNode::toByteArray() const
QByteArray repr = CHILD_TO_BYTEARRAY(0) + '#';
quint64 number;
if (childCount() == 2) {
- const typename NonNegativeNumberNode<10>::Ptr numberNode
+ const NonNegativeNumberNode<10>::Ptr numberNode
= DEMANGLER_CAST(NonNegativeNumberNode<10>, MY_CHILD_AT(1));
number = numberNode->number() + 2;
} else {
@@ -2853,7 +2853,7 @@ QByteArray UnnamedTypeNameNode::toByteArray() const
if (childCount() == 0) {
repr += "unnamed type#1";
} else {
- const typename NonNegativeNumberNode<10>::Ptr numberNode
+ const NonNegativeNumberNode<10>::Ptr numberNode
= MY_CHILD_AT(0).dynamicCast<NonNegativeNumberNode<10> >();
if (numberNode)
repr += "unnamed type#" + QByteArray::number(numberNode->number() + 2);
@@ -3171,7 +3171,7 @@ void FunctionParamNode::parse()
QByteArray FunctionParamNode::toByteArray() const
{
// We ignore L for now.
- const typename NonNegativeNumberNode<10>::Ptr numberNode
+ const NonNegativeNumberNode<10>::Ptr numberNode
= MY_CHILD_AT(childCount() - 1).dynamicCast<NonNegativeNumberNode<10> >();
const int paramNumber = numberNode ? numberNode->number() + 2 : 1;
const int cvIndex = MY_CHILD_AT(0).dynamicCast<CvQualifiersNode>() ? 0 : 1;
--
GitLab