Skip to content
Permalink
Browse files

Fix GCC class-memaccess warnings (#10239)

  • Loading branch information
pauloue committed Aug 1, 2020
1 parent aba8c37 commit 542df11bed89ebad786220f1162597353ecc277d
Showing with 8 additions and 1 deletion.
  1. +7 −0 src/client/mapblock_mesh.cpp
  2. +1 −1 src/noise.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)
@@ -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;

0 comments on commit 542df11

Please sign in to comment.
You can’t perform that action at this time.