diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-10 20:45:46 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-10 20:45:46 +0100 |
| commit | 6c090cd8d0e501b340190d96854145deb2299b26 (patch) | |
| tree | 73dbee34347724a55de8180d61caa3e78b512aa3 /src/qml/compiler/qv4jsir.cpp | |
| parent | ebc76aeea24389e8494b95fd3fbdc446dd62d441 (diff) | |
| parent | 74580d00921ce7cc6f8baf70b15903f5cf707b78 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.h
tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
tests/auto/quick/qquicktextedit/qquicktextedit.pro
tests/auto/quick/qquicktextinput/qquicktextinput.pro
Change-Id: I95d2c20a8619e5b8fa361c941a16dd8dce3e04e7
Diffstat (limited to 'src/qml/compiler/qv4jsir.cpp')
| -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 a991666b28..f8cfe7da2c 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 |