From 604778248de1836059610e98832b3103a6575596 Mon Sep 17 00:00:00 2001 From: Kp Date: Sun, 29 May 2016 17:46:32 +0000 Subject: [PATCH] Fix -Wshadow warning in get_chunks_state get_chunks_state has a member named `data` and its constructor took a parameter named `data`. This is unambiguous in the language, but causes a warning from gcc's -Wshadow when building with WORDS_NEED_ALIGNMENT. Rename the parameter to eliminate the warning. Reported-by: derhass --- similar/3d/interp.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/similar/3d/interp.cpp b/similar/3d/interp.cpp index 46a3d7ef3..2d8097903 100644 --- a/similar/3d/interp.cpp +++ b/similar/3d/interp.cpp @@ -687,8 +687,8 @@ class get_chunks_state : chunk *const list; int *const no; public: - get_chunks_state(const uint8_t *data, uint8_t *ndata, chunk *l, int *n) : - data(data), new_data(ndata), list(l), no(n) + get_chunks_state(const uint8_t *const p, uint8_t *const ndata, chunk *const l, int *const n) : + data(p), new_data(ndata), list(l), no(n) { } static uint_fast32_t translate_opcode(const uint8_t *, const uint16_t op)