From 5df0b6765ba6b2938e19cae7e8e3a238cf72f800 Mon Sep 17 00:00:00 2001
From: Felipe Magno de Almeida <felipe@expertisesolutions.com.br>
Date: Wed, 14 Sep 2016 00:55:51 -0300
Subject: [PATCH] eo-cxx: Replace for ENOMEM to avoid warnings

---
 src/bindings/cxx/ecore_cxx/Ecore_Manual.hh | 2 +-
 src/bindings/cxx/eo_cxx/eo_promise_meta.hh | 4 ++--
 src/tests/eo_cxx/eo_cxx_test_promise.cc    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/bindings/cxx/ecore_cxx/Ecore_Manual.hh b/src/bindings/cxx/ecore_cxx/Ecore_Manual.hh
index 4bc90629a3..19ec978322 100644
--- a/src/bindings/cxx/ecore_cxx/Ecore_Manual.hh
+++ b/src/bindings/cxx/ecore_cxx/Ecore_Manual.hh
@@ -28,7 +28,7 @@ void _ecore_main_loop_thread_safe_call_async_callback(void* data)
     }
   catch(std::bad_alloc const& e)
     {
-      eina_error_set( ::EINA_ERROR_OUT_OF_MEMORY);
+      eina_error_set(ENOMEM);
     }
   catch(std::system_error const& e)
     {
diff --git a/src/bindings/cxx/eo_cxx/eo_promise_meta.hh b/src/bindings/cxx/eo_cxx/eo_promise_meta.hh
index 6259428b7e..18b37d793a 100644
--- a/src/bindings/cxx/eo_cxx/eo_promise_meta.hh
+++ b/src/bindings/cxx/eo_cxx/eo_promise_meta.hh
@@ -159,7 +159,7 @@ struct future_copy_traits<eina::variant<Args...>>
      else
        copy_impl(storage, value, index, std::integral_constant<std::size_t, I+1>{}, max);
    }
-   static void copy(eina::variant<Args...>* storage, Efl_Future_Event_Success const* other_info)
+   static void copy(eina::variant<Args...>*, Efl_Future_Event_Success const*)
    {
      std::abort();
    }
@@ -246,7 +246,7 @@ static void future_invoke_impl_read_accessor
 }
   
 template <typename F, typename...Args, std::size_t...I, bool IsRace>
-void future_invoke_impl(F f, Efl_Event const* event, std::tuple<Args...>* arguments_dummy, std::integral_constant<bool, IsRace> race, eina::index_sequence<I...>)
+void future_invoke_impl(F f, Efl_Event const* event, std::tuple<Args...>* arguments_dummy, std::integral_constant<bool, IsRace>, eina::index_sequence<I...>)
 {
    Efl_Future_Event_Success* info = static_cast<Efl_Future_Event_Success*>(event->info);
    try
diff --git a/src/tests/eo_cxx/eo_cxx_test_promise.cc b/src/tests/eo_cxx/eo_cxx_test_promise.cc
index 883229d87d..01b45c7bb2 100644
--- a/src/tests/eo_cxx/eo_cxx_test_promise.cc
+++ b/src/tests/eo_cxx/eo_cxx_test_promise.cc
@@ -129,7 +129,7 @@ START_TEST(eo_cxx_future_get_error)
                             efl::ecore::main_loop_thread_safe_call_async
                               ([&]
                                {
-                                  efl_promise_failed_set(p, EINA_ERROR_OUT_OF_MEMORY);
+                                  efl_promise_failed_set(p, ENOMEM);
                                });
 
                             try {