felipealmeida pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=e5884c95fa19bcde5fd61179d90c75b4059c2508
commit e5884c95fa19bcde5fd61179d90c75b4059c2508 Author: Felipe Magno de Almeida <[email protected]> Date: Mon Jun 13 01:17:18 2016 -0300 eolian-cxx: Fix C++ compilation for lacking .eo files being generated --- src/Makefile_Evas.am | 4 ++-- src/bindings/cxx/eo_cxx/eo_cxx_interop.hh | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index ff099f5..f7a8f30 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -2374,8 +2374,8 @@ GENERATED_JS_BINDINGS += $(generated_evas_js_bindings) endif if HAVE_CXX11 -evas_eolian_cxx_hh = $(evas_eolian_pub_files:%.eo=%.eo.hh) -evas_eolian_cxx_impl = $(evas_eolian_pub_files:%.eo=%.eo.impl.hh) +evas_eolian_cxx_hh = $(evas_eolian_pub_files:%.eo=%.eo.hh) $(evas_eolian_legacy_files:%.eo=%.eo.hh) +evas_eolian_cxx_impl = $(evas_eolian_pub_files:%.eo=%.eo.impl.hh) $(evas_eolian_legacy_files:%.eo=%.eo.impl.hh) endif EXTRA_DIST2 += \ diff --git a/src/bindings/cxx/eo_cxx/eo_cxx_interop.hh b/src/bindings/cxx/eo_cxx/eo_cxx_interop.hh index eb06ef1..f90e4f7 100644 --- a/src/bindings/cxx/eo_cxx/eo_cxx_interop.hh +++ b/src/bindings/cxx/eo_cxx/eo_cxx_interop.hh @@ -442,7 +442,12 @@ eina::range_array<T> convert_to_return(Eina_Array const* value, tag<Eina_Array c template <typename T> eina::iterator<T> convert_to_return(Eina_Iterator* value, tag<Eina_Iterator*, eina::iterator<T>>) { - return eina::iterator<T>{value}; + return eina::iterator<T>{ value }; +} +template <typename T> +eina::accessor<T> convert_to_return(Eina_Accessor* value, tag<Eina_Accessor*, eina::accessor<T>>) +{ + return eina::accessor<T>{ value }; } template <typename T> struct is_future : std::false_type {}; --
