diff options
| author | Johannes Schickel | 2009-03-09 22:39:53 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2009-03-09 22:39:53 +0000 |
| commit | 00c6d2c91c3216e8687fd67e4a87aca30a7413e5 (patch) | |
| tree | 8d1d30e13c23b0b0ae81dd2e7720199364a6bc8c | |
| parent | 5181546c639b67fa821b849ca18e37f4bf846cb1 (diff) | |
| download | scummvm-rg350-00c6d2c91c3216e8687fd67e4a87aca30a7413e5.tar.gz scummvm-rg350-00c6d2c91c3216e8687fd67e4a87aca30a7413e5.tar.bz2 scummvm-rg350-00c6d2c91c3216e8687fd67e4a87aca30a7413e5.zip | |
Fix compiler warnings.
svn-id: r39280
| -rw-r--r-- | test/sound/timestamp.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test/sound/timestamp.h b/test/sound/timestamp.h index 77ebdd909f..a774c64109 100644 --- a/test/sound/timestamp.h +++ b/test/sound/timestamp.h @@ -27,8 +27,8 @@ class TimestampTestSuite : public CxxTest::TestSuite const Audio::Timestamp a(1234, 60); const Audio::Timestamp b(5678, 60); - TS_ASSERT_EQUALS(a.msecs(), 1234); - TS_ASSERT_EQUALS(b.msecs(), 5678); + TS_ASSERT_EQUALS(a.msecs(), (uint32)1234); + TS_ASSERT_EQUALS(b.msecs(), (uint32)5678); TS_ASSERT_EQUALS(a.msecsDiff(b), 1234 - 5678); TS_ASSERT_EQUALS(b.msecsDiff(a), 5678 - 1234); @@ -36,15 +36,15 @@ class TimestampTestSuite : public CxxTest::TestSuite TS_ASSERT_EQUALS(a.frameDiff(b), (1234 - 5678) * 60 / 1000); TS_ASSERT_EQUALS(b.frameDiff(a), (5678 - 1234) * 60 / 1000); - TS_ASSERT_EQUALS(a.addFrames(1).msecs(), 1234 + 1000 * 1/60); - TS_ASSERT_EQUALS(a.addFrames(59).msecs(), 1234 + 1000 * 59/60); - TS_ASSERT_EQUALS(a.addFrames(60).msecs(), 1234 + 1000 * 60/60); + TS_ASSERT_EQUALS(a.addFrames(1).msecs(), (uint32)(1234 + 1000 * 1/60)); + TS_ASSERT_EQUALS(a.addFrames(59).msecs(), (uint32)(1234 + 1000 * 59/60)); + TS_ASSERT_EQUALS(a.addFrames(60).msecs(), (uint32)(1234 + 1000 * 60/60)); // As soon as we go back even by only one frame, the msec value // has to drop by at least one. - TS_ASSERT_EQUALS(a.addFrames(-1).msecs(), 1234 - 1000 * 1/60 - 1); - TS_ASSERT_EQUALS(a.addFrames(-59).msecs(), 1234 - 1000 * 59/60 - 1); - TS_ASSERT_EQUALS(a.addFrames(-60).msecs(), 1234 - 1000 * 60/60); + TS_ASSERT_EQUALS(a.addFrames(-1).msecs(), (uint32)(1234 - 1000 * 1/60 - 1)); + TS_ASSERT_EQUALS(a.addFrames(-59).msecs(), (uint32)(1234 - 1000 * 59/60 - 1)); + TS_ASSERT_EQUALS(a.addFrames(-60).msecs(), (uint32)(1234 - 1000 * 60/60)); } |