Merge pull request #22593 from akien-mga/fix-warnings

Fix various warnings raised by Clang 7

4 files changed, 6 insertions, 20 deletions

diff --git a/servers/audio/reverb_sw.cpp b/servers/audio/reverb_sw.cpp
index 13742d5db5..d078da38b4 100644
--- a/servers/audio/reverb_sw.cpp
+++ b/servers/audio/reverb_sw.cpp
@@ -29,33 +29,21 @@
 /*************************************************************************/
 
 #include "reverb_sw.h"
+
 #include "core/print_string.h"
-#include "stdlib.h"
+
+#include <stdlib.h>
+
 #define SETMIN(x, y) (x) = MIN((x), (y))
+
 #define rangeloop(c, min, max) \
 	for ((c) = (min); (c) < (max); (c)++)
 
 #define ABSDIFF(x, y) \
 	(((x) < (y)) ? ((y) - (x)) : ((x) - (y)))
 
-#ifdef bleh_MSC_VER
-
-#if _MSC_VER >= 1400
-_FORCE_INLINE_ int32_tMULSHIFT_S32(
-		int32_t Factor1,
-		int32_t Factor2,
-		uint8_t Bits) {
-
-	return __ll_rshift(
-			__emul(Factor1, Factor2),
-			Bits);
-}
-#endif
-
-#else
 #define MULSHIFT_S32(Factor1, Factor2, Bits) \
 	((int)(((int64_t)(Factor1) * (Factor2)) >> (Bits)))
-#endif
 
 struct ReverbParamsSW {
 	unsigned int BufferSize; // Required buffer size
diff --git a/servers/audio/reverb_sw.h b/servers/audio/reverb_sw.h
index 26b3fa5166..01977d1f61 100644
--- a/servers/audio/reverb_sw.h
+++ b/servers/audio/reverb_sw.h
@@ -34,7 +34,7 @@
 #include "core/os/memory.h"
 #include "core/typedefs.h"
 
-class ReverbParamsSW;
+struct ReverbParamsSW;
 
 class ReverbSW {
 public:
diff --git a/servers/physics/body_pair_sw.h b/servers/physics/body_pair_sw.h
index fd85d77718..17ff9d6a88 100644
--- a/servers/physics/body_pair_sw.h
+++ b/servers/physics/body_pair_sw.h
@@ -76,7 +76,6 @@ class BodyPairSW : public ConstraintSW {
 	Contact contacts[MAX_CONTACTS];
 	int contact_count;
 	bool collided;
-	int cc;
 
 	static void _contact_added_callback(const Vector3 &p_point_A, const Vector3 &p_point_B, void *p_userdata);
 
diff --git a/servers/visual/visual_server_raster.h b/servers/visual/visual_server_raster.h
index ef2b767a8a..62ba2eab69 100644
--- a/servers/visual/visual_server_raster.h
+++ b/servers/visual/visual_server_raster.h
@@ -59,7 +59,6 @@ class VisualServerRaster : public VisualServer {
 	};
 
 	static int changes;
-	bool draw_extra_frame;
 	RID test_cube;
 
 	int black_margin[4];