From afa43a9d7e8ce19f0f35aa708cea7b19a1c0fcba Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Mon, 14 Jul 2014 11:06:10 -0700 Subject: [PATCH] Fix win build fail --- examples/typedArraysUnitTest.js | 2 +- libraries/script-engine/src/DataViewPrototype.cpp | 4 ++-- libraries/script-engine/src/TypedArrays.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/typedArraysUnitTest.js b/examples/typedArraysUnitTest.js index 859bc9b9b3..e86a07289d 100644 --- a/examples/typedArraysUnitTest.js +++ b/examples/typedArraysUnitTest.js @@ -514,7 +514,7 @@ test('TypedArray setting', function () { var b = new Int32Array(5); b.set(a); this.arrayEqual(b, [1, 2, 3, 4, 5], '1'); - // raises(function () { b.set(a, 1); }); + this.raises(function () { b.set(a, 1); }); b.set(new Int32Array([99, 98]), 2); this.arrayEqual(b, [1, 2, 99, 98, 5], '2'); diff --git a/libraries/script-engine/src/DataViewPrototype.cpp b/libraries/script-engine/src/DataViewPrototype.cpp index 91f7e01b50..8bab574f33 100644 --- a/libraries/script-engine/src/DataViewPrototype.cpp +++ b/libraries/script-engine/src/DataViewPrototype.cpp @@ -128,7 +128,7 @@ QScriptValue DataViewPrototype::getFloat32(qint32 byteOffset, bool littleEndian) float result; stream >> result; if (isNaN(result)) { - return QScriptValue(NAN); + return QScriptValue(); } return QScriptValue(result); @@ -147,7 +147,7 @@ QScriptValue DataViewPrototype::getFloat64(qint32 byteOffset, bool littleEndian) double result; stream >> result; if (isNaN(result)) { - return QScriptValue(NAN); + return QScriptValue(); } return result; diff --git a/libraries/script-engine/src/TypedArrays.cpp b/libraries/script-engine/src/TypedArrays.cpp index 72e84859c4..751d1385e5 100644 --- a/libraries/script-engine/src/TypedArrays.cpp +++ b/libraries/script-engine/src/TypedArrays.cpp @@ -362,7 +362,7 @@ QScriptValue Float32ArrayClass::property(const QScriptValue& object, const QScri float result; stream >> result; if (isNaN(result)) { - return QScriptValue(NAN); + return QScriptValue(); } return result; } @@ -397,7 +397,7 @@ QScriptValue Float64ArrayClass::property(const QScriptValue& object, const QScri double result; stream >> result; if (isNaN(result)) { - return QScriptValue(NAN); + return QScriptValue(); } return result; }