From 8ed0f61dc63f1a483a6da8ef059c6443a8b410ba Mon Sep 17 00:00:00 2001 From: Savio Sena Date: Mon, 21 Jul 2014 20:18:51 -0300 Subject: [PATCH] eina-cxx: Remove warnings from tests. --- src/tests/eina_cxx/eina_cxx_test_ptrarray.cc | 8 +++--- src/tests/eina_cxx/eina_cxx_test_ptrlist.cc | 26 ++++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/tests/eina_cxx/eina_cxx_test_ptrarray.cc b/src/tests/eina_cxx/eina_cxx_test_ptrarray.cc index f52f99af54..5c41511b0d 100644 --- a/src/tests/eina_cxx/eina_cxx_test_ptrarray.cc +++ b/src/tests/eina_cxx/eina_cxx_test_ptrarray.cc @@ -57,7 +57,7 @@ START_TEST(eina_cxx_ptrarray_push_back) } { wrapper result_[] = {w1, w2, w3}; - wrapper rresult[] = {w3, w2, w1}; + wrapper rresult_[] = {w3, w2, w1}; efl::eina::array array; @@ -67,7 +67,7 @@ START_TEST(eina_cxx_ptrarray_push_back) ck_assert(array.size() == 3); ck_assert(std::equal(array.begin(), array.end(), result_)); - ck_assert(std::equal(array.rbegin(), array.rend(), rresult)); + ck_assert(std::equal(array.rbegin(), array.rend(), rresult_)); } } END_TEST @@ -117,11 +117,11 @@ START_TEST(eina_cxx_ptrarray_pop_back) array.pop_back(); wrapper result_[] = {w1, w2}; - wrapper rresult[] = {w2, w1}; + wrapper rresult_[] = {w2, w1}; ck_assert(array.size() == 2); ck_assert(std::equal(array.begin(), array.end(), result_)); - ck_assert(std::equal(array.rbegin(), array.rend(), rresult)); + ck_assert(std::equal(array.rbegin(), array.rend(), rresult_)); } } END_TEST diff --git a/src/tests/eina_cxx/eina_cxx_test_ptrlist.cc b/src/tests/eina_cxx/eina_cxx_test_ptrlist.cc index 8804310c01..46378ee784 100644 --- a/src/tests/eina_cxx/eina_cxx_test_ptrlist.cc +++ b/src/tests/eina_cxx/eina_cxx_test_ptrlist.cc @@ -87,17 +87,17 @@ START_TEST(eina_cxx_ptrlist_push_back) ck_assert(std::equal(list.rbegin(), list.rend(), rresult)); } { - wrapper result[] = {w1, w2, w3}; - wrapper rresult[] = {w3, w2, w1}; - + wrapper result_[] = {w1, w2, w3}; + wrapper rresult_[] = {w3, w2, w1}; + efl::eina::list list; list.push_back(w1); list.push_back(w2); list.push_back(w3); ck_assert(list.size() == 3); - ck_assert(std::equal(list.begin(), list.end(), result)); - ck_assert(std::equal(list.rbegin(), list.rend(), rresult)); + ck_assert(std::equal(list.begin(), list.end(), result_)); + ck_assert(std::equal(list.rbegin(), list.rend(), rresult_)); } } END_TEST @@ -139,8 +139,8 @@ START_TEST(eina_cxx_ptrlist_pop_back) ck_assert(std::equal(list.rbegin(), list.rend(), rresult)); } { - wrapper result[] = {w1, w2}; - wrapper rresult[] = {w2, w1}; + wrapper result_[] = {w1, w2}; + wrapper rresult_[] = {w2, w1}; efl::eina::list list; @@ -150,8 +150,8 @@ START_TEST(eina_cxx_ptrlist_pop_back) list.pop_back(); ck_assert(list.size() == 2); - ck_assert(std::equal(list.begin(), list.end(), result)); - ck_assert(std::equal(list.rbegin(), list.rend(), rresult)); + ck_assert(std::equal(list.begin(), list.end(), result_)); + ck_assert(std::equal(list.rbegin(), list.rend(), rresult_)); } } END_TEST @@ -233,8 +233,8 @@ START_TEST(eina_cxx_ptrlist_pop_front) ck_assert(std::equal(list.rbegin(), list.rend(), rresult)); } { - wrapper result[] = {w2, w1}; - wrapper rresult[] = {w1, w2}; + wrapper result_[] = {w2, w1}; + wrapper rresult_[] = {w1, w2}; efl::eina::list list; @@ -244,8 +244,8 @@ START_TEST(eina_cxx_ptrlist_pop_front) list.pop_front(); ck_assert(list.size() == 2); - ck_assert(std::equal(list.begin(), list.end(), result)); - ck_assert(std::equal(list.rbegin(), list.rend(), rresult)); + ck_assert(std::equal(list.begin(), list.end(), result_)); + ck_assert(std::equal(list.rbegin(), list.rend(), rresult_)); } } END_TEST