sha512sum/nameof_module
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

workaround std::array in some cases is missing constexpr on some of its functions

Browse source
This commit is contained in:
neargye 2021-03-10 11:39:56 +02:00
parent 3a52b520c9
commit f57dcf410a
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
include/nameof.hpp
View file

@ -204,7 +204,7 @@ class [[nodiscard]] cstring {
cstring& operator=(cstring&&) = default; cstring& operator=(cstring&&) = default;
[[nodiscard]] constexpr const_pointer data() const noexcept { return chars_.data(); } [[nodiscard]] constexpr const_pointer data() const noexcept { return chars_; }
[[nodiscard]] constexpr size_type size() const noexcept { return N; } [[nodiscard]] constexpr size_type size() const noexcept { return N; }
@ -226,8 +226,6 @@ class [[nodiscard]] cstring {
[[nodiscard]] constexpr const_reference operator[](size_type i) const noexcept { return assert(i < size()), chars_[i]; } [[nodiscard]] constexpr const_reference operator[](size_type i) const noexcept { return assert(i < size()), chars_[i]; }
[[nodiscard]] constexpr const_reference at(size_type i) const { return assert(i < size()), chars_.at(i); }
[[nodiscard]] constexpr const_reference front() const noexcept { return chars_[0]; } [[nodiscard]] constexpr const_reference front() const noexcept { return chars_[0]; }
[[nodiscard]] constexpr const_reference back() const noexcept { return chars_[N]; } [[nodiscard]] constexpr const_reference back() const noexcept { return chars_[N]; }
@ -252,9 +250,9 @@ class [[nodiscard]] cstring {
private: private:
template <std::size_t... I> template <std::size_t... I>
constexpr cstring(string_view str, std::index_sequence<I...>) noexcept : chars_{{str[I]..., '\0'}} {} constexpr cstring(string_view str, std::index_sequence<I...>) noexcept : chars_{str[I]..., '\0'} {}
std::array<char, N + 1> chars_; char chars_[N + 1];
}; };
template <std::size_t N> template <std::size_t N>
@ -407,6 +405,11 @@ constexpr string_view pretty_name(string_view name, bool remove_suffix = true) n
return {}; // Invalid name. return {}; // Invalid name.
} }
template <typename T, std::size_t N, std::size_t... I>
constexpr std::array<std::remove_cv_t<T>, N> to_array(T (&a)[N], std::index_sequence<I...>) {
return {{a[I]...}};
}
template <typename L, typename R> template <typename L, typename R>
constexpr bool cmp_less(L lhs, R rhs) noexcept { constexpr bool cmp_less(L lhs, R rhs) noexcept {
static_assert(std::is_integral_v<L> && std::is_integral_v<R>, "nameof::detail::cmp_less requires integral type."); static_assert(std::is_integral_v<L> && std::is_integral_v<R>, "nameof::detail::cmp_less requires integral type.");
@ -539,9 +542,9 @@ constexpr E value(std::size_t i) noexcept {
} }
template <std::size_t N> template <std::size_t N>
constexpr std::size_t values_count(const std::array<bool, N>& valid) noexcept { constexpr std::size_t values_count(const bool (&valid)[N]) noexcept {
auto count = std::size_t{0}; auto count = std::size_t{0};
for (std::size_t i = 0; i < valid.size(); ++i) { for (std::size_t i = 0; i < N; ++i) {
if (valid[i]) { if (valid[i]) {
++count; ++count;
} }
@ -553,17 +556,17 @@ constexpr std::size_t values_count(const std::array<bool, N>& valid) noexcept {
template <typename E, bool IsFlags, int Min, std::size_t... I> template <typename E, bool IsFlags, int Min, std::size_t... I>
constexpr auto values(std::index_sequence<I...>) noexcept { constexpr auto values(std::index_sequence<I...>) noexcept {
static_assert(is_enum_v<E>, "nameof::detail::values requires enum type."); static_assert(is_enum_v<E>, "nameof::detail::values requires enum type.");
constexpr std::array<bool, sizeof...(I)> valid{{is_valid<E, value<E, Min, IsFlags>(I)>()...}}; constexpr bool valid[sizeof...(I)] = {is_valid<E, value<E, Min, IsFlags>(I)>()...};
constexpr std::size_t count = values_count(valid); constexpr std::size_t count = values_count(valid);
std::array<E, count> values{}; E values[count] = {};
for (std::size_t i = 0, v = 0; v < count; ++i) { for (std::size_t i = 0, v = 0; v < count; ++i) {
if (valid[i]) { if (valid[i]) {
values[v++] = value<E, Min, IsFlags>(i); values[v++] = value<E, Min, IsFlags>(i);
} }
} }
return values; return to_array(values, std::make_index_sequence<count>{});
} }
template <typename E, bool IsFlags, typename U = std::underlying_type_t<E>> template <typename E, bool IsFlags, typename U = std::underlying_type_t<E>>