From 42038ca35a86b1582d1813282a3d302e9fe58964 Mon Sep 17 00:00:00 2001 From: Erik Verbruggen Date: Thu, 28 Aug 2014 15:04:01 +0200 Subject: 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: Nikolai Kosjar --- .../cplusplus-update-frontend.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp') diff --git a/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp b/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp index 7c84817c99..a0d9fd3f0c 100644 --- a/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp +++ b/src/tools/cplusplus-update-frontend/cplusplus-update-frontend.cpp @@ -1300,8 +1300,8 @@ void generateASTVisitor_H(const Snapshot &, const QDir &cplusplusDir, "\n" " void accept(AST *ast);\n" "\n" -" template \n" -" void accept(List<_Tp> *it)\n" +" template \n" +" void accept(List *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; } -- cgit v1.2.1