diff options
Diffstat (limited to 'src/tests/eina_cxx/eina_cxx_test_ptrlist.cc')
| -rw-r--r-- | src/tests/eina_cxx/eina_cxx_test_ptrlist.cc | 50 |
1 files changed, 28 insertions, 22 deletions
diff --git a/src/tests/eina_cxx/eina_cxx_test_ptrlist.cc b/src/tests/eina_cxx/eina_cxx_test_ptrlist.cc index 039ef971bc..2c10263424 100644 --- a/src/tests/eina_cxx/eina_cxx_test_ptrlist.cc +++ b/src/tests/eina_cxx/eina_cxx_test_ptrlist.cc @@ -28,9 +28,10 @@ START_TEST(eina_cxx_ptrlist_push_back) int result[] = {5, 10, 15}; int rresult[] = {15, 10, 5}; - wrapper const w1(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w2(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w3(eo_add(SIMPLE_CLASS, NULL)); + Eo* eoptr = nullptr; + wrapper const w1(eo_add(&eoptr, SIMPLE_CLASS, NULL)); + wrapper const w2(eo_add(&eoptr, SIMPLE_CLASS, NULL)); + wrapper const w3(eo_add(&eoptr, SIMPLE_CLASS, NULL)); { efl::eina::ptr_list<int> list; @@ -77,9 +78,10 @@ START_TEST(eina_cxx_ptrlist_pop_back) int result[] = {5, 10}; int rresult[] = {10, 5}; - wrapper const w1(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w2(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w3(eo_add(SIMPLE_CLASS, NULL)); + Eo* eoptr = nullptr; + wrapper const w1(eo_add(&eoptr, SIMPLE_CLASS, NULL)); + wrapper const w2(eo_add(&eoptr, SIMPLE_CLASS, NULL)); + wrapper const w3(eo_add(&eoptr, SIMPLE_CLASS, NULL)); { efl::eina::ptr_list<int> list; @@ -143,9 +145,10 @@ START_TEST(eina_cxx_ptrlist_push_front) ck_assert(std::equal(list.rbegin(), list.rend(), rresult)); } { - wrapper const w1(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w2(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w3(eo_add(SIMPLE_CLASS, NULL)); + Eo* eoptr = nullptr; + wrapper const w1(eo_add(&eoptr, SIMPLE_CLASS, NULL)); + wrapper const w2(eo_add(&eoptr, SIMPLE_CLASS, NULL)); + wrapper const w3(eo_add(&eoptr, SIMPLE_CLASS, NULL)); efl::eina::list<wrapper> list; @@ -171,9 +174,10 @@ START_TEST(eina_cxx_ptrlist_pop_front) int result[] = {10, 5}; int rresult[] = {5, 10}; - wrapper const w1(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w2(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w3(eo_add(SIMPLE_CLASS, NULL)); + Eo* eoptr = nullptr; + wrapper const w1(eo_add(&eoptr, SIMPLE_CLASS, NULL)); + wrapper const w2(eo_add(&eoptr, SIMPLE_CLASS, NULL)); + wrapper const w3(eo_add(&eoptr, SIMPLE_CLASS, NULL)); { efl::eina::ptr_list<int> list; @@ -273,11 +277,12 @@ START_TEST(eina_cxx_ptrlist_insert) ck_assert(std::equal(list.begin(), list.end(), list4.begin())); } { - wrapper const w0(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w1(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w2(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w3(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w4(eo_add(SIMPLE_CLASS, NULL)); + Eo* eoptr = nullptr; + wrapper const w0(eo_add(&eoptr, SIMPLE_CLASS, NULL)); + wrapper const w1(eo_add(&eoptr, SIMPLE_CLASS, NULL)); + wrapper const w2(eo_add(&eoptr, SIMPLE_CLASS, NULL)); + wrapper const w3(eo_add(&eoptr, SIMPLE_CLASS, NULL)); + wrapper const w4(eo_add(&eoptr, SIMPLE_CLASS, NULL)); efl::eina::list<wrapper> list; @@ -366,11 +371,12 @@ START_TEST(eina_cxx_ptrlist_constructors) ck_assert(list2 == list4); } { - wrapper const w0(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w1(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w2(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w3(eo_add(SIMPLE_CLASS, NULL)); - wrapper const w4(eo_add(SIMPLE_CLASS, NULL)); + Eo* eoptr = nullptr; + wrapper const w0(eo_add(&eoptr, SIMPLE_CLASS, NULL)); + wrapper const w1(eo_add(&eoptr, SIMPLE_CLASS, NULL)); + wrapper const w2(eo_add(&eoptr, SIMPLE_CLASS, NULL)); + wrapper const w3(eo_add(&eoptr, SIMPLE_CLASS, NULL)); + wrapper const w4(eo_add(&eoptr, SIMPLE_CLASS, NULL)); efl::eina::list<wrapper> list1; ck_assert(list1.empty()); |