kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cxx: Fix manual code after efl_app change. 

Test Plan: Run make check

Reviewers: felipealmeida

Subscribers: cedric

Differential Revision: https://phab.enlightenment.org/D5827
This commit is contained in:
Lauro Moura 2018-02-26 21:14:09 -03:00 committed by Felipe Magno de Almeida
parent 568b524411
commit 135154303b
2 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bindings/cxx/eo_cxx/eo_promise.hh
View File

@ -30,7 +30,7 @@ struct promise_common
explicit promise_common(std::nullptr_t) : _promise(nullptr) {}
promise_common()
{
_promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
_promise = efl_add(EFL_PROMISE_CLASS, efl_app_main_loop_get(efl_app_get()));
}
~promise_common()
{

66
src/tests/eo_cxx/eo_cxx_test_promise.cc
View File

@ -16,7 +16,7 @@ START_TEST(eo_cxx_future_construct_and_destroy)
ecore_init();
{
p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
p = efl_add(EFL_PROMISE_CLASS, efl_app_main_loop_get(efl_app_get()));
fail_if(!p);
f = efl_promise_future_get(p);
@ -35,7 +35,7 @@ START_TEST(eo_cxx_future_wait)
ecore_init();
p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
p = efl_add(EFL_PROMISE_CLASS, efl_app_main_loop_get(efl_app_get()));
fail_if(!p);
f = efl_promise_future_get(p);
@ -74,7 +74,7 @@ START_TEST(eo_cxx_future_get)
ecore_init();
p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
p = efl_add(EFL_PROMISE_CLASS, efl_app_main_loop_get(efl_app_get()));
fail_if(!p);
f = efl_promise_future_get(p);
@ -114,7 +114,7 @@ START_TEST(eo_cxx_future_get_error)
ecore_init();
p = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
p = efl_add(EFL_PROMISE_CLASS, efl_app_main_loop_get(efl_app_get()));
fail_if(!p);
f = efl_promise_future_get(p);
@ -157,7 +157,7 @@ START_TEST(eo_cxx_future_then_value)
ecore_init();
promise = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
promise = efl_add(EFL_PROMISE_CLASS, efl_app_main_loop_get(efl_app_get()));
fail_if(!promise);
f = efl_promise_future_get(promise);
@ -208,13 +208,13 @@ START_TEST(eo_cxx_future_composite_construct_and_destroy)
ecore_init();
{
Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, efl_app_main_loop_get(efl_app_get()));
fail_if(!p1);
Efl_Future *f1 = efl_promise_future_get(p1);
fail_if(!f1);
Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, efl_app_main_loop_get(efl_app_get()));
fail_if(!p1);
Efl_Future *f2 = efl_promise_future_get(p2);
@ -236,13 +236,13 @@ START_TEST(eo_cxx_future_composite_wait)
ecore_init();
{
Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, efl_app_main_loop_get(efl_app_get()));
fail_if(!p1);
Efl_Future* f1 = efl_promise_future_get(p1);
fail_if(!f1);
Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, efl_app_main_loop_get(efl_app_get()));
fail_if(!p2);
Efl_Future* f2 = efl_promise_future_get(p2);
@ -286,13 +286,13 @@ START_TEST(eo_cxx_future_composite_get)
ecore_init();
{
Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, efl_app_main_loop_get(efl_app_get()));
fail_if(!p1);
Efl_Future *f1 = efl_promise_future_get(p1);
fail_if(!f1);
Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, efl_app_main_loop_get(efl_app_get()));
fail_if(!p2);
Efl_Future *f2 = efl_promise_future_get(p2);
@ -339,13 +339,13 @@ START_TEST(eo_cxx_future_composite_then_value)
ecore_init();
{
Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, efl_app_main_loop_get(efl_app_get()));
fail_if(!p1);
Efl_Future *f1 = efl_promise_future_get(p1);
fail_if(!f1);
Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, efl_app_main_loop_get(efl_app_get()));
fail_if(!p2);
Efl_Future *f2 = efl_promise_future_get(p2);
@ -403,13 +403,13 @@ START_TEST(eo_cxx_future_all_construct_and_destroy)
ecore_init();
{
Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, efl_app_main_loop_get(efl_app_get()));
fail_if(!p1);
Efl_Future *f1 = efl_promise_future_get(p1);
fail_if(!f1);
Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, efl_app_main_loop_get(efl_app_get()));
fail_if(!p1);
Efl_Future *f2 = efl_promise_future_get(p2);
@ -431,13 +431,13 @@ START_TEST(eo_cxx_future_all_wait)
ecore_init();
{
Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, efl_app_main_loop_get(efl_app_get()));
fail_if(!p1);
Efl_Future* f1 = efl_promise_future_get(p1);
fail_if(!f1);
Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, efl_app_main_loop_get(efl_app_get()));
fail_if(!p2);
Efl_Future* f2 = efl_promise_future_get(p2);
@ -478,13 +478,13 @@ START_TEST(eo_cxx_future_all_get)
ecore_init();
{
Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, efl_app_main_loop_get(efl_app_get()));
fail_if(!p1);
Efl_Future *f1 = efl_promise_future_get(p1);
fail_if(!f1);
Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, efl_app_main_loop_get(efl_app_get()));
fail_if(!p2);
Efl_Future *f2 = efl_promise_future_get(p2);
@ -528,13 +528,13 @@ START_TEST(eo_cxx_future_all_then_value)
ecore_init();
{
Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, efl_app_main_loop_get(efl_app_get()));
fail_if(!p1);
Efl_Future *f1 = efl_promise_future_get(p1);
fail_if(!f1);
Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, efl_app_main_loop_get(efl_app_get()));
fail_if(!p2);
Efl_Future *f2 = efl_promise_future_get(p2);
@ -591,13 +591,13 @@ START_TEST(eo_cxx_future_race_construct_and_destroy)
ecore_init();
{
Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, efl_app_main_loop_get(efl_app_get()));
fail_if(!p1);
Efl_Future *f1 = efl_promise_future_get(p1);
fail_if(!f1);
Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, efl_app_main_loop_get(efl_app_get()));
fail_if(!p1);
Efl_Future *f2 = efl_promise_future_get(p2);
@ -617,13 +617,13 @@ START_TEST(eo_cxx_future_race_wait)
ecore_init();
{
Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, efl_app_main_loop_get(efl_app_get()));
fail_if(!p1);
Efl_Future* f1 = efl_promise_future_get(p1);
fail_if(!f1);
Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, efl_app_main_loop_get(efl_app_get()));
fail_if(!p2);
Efl_Future* f2 = efl_promise_future_get(p2);
@ -661,13 +661,13 @@ START_TEST(eo_cxx_future_race_get)
ecore_init();
{
Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, efl_app_main_loop_get(efl_app_get()));
fail_if(!p1);
Efl_Future *f1 = efl_promise_future_get(p1);
fail_if(!f1);
Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, efl_app_main_loop_get(efl_app_get()));
fail_if(!p2);
Efl_Future *f2 = efl_promise_future_get(p2);
@ -707,13 +707,13 @@ START_TEST(eo_cxx_future_race_then_value)
ecore_init();
{
Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, efl_app_main_loop_get(efl_app_get()));
fail_if(!p1);
Efl_Future *f1 = efl_promise_future_get(p1);
fail_if(!f1);
Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, efl_app_main_loop_get(efl_app_get()));
fail_if(!p2);
Efl_Future *f2 = efl_promise_future_get(p2);
@ -765,13 +765,13 @@ START_TEST(eo_cxx_future_race_variant_get)
ecore_init();
{
Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, efl_app_main_loop_get(efl_app_get()));
fail_if(!p1);
Efl_Future *f1 = efl_promise_future_get(p1);
fail_if(!f1);
Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, efl_app_main_loop_get(efl_app_get()));
fail_if(!p2);
Efl_Future *f2 = efl_promise_future_get(p2);
@ -812,13 +812,13 @@ START_TEST(eo_cxx_future_race_variant_then_value)
ecore_init();
{
Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Promise *p1 = efl_add(EFL_PROMISE_CLASS, efl_app_main_loop_get(efl_app_get()));
fail_if(!p1);
Efl_Future *f1 = efl_promise_future_get(p1);
fail_if(!f1);
Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, efl_main_loop_get());
Efl_Promise *p2 = efl_add(EFL_PROMISE_CLASS, efl_app_main_loop_get(efl_app_get()));
fail_if(!p2);
Efl_Future *f2 = efl_promise_future_get(p2);