From 14dde10b3422c46edb8a7d6c4ffd6398bece130c Mon Sep 17 00:00:00 2001 From: Christian Speckner Date: Sun, 15 Oct 2017 21:03:33 +0200 Subject: [PATCH] Silence clang warnings. --- src/emucore/tia/TIAConstants.hxx | 2 +- src/emucore/tia/frame-manager/AbstractFrameManager.hxx | 4 ++-- src/emucore/tia/frame-manager/FrameManager.hxx | 2 +- src/emucore/tia/frame-manager/JitterEmulation.cxx | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/emucore/tia/TIAConstants.hxx b/src/emucore/tia/TIAConstants.hxx index 54605b83a..ec7bc5a88 100644 --- a/src/emucore/tia/TIAConstants.hxx +++ b/src/emucore/tia/TIAConstants.hxx @@ -12,4 +12,4 @@ namespace TIAConstants { } -#endif // TIA_CONSTANTS_HXX \ No newline at end of file +#endif // TIA_CONSTANTS_HXX diff --git a/src/emucore/tia/frame-manager/AbstractFrameManager.hxx b/src/emucore/tia/frame-manager/AbstractFrameManager.hxx index c46270036..ccb655ab6 100644 --- a/src/emucore/tia/frame-manager/AbstractFrameManager.hxx +++ b/src/emucore/tia/frame-manager/AbstractFrameManager.hxx @@ -107,7 +107,7 @@ class AbstractFrameManager : public Serializable /** * The configured (our autodetected) frame layout (PAL / NTSC). */ - FrameLayout layout() const { return myLayout; }; + FrameLayout layout() const { return myLayout; } /** * The current frame rate. This is calculated dynamically from the number of @@ -144,7 +144,7 @@ class AbstractFrameManager : public Serializable /** * Enable jitter simulation */ - virtual void enableJitter(bool enabled) {}; + virtual void enableJitter(bool enabled) {} /** * The scanline difference between the last two frames. Used in the TIA to diff --git a/src/emucore/tia/frame-manager/FrameManager.hxx b/src/emucore/tia/frame-manager/FrameManager.hxx index d3167cbba..7df958460 100644 --- a/src/emucore/tia/frame-manager/FrameManager.hxx +++ b/src/emucore/tia/frame-manager/FrameManager.hxx @@ -36,7 +36,7 @@ class FrameManager: public AbstractFrameManager { void enableJitter(bool enabled) override { myJitterEnabled = enabled; } - uInt32 height() const override { return myHeight; }; + uInt32 height() const override { return myHeight; } void setFixedHeight(uInt32 height) override; diff --git a/src/emucore/tia/frame-manager/JitterEmulation.cxx b/src/emucore/tia/frame-manager/JitterEmulation.cxx index a98893bcc..db6c48372 100644 --- a/src/emucore/tia/frame-manager/JitterEmulation.cxx +++ b/src/emucore/tia/frame-manager/JitterEmulation.cxx @@ -63,7 +63,7 @@ void JitterEmulation::frameComplete(uInt32 scanlineCount) // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - void JitterEmulation::updateJitter(Int32 scanlineDifference) { - if ((uInt32)abs(scanlineDifference) < Metrics::minDeltaForJitter) return; + if (uInt32(abs(scanlineDifference)) < Metrics::minDeltaForJitter) return; Int32 jitter = std::min(jitter, Metrics::maxJitter); jitter = std::max(jitter, -myYStart);