*: fix C++20 global module fragment inclusion (#1047)

skypjack · Aug 18, 2023 · 12b6ee0 · 12b6ee0
1 parent 90dcd26
commit 12b6ee0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/entt/core/type_info.hpp b/src/entt/core/type_info.hpp
@@ -38,26 +38,26 @@ template<typename Type>
 }
 
 template<typename Type, auto = stripped_type_name<Type>().find_first_of('.')>
-[[nodiscard]] static constexpr std::string_view type_name(int) noexcept {
+[[nodiscard]] constexpr std::string_view type_name(int) noexcept {
  constexpr auto value = stripped_type_name<Type>();
  return value;
 }
 
 template<typename Type>
-[[nodiscard]] static std::string_view type_name(char) noexcept {
+[[nodiscard]] std::string_view type_name(char) noexcept {
  static const auto value = stripped_type_name<Type>();
  return value;
 }
 
 template<typename Type, auto = stripped_type_name<Type>().find_first_of('.')>
-[[nodiscard]] static constexpr id_type type_hash(int) noexcept {
+[[nodiscard]] constexpr id_type type_hash(int) noexcept {
  constexpr auto stripped = stripped_type_name<Type>();
  constexpr auto value = hashed_string::value(stripped.data(), stripped.size());
  return value;
 }
 
 template<typename Type>
-[[nodiscard]] static id_type type_hash(char) noexcept {
+[[nodiscard]] id_type type_hash(char) noexcept {
  static const auto value = [](const auto stripped) {
  return hashed_string::value(stripped.data(), stripped.size());
  }(stripped_type_name<Type>());

diff --git a/src/entt/entity/entity.hpp b/src/entt/entity/entity.hpp
@@ -18,7 +18,7 @@ namespace internal {
 
 // waiting for C++20 (and std::popcount)
 template<typename Type>
-static constexpr int popcount(Type value) noexcept {
+constexpr int popcount(Type value) noexcept {
  return value ? (int(value & 1) + popcount(value >> 1)) : 0;
 }