@@ -31,22 +31,22 @@ TEST(PolyGetAny, Functionalities) {
3131TEST (PolyGetAnyPointer, Functionalities) {
3232 entt::registry reg;
3333
34- cat cat1;
35- dog dog1;
36- dog dog2;
37- cube cube2;
38- sphere sphere2;
39- fat_cat fat_cat3;
34+ auto cat1 = std::make_unique<cat>() ;
35+ auto dog1 = std::make_unique<dog>() ;
36+ auto dog2 = std::make_unique<dog>() ;
37+ auto cube2 = std::make_unique<cube>() ;
38+ auto sphere2 = std::make_unique<sphere>() ;
39+ auto fat_cat3 = std::make_unique<fat_cat>() ;
4040
4141 entt::entity entity1 = reg.create (); // components: cat, dog
4242 entt::entity entity2 = reg.create (); // components: dog, sphere, cube
4343 entt::entity entity3 = reg.create (); // components: fat_cat
44- reg.emplace <cat*>(entity1, & cat1);
45- reg.emplace <dog*>(entity1, & dog1);
46- reg.emplace <dog*>(entity2, & dog2);
47- reg.emplace <cube*>(entity2, & cube2);
48- reg.emplace <sphere*>(entity2, & sphere2);
49- reg.emplace <fat_cat*>(entity3, & fat_cat3);
44+ reg.emplace <cat*>(entity1, cat1. get () );
45+ reg.emplace <dog*>(entity1, dog1. get () );
46+ reg.emplace <dog*>(entity2, dog2. get () );
47+ reg.emplace <cube*>(entity2, cube2. get () );
48+ reg.emplace <sphere*>(entity2, sphere2. get () );
49+ reg.emplace <fat_cat*>(entity3, fat_cat3. get () );
5050
5151 ASSERT_EQ (entt::algorithm::poly_get_any<shape*>(reg, entity1), nullptr );
5252 ASSERT_EQ (entt::algorithm::poly_get_any<cat*>(reg, entity1), reg.get <cat*>(entity1));
@@ -129,22 +129,22 @@ TEST(PolyGetAll, Functionalities) {
129129TEST (PolyGetAllPointers, Functionalities) {
130130 entt::registry reg;
131131
132- cat cat1;
133- dog dog1;
134- dog dog2;
135- cube cube2;
136- sphere sphere2;
137- fat_cat fat_cat3;
132+ auto cat1 = std::make_unique<cat>() ;
133+ auto dog1 = std::make_unique<dog>() ;
134+ auto dog2 = std::make_unique<dog>() ;
135+ auto cube2 = std::make_unique<cube>() ;
136+ auto sphere2 = std::make_unique<sphere>() ;
137+ auto fat_cat3 = std::make_unique<fat_cat>() ;
138138
139139 entt::entity entity1 = reg.create (); // components: cat(payload=1), dog(payload=2)
140140 entt::entity entity2 = reg.create (); // components: dog(payload=2), cube(payload=3), sphere(payload=4)
141141 entt::entity entity3 = reg.create (); // components: fat_cat(both payloads = 5)
142- reg.emplace <cat*>(entity1, & cat1)->animal_payload = 1 ;
143- reg.emplace <dog*>(entity1, & dog1)->animal_payload = 2 ;
144- reg.emplace <dog*>(entity2, & dog2)->animal_payload = 2 ;
145- reg.emplace <cube*>(entity2, & cube2)->shape_payload = 3 ;
146- reg.emplace <sphere*>(entity2, & sphere2)->shape_payload = 4 ;
147- auto * c = reg.emplace <fat_cat*>(entity3, & fat_cat3);
142+ reg.emplace <cat*>(entity1, cat1. get () )->animal_payload = 1 ;
143+ reg.emplace <dog*>(entity1, dog1. get () )->animal_payload = 2 ;
144+ reg.emplace <dog*>(entity2, dog2. get () )->animal_payload = 2 ;
145+ reg.emplace <cube*>(entity2, cube2. get () )->shape_payload = 3 ;
146+ reg.emplace <sphere*>(entity2, sphere2. get () )->shape_payload = 4 ;
147+ auto * c = reg.emplace <fat_cat*>(entity3, fat_cat3. get () );
148148 c->animal_payload = c->shape_payload = 5 ;
149149
150150 {
@@ -300,22 +300,22 @@ TEST(PolyEach, Functionalities) {
300300TEST (PolyEachPointer, Functionalities) {
301301 entt::registry reg;
302302
303- cat cat1;
304- dog dog1;
305- dog dog2;
306- cube cube2;
307- sphere sphere2;
308- fat_cat fat_cat3;
303+ auto cat1 = std::make_unique<cat>() ;
304+ auto dog1 = std::make_unique<dog>() ;
305+ auto dog2 = std::make_unique<dog>() ;
306+ auto cube2 = std::make_unique<cube>() ;
307+ auto sphere2 = std::make_unique<sphere>() ;
308+ auto fat_cat3 = std::make_unique<fat_cat>() ;
309309
310310 entt::entity entity1 = reg.create (); // components: cat(payload=1), dog(payload=2)
311311 entt::entity entity2 = reg.create (); // components: dog(payload=2), cube(payload=3), sphere(payload=4)
312312 entt::entity entity3 = reg.create (); // components: fat_cat(both payloads = 5)
313- reg.emplace <cat*>(entity1, & cat1)->animal_payload = 1 ;
314- reg.emplace <dog*>(entity1, & dog1)->animal_payload = 2 ;
315- reg.emplace <dog*>(entity2, & dog2)->animal_payload = 2 ;
316- reg.emplace <cube*>(entity2, & cube2)->shape_payload = 3 ;
317- reg.emplace <sphere*>(entity2, & sphere2)->shape_payload = 4 ;
318- auto * c = reg.emplace <fat_cat*>(entity3, & fat_cat3);
313+ reg.emplace <cat*>(entity1, cat1. get () )->animal_payload = 1 ;
314+ reg.emplace <dog*>(entity1, dog1. get () )->animal_payload = 2 ;
315+ reg.emplace <dog*>(entity2, dog2. get () )->animal_payload = 2 ;
316+ reg.emplace <cube*>(entity2, cube2. get () )->shape_payload = 3 ;
317+ reg.emplace <sphere*>(entity2, sphere2. get () )->shape_payload = 4 ;
318+ auto * c = reg.emplace <fat_cat*>(entity3, fat_cat3. get () );
319319 c->animal_payload = c->shape_payload = 5 ;
320320
321321 {
0 commit comments