Selaa lähdekoodia

test: cleanup resource

skypjack 3 kuukautta sitten
vanhempi
commit
f6c688d9e3

+ 5 - 5
test/entt/resource/resource_cache.cpp

@@ -149,7 +149,7 @@ TEST(ResourceCache, Move) {
 TEST(ResourceCache, Iterator) {
     using namespace entt::literals;
 
-    using iterator = typename entt::resource_cache<int>::iterator;
+    using iterator = entt::resource_cache<int>::iterator;
 
     testing::StaticAssertTypeEq<iterator::value_type, std::pair<entt::id_type, entt::resource<int>>>();
     testing::StaticAssertTypeEq<iterator::pointer, entt::input_iterator_pointer<std::pair<entt::id_type, entt::resource<int>>>>();
@@ -204,7 +204,7 @@ TEST(ResourceCache, Iterator) {
 TEST(ResourceCache, ConstIterator) {
     using namespace entt::literals;
 
-    using iterator = typename entt::resource_cache<int>::const_iterator;
+    using iterator = entt::resource_cache<int>::const_iterator;
 
     testing::StaticAssertTypeEq<iterator::value_type, std::pair<entt::id_type, entt::resource<const int>>>();
     testing::StaticAssertTypeEq<iterator::pointer, entt::input_iterator_pointer<std::pair<entt::id_type, entt::resource<const int>>>>();
@@ -262,8 +262,8 @@ TEST(ResourceCache, IteratorConversion) {
     entt::resource_cache<int> cache;
     cache.load("resource"_hs, 2);
 
-    const typename entt::resource_cache<int>::iterator it = cache.begin();
-    typename entt::resource_cache<int>::const_iterator cit = it;
+    const entt::resource_cache<int>::iterator it = cache.begin();
+    entt::resource_cache<int>::const_iterator cit = it;
 
     testing::StaticAssertTypeEq<decltype(*it), std::pair<entt::id_type, entt::resource<int>>>();
     testing::StaticAssertTypeEq<decltype(*cit), std::pair<entt::id_type, entt::resource<const int>>>();
@@ -287,7 +287,7 @@ TEST(ResourceCache, Load) {
     using namespace entt::literals;
 
     entt::resource_cache<int> cache;
-    typename entt::resource_cache<int>::iterator it;
+    entt::resource_cache<int>::iterator it;
     bool result{};
 
     ASSERT_TRUE(cache.empty());

+ 1 - 1
test/entt/resource/resource_loader.cpp

@@ -6,7 +6,7 @@ TEST(ResourceLoader, Functionalities) {
     using loader_type = entt::resource_loader<int>;
     const auto resource = loader_type{}(4);
 
-    testing::StaticAssertTypeEq<typename loader_type::result_type, std::shared_ptr<int>>();
+    testing::StaticAssertTypeEq<loader_type::result_type, std::shared_ptr<int>>();
 
     ASSERT_TRUE(resource);
     ASSERT_EQ(*resource, 4);