Fix GCC class-memaccess warnings (#10239)

p-ouellette · web-flow · commit 542df11bed89 · 2020-08-01T17:25:33.000+02:00
diff --git a/src/client/mapblock_mesh.cpp b/src/client/mapblock_mesh.cpp
@@ -419,7 +419,14 @@ static void getNodeVertexDirs(const v3s16 &dir, v3s16 *vertex_dirs)
 	u8 idx = (dir.X + 2 * dir.Y + 3 * dir.Z) & 7;
 	idx = (idx - 1) * 4;
 
+#if defined(__GNUC__) && !defined(__clang__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wclass-memaccess"
+#endif
 	memcpy(vertex_dirs, &vertex_dirs_table[idx], 4 * sizeof(v3s16));
+#if defined(__GNUC__) && !defined(__clang__)
+#pragma GCC diagnostic pop
+#endif
 }
 
 static void getNodeTextureCoords(v3f base, const v3f &scale, const v3s16 &dir, float *u, float *v)
diff --git a/src/noise.cpp b/src/noise.cpp
@@ -424,7 +424,7 @@ float NoisePerlin3D(NoiseParams *np, float x, float y, float z, s32 seed)
 
 Noise::Noise(NoiseParams *np_, s32 seed, u32 sx, u32 sy, u32 sz)
 {
-	memcpy(&np, np_, sizeof(np));
+	np = *np_;
 	this->seed = seed;
 	this->sx   = sx;
 	this->sy   = sy;

Original file line number	Diff line number	Diff line change
`@@ -424,7 +424,7 @@ float NoisePerlin3D(NoiseParams *np, float x, float y, float z, s32 seed)`
`424`	`424`
`425`	`425`	`Noise::Noise(NoiseParams *np_, s32 seed, u32 sx, u32 sy, u32 sz)`
`426`	`426`	`{`
`427`		`- memcpy(&np, np_, sizeof(np));`
	`427`	`+ np = *np_;`
`428`	`428`	`this->seed = seed;`
`429`	`429`	`this->sx = sx;`
`430`	`430`	`this->sy = sy;`