Skip to content

Remove shadow declarations #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
james-d-mitchell merged 2 commits into from
Mar 5, 2025
Merged

Remove shadow declarations #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e13005b
Remove shadow declarations
james-d-mitchell Mar 4, 2025
9d63c62
Suppress some compile warnings in simde
james-d-mitchell Mar 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions include/hpcombi/epu8.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,16 @@ eg simde_mm_testz_si128(a,a) → is_all_zero(a) */
#include "debug.hpp" // for HPCOMBI_ASSERT
#include "vect_generic.hpp" // for VectGeneric

#if defined(__GNUC__) && !defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wswitch-default"
#pragma GCC diagnostic ignored "-Wpacked"
#endif
#include "simde/x86/sse4.1.h" // for simde_mm_max_epu8, simde...
#include "simde/x86/sse4.2.h" // for ???
#if defined(__GNUC__) && !defined(__clang__)
#pragma GCC diagnostic pop
#endif

namespace HPCombi {

Expand Down
24 changes: 17 additions & 7 deletions include/hpcombi/perm16.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,16 @@
#include "power.hpp" // for pow
#include "vect16.hpp" // for hash, is_partial_permutation

#if defined(__GNUC__) && !defined(__clang__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wswitch-default"
#pragma GCC diagnostic ignored "-Wpacked"
#endif
#include "simde/x86/sse4.1.h"
#include "simde/x86/sse4.2.h"
#if defined(__GNUC__) && !defined(__clang__)
#pragma GCC diagnostic pop
#endif

namespace HPCombi {

Expand All @@ -60,7 +68,7 @@ struct alignas(16) PTransf16 : public Vect16 {

PTransf16() = default;

constexpr PTransf16(const vect v) : Vect16(v) {}
constexpr PTransf16(const vect vv) : Vect16(vv) {}
constexpr PTransf16(const epu8 x) : Vect16(x) {}
PTransf16(std::vector<uint8_t> dom, std::vector<uint8_t> rng,
size_t = 0 /* unused */);
Expand Down Expand Up @@ -130,8 +138,9 @@ ie as opposed to a permutation, it is not necessarily injective.
Here n is hard-coded to 16. */
struct Transf16 : public PTransf16 {
Transf16() = default;
constexpr Transf16(const Transf16 &v) = default;
/* implicit */ constexpr Transf16(const vect v) : PTransf16(v) {} // NOLINT
constexpr Transf16(const Transf16 &vv) = default;
/* implicit */ constexpr Transf16(const vect vv) // NOLINT
: PTransf16(vv) {}
/* implicit */ constexpr Transf16(const epu8 x) : PTransf16(x) {} // NOLINT
Transf16(std::initializer_list<uint8_t> il) : PTransf16(il) {}
Transf16 &operator=(const Transf16 &) = default;
Expand Down Expand Up @@ -159,8 +168,9 @@ partial means it might not be defined everywhere (but where it's defined, it's
injective). Undefined images are encoded as 0xFF. */
struct PPerm16 : public PTransf16 {
PPerm16() = default;
constexpr PPerm16(const PPerm16 &v) = default;
/* implicit */ constexpr PPerm16(const vect v) : PTransf16(v) {} // NOLINT
constexpr PPerm16(const PPerm16 &vv) = default;
/* implicit */ constexpr PPerm16(const vect vv) // NOLINT
: PTransf16(vv) {}
/* implicit */ constexpr PPerm16(const epu8 x) : PTransf16(x) {} // NOLINT
PPerm16(std::vector<uint8_t> dom, std::vector<uint8_t> rng,
size_t = 0 /* unused */)
Expand Down Expand Up @@ -220,8 +230,8 @@ struct PPerm16 : public PTransf16 {
struct Perm16 : public Transf16 /* public PPerm : diamond problem */ {
Perm16() = default;
constexpr Perm16(const Perm16 &) = default;
/* implicit */ constexpr Perm16(const vect v) : Transf16(v) {} // NOLINT
/* implicit */ constexpr Perm16(const epu8 x) : Transf16(x) {} // NOLINT
/* implicit */ constexpr Perm16(const vect vv) : Transf16(vv) {} // NOLINT
/* implicit */ constexpr Perm16(const epu8 x) : Transf16(x) {} // NOLINT
Perm16 &operator=(const Perm16 &) = default;
Perm16(std::initializer_list<uint8_t> il) : Transf16(il) {}

Expand Down