Norse_Harold/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fix VS2013 build errors, warnings

Browse Source 
This was SVN commit r14073.
This commit is contained in:
Ykkrosh 2013-11-03 12:46:07 +00:00
parent 37f5aa5351
commit 72e11a2dea
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/collada/PMDConvert.cpp
View File

@ -42,6 +42,7 @@
#include <cassert>
#include <vector>
#include <algorithm>
const size_t maxInfluences = 4;
struct VertexBlend

1
source/collada/PSAConvert.cpp
View File

@ -44,6 +44,7 @@
#include <vector>
#include <limits>
#include <iterator>
#include <algorithm>
class PSAConvert
{

12
source/maths/tests/test_Fixed.h
View File

@ -52,13 +52,13 @@ public:
TS_ASSERT_EQUALS(b.ToFloat(), -123.125f);
TS_ASSERT_EQUALS(b.ToDouble(), -123.125);
fixed c = fixed::FromFloat(INFINITY);
fixed c = fixed::FromFloat(std::numeric_limits<float>::infinity());
TS_ASSERT_EQUALS(c.GetInternalValue(), (i32)0);
fixed d = fixed::FromFloat(-INFINITY);
fixed d = fixed::FromFloat(-std::numeric_limits<float>::infinity());
TS_ASSERT_EQUALS(d.GetInternalValue(), (i32)0);
fixed e = fixed::FromFloat(NAN);
fixed e = fixed::FromFloat(std::numeric_limits<float>::quiet_NaN());
TS_ASSERT_EQUALS(e.GetInternalValue(), (i32)0);
}
@ -72,13 +72,13 @@ public:
TS_ASSERT_EQUALS(b.ToFloat(), -123.125f);
TS_ASSERT_EQUALS(b.ToDouble(), -123.125);
fixed c = fixed::FromDouble(INFINITY);
fixed c = fixed::FromDouble(std::numeric_limits<double>::infinity());
TS_ASSERT_EQUALS(c.GetInternalValue(), (i32)0);
fixed d = fixed::FromDouble(-INFINITY);
fixed d = fixed::FromDouble(-std::numeric_limits<double>::infinity());
TS_ASSERT_EQUALS(d.GetInternalValue(), (i32)0);
fixed e = fixed::FromDouble(NAN);
fixed e = fixed::FromDouble(std::numeric_limits<double>::quiet_NaN());
TS_ASSERT_EQUALS(e.GetInternalValue(), (i32)0);
}

6
source/scriptinterface/tests/test_ScriptConversions.h
View File

@ -140,9 +140,9 @@ public:
void test_nonfinite()
{
roundtrip<float>(INFINITY, "Infinity");
roundtrip<float>(-INFINITY, "-Infinity");
convert_to<float>(NAN, "NaN"); // can't use roundtrip since nan != nan
roundtrip<float>(std::numeric_limits<float>::infinity(), "Infinity");
roundtrip<float>(-std::numeric_limits<float>::infinity(), "-Infinity");
convert_to<float>(std::numeric_limits<float>::quiet_NaN(), "NaN"); // can't use roundtrip since nan != nan
ScriptInterface script("Test", "Test", ScriptInterface::CreateRuntime());
JSContext* cx = script.GetContext();