Commit 42038ca3 authored by Erik Verbruggen's avatar Erik Verbruggen Committed by Nikolai Kosjar

C++: remove reserved names and regenerate some files.

See [global.names] (17.6.4.3.2 in the C++11 spec.)

Change-Id: If6905bbac3a7464aeb5a49227e0f6b5c91d6033b
Reviewed-by: default avatarNikolai Kosjar <nikolai.kosjar@digia.com>
parent 703f36a4
......@@ -1300,8 +1300,8 @@ void generateASTVisitor_H(const Snapshot &, const QDir &cplusplusDir,
"\n"
" void accept(AST *ast);\n"
"\n"
" template <typename _Tp>\n"
" void accept(List<_Tp> *it)\n"
" template <typename Tptr>\n"
" void accept(List<Tptr> *it)\n"
" {\n"
" for (; it; it = it->next)\n"
" accept(it->value);\n"
......@@ -1659,15 +1659,15 @@ void generateASTPatternBuilder_h(const QDir &cplusplusDir)
out
<< ")" << endl
<< " {" << endl
<< " " << className << " *__ast = new (&pool) " << className << ';' << endl;
<< " " << className << " *ast = new (&pool) " << className << ';' << endl;
foreach (const StringPair &p, args) {
out << " __ast->" << p.second << " = " << p.second << ';' << endl;
out << " ast->" << p.second << " = " << p.second << ';' << endl;
}
out
<< " return __ast;" << endl
<< " return ast;" << endl
<< " }" << endl
<< endl;
}
......@@ -1681,10 +1681,10 @@ void generateASTPatternBuilder_h(const QDir &cplusplusDir)
<< " " << className << " *" << methodName << "("
<< elementName << " *value, " << className << " *next = 0)" << endl
<< " {" << endl
<< " " << className << " *__list = new (&pool) " << className << ";" << endl
<< " __list->next = next;" << endl
<< " __list->value = value;" << endl
<< " return __list;" << endl
<< " " << className << " *list = new (&pool) " << className << ";" << endl
<< " list->next = next;" << endl
<< " list->value = value;" << endl
<< " return list;" << endl
<< " }" << endl
<< endl;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment