aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@digia.com>2014-04-01 10:06:39 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-04-01 11:58:30 +0200
commit722dcd2c315acc2bab1cfa9072986ca66a5bba88 (patch)
treedb73e3545b53dabcdc01340f7e18872ce746c4f5 /src/qml/jsruntime
parentd06dc2973821d3f5383c5a0d2ba16b6bddbadb82 (diff)
Move inline function Bool Runtime::compareEqual() above usage.
Fix MinGW-warnings: src/qml/jsruntime/qv4runtime_p.h:496:13: warning: 'static QV4::Bool QV4::Runtime::compareEqual(QV4::ValueRef, QV4::ValueRef)' redeclared without dllimport attribute after being referenced with dll linkage Change-Id: Ieb212ed6aba2a0deeeddd033126ae7e9737bb38e Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime')
-rw-r--r--src/qml/jsruntime/qv4runtime_p.h38
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);