diff options
| -rw-r--r-- | src/qml/jsruntime/qv4runtime_p.h | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/qml/jsruntime/qv4runtime_p.h b/src/qml/jsruntime/qv4runtime_p.h index 4e28441e62..d00c579283 100644 --- a/src/qml/jsruntime/qv4runtime_p.h +++ b/src/qml/jsruntime/qv4runtime_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -461,6 +461,24 @@ inline ReturnedValue Runtime::lessEqual(const ValueRef left, const ValueRef righ return Encode(r); } +inline Bool Runtime::compareEqual(const ValueRef left, const ValueRef right) +{ + TRACE2(left, right); + + if (left->rawValue() == right->rawValue()) + // NaN != NaN + return !left->isNaN(); + + if (left->type() == right->type()) { + if (!left->isManaged()) + return false; + if (left->isString() == right->isString()) + return left->managed()->isEqualTo(right->managed()); + } + + return RuntimeHelpers::equalHelper(left, right); +} + inline ReturnedValue Runtime::equal(const ValueRef left, const ValueRef right) { TRACE2(left, right); @@ -493,24 +511,6 @@ inline ReturnedValue Runtime::strictNotEqual(const ValueRef left, const ValueRef return Encode(r); } -inline Bool Runtime::compareEqual(const ValueRef left, const ValueRef right) -{ - TRACE2(left, right); - - if (left->rawValue() == right->rawValue()) - // NaN != NaN - return !left->isNaN(); - - if (left->type() == right->type()) { - if (!left->isManaged()) - return false; - if (left->isString() == right->isString()) - return left->managed()->isEqualTo(right->managed()); - } - - return RuntimeHelpers::equalHelper(left, right); -} - inline Bool Runtime::compareNotEqual(const ValueRef left, const ValueRef right) { TRACE2(left, right); |