diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2015-10-22 14:24:35 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2016-01-08 00:09:50 +0000 |
| commit | 65fa1b4c0868ae4898e6753cecf2952dc87034ac (patch) | |
| tree | cbd8bc0c18f2a11c021bf41a8cb6eaa5d5921c96 /src/qml/compiler | |
| parent | ac47b1520ce9d60622f28c0be6c22aa1ae1bb15e (diff) | |
Remove prohibited uses of underscore + capital letter
All identifiers starting with an underscore and a capital letter are
reserved to the compiler and must never be used by the user code. Try to
find a better name or, in the worst case, move the underscore to the
last position in these identifiers.
See commit cf63c63d558227fdbef09699c261560e7474f5ea in qtbase for a case
of such an identifier causing a build breakage when the compiler began
treating it specially (it was _Nullable).
Change-Id: I1d0f78915b5942aab07cffff140f9f39c29f0fdf
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
Diffstat (limited to 'src/qml/compiler')
| -rw-r--r-- | src/qml/compiler/qv4jsir.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/compiler/qv4jsir.cpp b/src/qml/compiler/qv4jsir.cpp index 98b53c6b3b..685825e8ea 100644 --- a/src/qml/compiler/qv4jsir.cpp +++ b/src/qml/compiler/qv4jsir.cpp @@ -175,8 +175,8 @@ struct RemoveSharedExpressions: IR::StmtVisitor, IR::ExprVisitor } } - template <typename _Expr> - _Expr *cleanup(_Expr *expr) + template <typename Expr_> + Expr_ *cleanup(Expr_ *expr) { std::vector<Expr *>::iterator it = std::lower_bound(subexpressions.begin(), subexpressions.end(), expr); if (it == subexpressions.end() || *it != expr) { @@ -185,7 +185,7 @@ struct RemoveSharedExpressions: IR::StmtVisitor, IR::ExprVisitor qSwap(uniqueExpr, e); expr->accept(this); qSwap(uniqueExpr, e); - return static_cast<_Expr *>(e); + return static_cast<Expr_ *>(e); } // the cloned expression is unique by definition |