test: cleanup container

test/entt/container/dense_map.cpp

@@ -184,7 +184,7 @@ TEST(DenseMap, Move) {
 }
 
 TEST(DenseMap, Iterator) {
-    using iterator = typename entt::dense_map<int, int>::iterator;
+    using iterator = entt::dense_map<int, int>::iterator;
 
     testing::StaticAssertTypeEq<iterator::value_type, std::pair<const int &, int &>>();
     testing::StaticAssertTypeEq<iterator::pointer, entt::input_iterator_pointer<std::pair<const int &, int &>>>();
@@ -237,7 +237,7 @@ TEST(DenseMap, Iterator) {
 }
 
 TEST(DenseMap, ConstIterator) {
-    using iterator = typename entt::dense_map<int, int>::const_iterator;
+    using iterator = entt::dense_map<int, int>::const_iterator;
 
     testing::StaticAssertTypeEq<iterator::value_type, std::pair<const int &, const int &>>();
     testing::StaticAssertTypeEq<iterator::pointer, entt::input_iterator_pointer<std::pair<const int &, const int &>>>();
@@ -293,8 +293,8 @@ TEST(DenseMap, IteratorConversion) {
     entt::dense_map<int, int> map;
     map.emplace(1, 3);
 
-    const typename entt::dense_map<int, int>::iterator it = map.begin();
-    typename entt::dense_map<int, int>::const_iterator cit = it;
+    const entt::dense_map<int, int>::iterator it = map.begin();
+    entt::dense_map<int, int>::const_iterator cit = it;
 
     testing::StaticAssertTypeEq<decltype(*it), std::pair<const int &, int &>>();
     testing::StaticAssertTypeEq<decltype(*cit), std::pair<const int &, const int &>>();
@@ -316,7 +316,7 @@ TEST(DenseMap, IteratorConversion) {
 
 TEST(DenseMap, Insert) {
     entt::dense_map<int, int> map;
-    typename entt::dense_map<int, int>::iterator it;
+    entt::dense_map<int, int>::iterator it;
     bool result{};
 
     ASSERT_TRUE(map.empty());
@@ -450,7 +450,7 @@ TEST(DenseMap, InsertSameBucket) {
 
 TEST(DenseMap, InsertOrAssign) {
     entt::dense_map<int, int> map;
-    typename entt::dense_map<int, int>::iterator it;
+    entt::dense_map<int, int>::iterator it;
     bool result{};
 
     ASSERT_TRUE(map.empty());
@@ -513,7 +513,7 @@ TEST(DenseMap, InsertOrAssign) {
 
 TEST(DenseMap, Emplace) {
     entt::dense_map<int, int> map;
-    typename entt::dense_map<int, int>::iterator it;
+    entt::dense_map<int, int>::iterator it;
     bool result{};
 
     ASSERT_TRUE(map.empty());
@@ -654,7 +654,7 @@ TEST(DenseMap, EmplaceSameBucket) {
 
 TEST(DenseMap, TryEmplace) {
     entt::dense_map<int, int> map;
-    typename entt::dense_map<int, int>::iterator it;
+    entt::dense_map<int, int>::iterator it;
     bool result{};
 
     ASSERT_TRUE(map.empty());
@@ -990,7 +990,7 @@ ENTT_DEBUG_TEST(DenseMapDeathTest, Indexing) {
 }
 
 TEST(DenseMap, LocalIterator) {
-    using iterator = typename entt::dense_map<std::size_t, std::size_t, entt::identity>::local_iterator;
+    using iterator = entt::dense_map<std::size_t, std::size_t, entt::identity>::local_iterator;
 
     testing::StaticAssertTypeEq<iterator::value_type, std::pair<const std::size_t &, std::size_t &>>();
     testing::StaticAssertTypeEq<iterator::pointer, entt::input_iterator_pointer<std::pair<const std::size_t &, std::size_t &>>>();
@@ -1018,7 +1018,7 @@ TEST(DenseMap, LocalIterator) {
 }
 
 TEST(DenseMap, ConstLocalIterator) {
-    using iterator = typename entt::dense_map<std::size_t, std::size_t, entt::identity>::const_local_iterator;
+    using iterator = entt::dense_map<std::size_t, std::size_t, entt::identity>::const_local_iterator;
 
     testing::StaticAssertTypeEq<iterator::value_type, std::pair<const std::size_t &, const std::size_t &>>();
     testing::StaticAssertTypeEq<iterator::pointer, entt::input_iterator_pointer<std::pair<const std::size_t &, const std::size_t &>>>();
@@ -1049,8 +1049,8 @@ TEST(DenseMap, LocalIteratorConversion) {
     entt::dense_map<int, int> map;
     map.emplace(3, 2);
 
-    const typename entt::dense_map<int, int>::local_iterator it = map.begin(map.bucket(3));
-    typename entt::dense_map<int, int>::const_local_iterator cit = it;
+    const entt::dense_map<int, int>::local_iterator it = map.begin(map.bucket(3));
+    entt::dense_map<int, int>::const_local_iterator cit = it;
 
     testing::StaticAssertTypeEq<decltype(*it), std::pair<const int &, int &>>();
     testing::StaticAssertTypeEq<decltype(*cit), std::pair<const int &, const int &>>();
@@ -1209,7 +1209,7 @@ TEST(DenseMap, NoUsesAllocatorConstruction) {
 }
 
 TEST(DenseMap, KeyUsesAllocatorConstruction) {
-    using string_type = typename test::tracked_memory_resource::string_type;
+    using string_type = test::tracked_memory_resource::string_type;
     using allocator = std::pmr::polymorphic_allocator<std::pair<const string_type, int>>;
 
     test::tracked_memory_resource memory_resource{};
@@ -1232,7 +1232,7 @@ TEST(DenseMap, KeyUsesAllocatorConstruction) {
 }
 
 TEST(DenseMap, ValueUsesAllocatorConstruction) {
-    using string_type = typename test::tracked_memory_resource::string_type;
+    using string_type = test::tracked_memory_resource::string_type;
     using allocator = std::pmr::polymorphic_allocator<std::pair<const int, string_type>>;
 
     test::tracked_memory_resource memory_resource{};

test/entt/container/dense_set.cpp

@@ -173,7 +173,7 @@ TEST(DenseSet, Move) {
 }
 
 TEST(DenseSet, Iterator) {
-    using iterator = typename entt::dense_set<int>::iterator;
+    using iterator = entt::dense_set<int>::iterator;
 
     testing::StaticAssertTypeEq<iterator::value_type, int>();
     testing::StaticAssertTypeEq<iterator::pointer, const int *>();
@@ -226,7 +226,7 @@ TEST(DenseSet, Iterator) {
 }
 
 TEST(DenseSet, ConstIterator) {
-    using iterator = typename entt::dense_set<int>::const_iterator;
+    using iterator = entt::dense_set<int>::const_iterator;
 
     testing::StaticAssertTypeEq<iterator::value_type, int>();
     testing::StaticAssertTypeEq<iterator::pointer, const int *>();
@@ -279,7 +279,7 @@ TEST(DenseSet, ConstIterator) {
 }
 
 TEST(DenseSet, ReverseIterator) {
-    using iterator = typename entt::dense_set<int>::reverse_iterator;
+    using iterator = entt::dense_set<int>::reverse_iterator;
 
     testing::StaticAssertTypeEq<iterator::value_type, int>();
     testing::StaticAssertTypeEq<iterator::pointer, const int *>();
@@ -332,7 +332,7 @@ TEST(DenseSet, ReverseIterator) {
 }
 
 TEST(DenseSet, ConstReverseIterator) {
-    using iterator = typename entt::dense_set<int>::const_reverse_iterator;
+    using iterator = entt::dense_set<int>::const_reverse_iterator;
 
     testing::StaticAssertTypeEq<iterator::value_type, int>();
     testing::StaticAssertTypeEq<iterator::pointer, const int *>();
@@ -388,8 +388,8 @@ TEST(DenseSet, IteratorConversion) {
     entt::dense_set<int> set;
     set.emplace(3);
 
-    const typename entt::dense_set<int, int>::iterator it = set.begin();
-    typename entt::dense_set<int, int>::const_iterator cit = it;
+    const entt::dense_set<int, int>::iterator it = set.begin();
+    entt::dense_set<int, int>::const_iterator cit = it;
 
     testing::StaticAssertTypeEq<decltype(*it), const int &>();
     testing::StaticAssertTypeEq<decltype(*cit), const int &>();
@@ -411,7 +411,7 @@ TEST(DenseSet, IteratorConversion) {
 
 TEST(DenseSet, Insert) {
     entt::dense_set<int> set;
-    typename entt::dense_set<int>::iterator it;
+    entt::dense_set<int>::iterator it;
     bool result{};
 
     ASSERT_TRUE(set.empty());
@@ -513,7 +513,7 @@ TEST(DenseSet, InsertSameBucket) {
 
 TEST(DenseSet, Emplace) {
     entt::dense_set<int> set;
-    typename entt::dense_set<int>::iterator it;
+    entt::dense_set<int>::iterator it;
     bool result{};
 
     ASSERT_TRUE(set.empty());
@@ -813,7 +813,7 @@ TEST(DenseSet, EqualRange) {
 }
 
 TEST(DenseSet, LocalIterator) {
-    using iterator = typename entt::dense_set<std::size_t, entt::identity>::local_iterator;
+    using iterator = entt::dense_set<std::size_t, entt::identity>::local_iterator;
 
     testing::StaticAssertTypeEq<iterator::value_type, std::size_t>();
     testing::StaticAssertTypeEq<iterator::pointer, const std::size_t *>();
@@ -841,7 +841,7 @@ TEST(DenseSet, LocalIterator) {
 }
 
 TEST(DenseSet, ConstLocalIterator) {
-    using iterator = typename entt::dense_set<std::size_t, entt::identity>::const_local_iterator;
+    using iterator = entt::dense_set<std::size_t, entt::identity>::const_local_iterator;
 
     testing::StaticAssertTypeEq<iterator::value_type, std::size_t>();
     testing::StaticAssertTypeEq<iterator::pointer, const std::size_t *>();
@@ -872,8 +872,8 @@ TEST(DenseSet, LocalIteratorConversion) {
     entt::dense_set<int> set;
     set.emplace(3);
 
-    const typename entt::dense_set<int>::local_iterator it = set.begin(set.bucket(3));
-    typename entt::dense_set<int>::const_local_iterator cit = it;
+    const entt::dense_set<int>::local_iterator it = set.begin(set.bucket(3));
+    entt::dense_set<int>::const_local_iterator cit = it;
 
     testing::StaticAssertTypeEq<decltype(*it), const int &>();
     testing::StaticAssertTypeEq<decltype(*cit), const int &>();
@@ -1024,7 +1024,7 @@ TEST(DenseSet, NoUsesAllocatorConstruction) {
 }
 
 TEST(DenseSet, UsesAllocatorConstruction) {
-    using string_type = typename test::tracked_memory_resource::string_type;
+    using string_type = test::tracked_memory_resource::string_type;
     using allocator = std::pmr::polymorphic_allocator<string_type>;
 
     test::tracked_memory_resource memory_resource{};

test/entt/container/table.cpp

@@ -161,11 +161,11 @@ TEST(Table, ShrinkToFit) {
 }
 
 TEST(Table, Iterator) {
-    using iterator = typename entt::table<int, char>::iterator;
+    using iterator = entt::table<int, char>::iterator;
 
-    testing::StaticAssertTypeEq<typename iterator::value_type, std::tuple<int &, char &>>();
-    testing::StaticAssertTypeEq<typename iterator::pointer, entt::input_iterator_pointer<std::tuple<int &, char &>>>();
-    testing::StaticAssertTypeEq<typename iterator::reference, std::tuple<int &, char &>>();
+    testing::StaticAssertTypeEq<iterator::value_type, std::tuple<int &, char &>>();
+    testing::StaticAssertTypeEq<iterator::pointer, entt::input_iterator_pointer<std::tuple<int &, char &>>>();
+    testing::StaticAssertTypeEq<iterator::reference, std::tuple<int &, char &>>();
 
     entt::table<int, char> table;
     table.emplace(3, 'c');
@@ -214,11 +214,11 @@ TEST(Table, Iterator) {
 }
 
 TEST(Table, ConstIterator) {
-    using iterator = typename entt::table<int, char>::const_iterator;
+    using iterator = entt::table<int, char>::const_iterator;
 
-    testing::StaticAssertTypeEq<typename iterator::value_type, std::tuple<const int &, const char &>>();
-    testing::StaticAssertTypeEq<typename iterator::pointer, entt::input_iterator_pointer<std::tuple<const int &, const char &>>>();
-    testing::StaticAssertTypeEq<typename iterator::reference, std::tuple<const int &, const char &>>();
+    testing::StaticAssertTypeEq<iterator::value_type, std::tuple<const int &, const char &>>();
+    testing::StaticAssertTypeEq<iterator::pointer, entt::input_iterator_pointer<std::tuple<const int &, const char &>>>();
+    testing::StaticAssertTypeEq<iterator::reference, std::tuple<const int &, const char &>>();
 
     entt::table<int, char> table;
     table.emplace(3, 'c');
@@ -269,11 +269,11 @@ TEST(Table, ConstIterator) {
 }
 
 TEST(Table, ReverseIterator) {
-    using reverse_iterator = typename entt::table<int, char>::reverse_iterator;
+    using reverse_iterator = entt::table<int, char>::reverse_iterator;
 
-    testing::StaticAssertTypeEq<typename reverse_iterator::value_type, std::tuple<int &, char &>>();
-    testing::StaticAssertTypeEq<typename reverse_iterator::pointer, entt::input_iterator_pointer<std::tuple<int &, char &>>>();
-    testing::StaticAssertTypeEq<typename reverse_iterator::reference, std::tuple<int &, char &>>();
+    testing::StaticAssertTypeEq<reverse_iterator::value_type, std::tuple<int &, char &>>();
+    testing::StaticAssertTypeEq<reverse_iterator::pointer, entt::input_iterator_pointer<std::tuple<int &, char &>>>();
+    testing::StaticAssertTypeEq<reverse_iterator::reference, std::tuple<int &, char &>>();
 
     entt::table<int, char> table;
     table.emplace(3, 'c');
@@ -322,11 +322,11 @@ TEST(Table, ReverseIterator) {
 }
 
 TEST(Table, ConstReverseIterator) {
-    using const_reverse_iterator = typename entt::table<int, char>::const_reverse_iterator;
+    using const_reverse_iterator = entt::table<int, char>::const_reverse_iterator;
 
-    testing::StaticAssertTypeEq<typename const_reverse_iterator::value_type, std::tuple<const int &, const char &>>();
-    testing::StaticAssertTypeEq<typename const_reverse_iterator::pointer, entt::input_iterator_pointer<std::tuple<const int &, const char &>>>();
-    testing::StaticAssertTypeEq<typename const_reverse_iterator::reference, std::tuple<const int &, const char &>>();
+    testing::StaticAssertTypeEq<const_reverse_iterator::value_type, std::tuple<const int &, const char &>>();
+    testing::StaticAssertTypeEq<const_reverse_iterator::pointer, entt::input_iterator_pointer<std::tuple<const int &, const char &>>>();
+    testing::StaticAssertTypeEq<const_reverse_iterator::reference, std::tuple<const int &, const char &>>();
 
     entt::table<int, char> table;
     table.emplace(3, 'c');
@@ -381,8 +381,8 @@ TEST(Table, IteratorConversion) {
 
     table.emplace(3, 'c');
 
-    const typename entt::table<int, char>::iterator it = table.begin();
-    typename entt::table<int, char>::const_iterator cit = it;
+    const entt::table<int, char>::iterator it = table.begin();
+    entt::table<int, char>::const_iterator cit = it;
 
     testing::StaticAssertTypeEq<decltype(*it), std::tuple<int &, char &>>();
     testing::StaticAssertTypeEq<decltype(*cit), std::tuple<const int &, const char &>>();