Procházet zdrojové kódy

Merge pull request #30249 from marxin/fix-gcc9-warnings

Fix few GCC9 warnings:
Rémi Verschelde před 6 roky
rodič
revize
4cb0887660

+ 7 - 0
editor/editor_audio_buses.h

@@ -233,6 +233,13 @@ private:
 			render_db_value = n.render_db_value;
 		}
 
+		_FORCE_INLINE_ AudioNotch operator=(const EditorAudioMeterNotches::AudioNotch &n) {
+			relative_position = n.relative_position;
+			db_value = n.db_value;
+			render_db_value = n.render_db_value;
+			return *this;
+		}
+
 		_FORCE_INLINE_ AudioNotch() {}
 	};
 

+ 1 - 1
modules/dds/texture_loader_dds.cpp

@@ -31,7 +31,7 @@
 #include "texture_loader_dds.h"
 #include "core/os/file_access.h"
 
-#define PF_FOURCC(s) (((s)[3] << 24U) | ((s)[2] << 16U) | ((s)[1] << 8U) | ((s)[0]))
+#define PF_FOURCC(s) ((uint32_t)(((s)[3] << 24U) | ((s)[2] << 16U) | ((s)[1] << 8U) | ((s)[0])))
 
 enum {
 	DDS_MAGIC = 0x20534444,

+ 8 - 1
thirdparty/assimp/include/assimp/types.h

@@ -161,7 +161,14 @@ struct aiColor3D
     explicit aiColor3D (ai_real _r) : r(_r), g(_r), b(_r) {}
     aiColor3D (const aiColor3D& o) : r(o.r), g(o.g), b(o.b) {}
 
-    /** Component-wise comparison */
+	aiColor3D &operator=(const aiColor3D &o) {
+		r = o.r;
+		g = o.g;
+		b = o.b;
+		return *this;
+	}
+
+	/** Component-wise comparison */
     // TODO: add epsilon?
     bool operator == (const aiColor3D& other) const
         {return r == other.r && g == other.g && b == other.b;}