spacecruft
/
celestia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix some warnings reported by msvc 

1) warning C4390: ';': empty controlled statement found; is this the intent?
2) warning C4305: 'argument': truncation from 'double' to 'float'
pull/681/head
Hleb Valoshka 2020-03-29 10:04:11 +03:00
parent 04c187d776
commit 1ca9db3212
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/celutil/debug.h
View File

@ -28,7 +28,7 @@
#define LOG_LEVEL_DEBUG 4
#if !defined(_DEBUG) && !defined(DEBUG)
#define DPRINTF(level, format, ...)
#define DPRINTF(level, format, ...) static_cast<void>(level);
#else
extern int debugVerbosity;
template <typename... T>

14
test/unit/hash_test.cpp
View File

@ -37,9 +37,9 @@ TEST_CASE("AssociativeArray", "[AssociativeArray]")
Color c;
h.getColor("color", c);
REQUIRE(c.red() == Approx(C(.23)));
REQUIRE(c.green() == Approx(C(.34)));
REQUIRE(c.blue() == Approx(C(.45)));
REQUIRE(c.red() == Approx(C(.23f)));
REQUIRE(c.green() == Approx(C(.34f)));
REQUIRE(c.blue() == Approx(C(.45f)));
REQUIRE(c.alpha() == Approx(1.0));
}
@ -66,10 +66,10 @@ TEST_CASE("AssociativeArray", "[AssociativeArray]")
Color c;
h.getColor("color", c);
REQUIRE(c.red() == Approx(C(.23)));
REQUIRE(c.green() == Approx(C(.34)));
REQUIRE(c.blue() == Approx(C(.45)));
REQUIRE(c.alpha() == Approx(C(.56)));
REQUIRE(c.red() == Approx(C(.23f)));
REQUIRE(c.green() == Approx(C(.34f)));
REQUIRE(c.blue() == Approx(C(.45f)));
REQUIRE(c.alpha() == Approx(C(.56f)));
}