Skip to content

Fix build with libc++ #19

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix build with libc++ #19

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 14 additions & 4 deletions mph
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,14 @@ namespace mph::inline v5_0_5 {
#pragma once
#pragma GCC system_header

#if __has_include(<experimental/simd>)
#include <cstdint>

#ifndef MPH_EXPERIMENTAL_SIMD
#define MPH_EXPERIMENTAL_SIMD 0
#endif

#if __GLIBCXX__ && __has_include(<experimental/simd>)
#define MPH_EXPERIMENTAL_SIMD 1
#include <experimental/simd>
#endif

Expand Down Expand Up @@ -1114,7 +1121,7 @@ struct find$pext {
utility::array<key_mapped_type, mask_type(1) << __builtin_popcountl(mask)> lut{};
};

#if __has_include(<experimental/simd>)
#if MPH_EXPERIMENTAL_SIMD
template<const auto& entries, u32 BucketSize>
struct find$simd {
using key_type = typename detail::traits<entries>::key_type;
Expand Down Expand Up @@ -1180,7 +1187,7 @@ template<const auto& entries> inline constexpr auto lookup =
template<const auto& entries> inline constexpr auto find =
[]<u8 probability = 50u>
requires (probability >= 0u and probability <= 100u)
#if not __has_include(<experimental/simd>)
#if not MPH_EXPERIMENTAL_SIMD
and (entries.size() <= 64u)
#endif
([[maybe_unused]] const auto& key, [[maybe_unused]] const auto&... ts) {
Expand All @@ -1197,7 +1204,7 @@ template<const auto& entries> inline constexpr auto find =
return type_traits::constant_t<find$pext<entries>>::value.template
operator()<probability>(key, ts...);
}
#if __has_include(<experimental/simd>)
#if MPH_EXPERIMENTAL_SIMD
else {
constexpr auto bucket_size = std::experimental::simd_size_v<key_type, std::experimental::simd_abi::native<key_type>>;
return type_traits::constant_t<find$simd<entries, bucket_size>>::value.template
Expand All @@ -1208,6 +1215,9 @@ template<const auto& entries> inline constexpr auto find =
} // namespace mph

#ifndef NTEST

#include <array>

static_assert(([] {
constexpr auto expect = [](bool cond) { if (not cond) { void failed(); failed(); } };

Expand Down