diff options
| author | Erik Verbruggen <erik.verbruggen@qt.io> | 2017-08-25 15:44:53 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-08-25 18:41:09 +0000 |
| commit | 8ff7ce3c430d1f981e72bb588fc5710cca6272d0 (patch) | |
| tree | 5bbb2413d10df8877fd6cf024abcfd712cc98168 /src/qml/compiler/qv4codegen.cpp | |
| parent | 5d3edf6551e5388645f22636efd2981503927e1d (diff) | |
Fix naming conflict for "swap" function
Change-Id: I542ecabaaa9cd01bd1266456e317c842abd0a3de
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/qml/compiler/qv4codegen.cpp')
| -rw-r--r-- | src/qml/compiler/qv4codegen.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/compiler/qv4codegen.cpp b/src/qml/compiler/qv4codegen.cpp index ab2578a8c7..2254cc8808 100644 --- a/src/qml/compiler/qv4codegen.cpp +++ b/src/qml/compiler/qv4codegen.cpp @@ -1037,7 +1037,7 @@ static QSOperator::Op invert(QSOperator::Op oper) } } -static QSOperator::Op swap(QSOperator::Op oper) +static QSOperator::Op operatorForSwappedOperands(QSOperator::Op oper) { switch (oper) { case QSOperator::StrictEqual: return QSOperator::StrictEqual; @@ -1055,7 +1055,7 @@ static QSOperator::Op swap(QSOperator::Op oper) Codegen::Reference Codegen::jumpBinop(QSOperator::Op oper, Reference &left, Reference &right) { if (left.isConst()) { - oper = swap(oper); + oper = operatorForSwappedOperands(oper); qSwap(left, right); } const BytecodeGenerator::Label *jumpTarget = _expr.iftrue(); |