HeeroYui-deprecated/astyle
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Do not recognize the "template" disambiguator for dependent names as an actual template header

Browse Source
This commit is contained in:
Peter Vingelmann 2016-09-15 03:06:06 +02:00
parent b1259192ff
commit e4ce7b36b0
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ASBeautifier.cpp
View File

@ -2871,6 +2871,18 @@ void ASBeautifier::parseCurrentLine(const string& line)
&& ASBeautifier::peekNextChar(line, i + (*newHeader).length() - 1) != '(') && ASBeautifier::peekNextChar(line, i + (*newHeader).length() - 1) != '(')
newHeader = NULL; newHeader = NULL;
// The "template" disambiguator for dependent names should not be
// recognized as an actual template header. For example:
// T::template foo<X>()
// s.template foo<X>();
// this->template foo<X>();
if (newHeader == &AS_TEMPLATE
&& (prevNonSpaceCh == ':' || prevNonSpaceCh == '.'
|| prevNonSpaceCh == '-'))
{
newHeader = NULL;
}
if (newHeader != NULL) if (newHeader != NULL)
{ {
// if we reached here, then this is a header... // if we reached here, then this is a header...