Scarfski/entt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

type_info: minor changes

Browse Source
This commit is contained in:
Michele Caini
2020-12-12 14:51:41 +01:00
parent 4a537d82d3
commit be88d5dfb8
2 changed files with 7 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/entt/core/type_info.hpp
View File

@@ -238,20 +238,13 @@ private:
template<typename Type>
type_info type_id() ENTT_NOEXCEPT {
return type_info{
type_seq<std::remove_reference_t<std::remove_const_t<Type>>>::value(),
type_hash<std::remove_reference_t<std::remove_const_t<Type>>>::value(),
type_name<std::remove_reference_t<std::remove_const_t<Type>>>::value()
type_seq<std::remove_const_t<std::remove_reference_t<Type>>>::value(),
type_hash<std::remove_const_t<std::remove_reference_t<Type>>>::value(),
type_name<std::remove_const_t<std::remove_reference_t<Type>>>::value()
};
}
/*! @copydoc type_id */
template<typename Type>
type_info type_id(Type &&) ENTT_NOEXCEPT {
return type_id<Type>();
}
}

15
test/entt/core/type_info.cpp
View File

@@ -41,18 +41,11 @@ TEST(TypeInfo, Functionalities) {
ASSERT_NE(entt::type_id<int>(), entt::type_id<char>());
auto info = entt::type_id<int>();
auto other = entt::type_id(42);
entt::type_info empty{};
ASSERT_EQ(info, other);
ASSERT_NE(info, empty);
ASSERT_TRUE(info == info);
ASSERT_FALSE(info != other);
ASSERT_EQ(info.seq(), other.seq());
ASSERT_EQ(info.hash(), other.hash());
ASSERT_EQ(info.name(), other.name());
ASSERT_FALSE(info != info);
ASSERT_EQ(info.seq(), entt::type_seq<int>::value());
ASSERT_EQ(info.hash(), entt::type_hash<int>::value());
@@ -60,7 +53,6 @@ TEST(TypeInfo, Functionalities) {
ASSERT_FALSE(empty);
ASSERT_TRUE(info);
ASSERT_TRUE(other);
empty = info;
@@ -70,9 +62,10 @@ TEST(TypeInfo, Functionalities) {
empty = {};
ASSERT_FALSE(empty);
ASSERT_NE(empty.hash(), info.hash());
empty = std::move(other);
empty = std::move(info);
ASSERT_TRUE(empty);
ASSERT_EQ(empty.hash(), other.hash());
ASSERT_EQ(empty.hash(), info.hash());
}