forked from qt-creator/qt-creator
C++: remove reserved names.
See [global.names] (17.6.4.3.2 in the C++11 spec.) Change-Id: I8434496dbe392b52d339d5f17cfaeee8dbd88995 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
This commit is contained in:
committed by
Nikolai Kosjar
parent
12642cc49a
commit
703f36a4b8
22
src/libs/3rdparty/cplusplus/AST.h
vendored
22
src/libs/3rdparty/cplusplus/AST.h
vendored
@@ -27,7 +27,7 @@
|
||||
|
||||
namespace CPlusPlus {
|
||||
|
||||
template <typename _Tp>
|
||||
template <typename Tptr>
|
||||
class CPLUSPLUS_EXPORT List: public Managed
|
||||
{
|
||||
List(const List &other);
|
||||
@@ -35,10 +35,10 @@ class CPLUSPLUS_EXPORT List: public Managed
|
||||
|
||||
public:
|
||||
List()
|
||||
: value(_Tp()), next(0)
|
||||
: value(Tptr()), next(0)
|
||||
{ }
|
||||
|
||||
List(const _Tp &value)
|
||||
List(const Tptr &value)
|
||||
: value(value), next(0)
|
||||
{ }
|
||||
|
||||
@@ -53,7 +53,7 @@ public:
|
||||
|
||||
unsigned lastToken() const
|
||||
{
|
||||
_Tp lv = lastValue();
|
||||
Tptr lv = lastValue();
|
||||
|
||||
if (lv)
|
||||
return lv->lastToken();
|
||||
@@ -62,9 +62,9 @@ public:
|
||||
return 0;
|
||||
}
|
||||
|
||||
_Tp lastValue() const
|
||||
Tptr lastValue() const
|
||||
{
|
||||
_Tp lastValue = 0;
|
||||
Tptr lastValue = 0;
|
||||
|
||||
for (const List *it = this; it; it = it->next) {
|
||||
if (it->value)
|
||||
@@ -74,7 +74,7 @@ public:
|
||||
return lastValue;
|
||||
}
|
||||
|
||||
_Tp value;
|
||||
Tptr value;
|
||||
List *next;
|
||||
};
|
||||
|
||||
@@ -92,8 +92,8 @@ public:
|
||||
static void accept(AST *ast, ASTVisitor *visitor)
|
||||
{ if (ast) ast->accept(visitor); }
|
||||
|
||||
template <typename _Tp>
|
||||
static void accept(List<_Tp> *it, ASTVisitor *visitor)
|
||||
template <typename Tptr>
|
||||
static void accept(List<Tptr> *it, ASTVisitor *visitor)
|
||||
{
|
||||
for (; it; it = it->next)
|
||||
accept(it->value, visitor);
|
||||
@@ -102,8 +102,8 @@ public:
|
||||
static bool match(AST *ast, AST *pattern, ASTMatcher *matcher);
|
||||
bool match(AST *pattern, ASTMatcher *matcher);
|
||||
|
||||
template <typename _Tp>
|
||||
static bool match(List<_Tp> *it, List<_Tp> *patternIt, ASTMatcher *matcher)
|
||||
template <typename Tptr>
|
||||
static bool match(List<Tptr> *it, List<Tptr> *patternIt, ASTMatcher *matcher)
|
||||
{
|
||||
while (it && patternIt) {
|
||||
if (! match(it->value, patternIt->value, matcher))
|
||||
|
||||
Reference in New Issue
Block a user