felipealmeida pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=5f1b448323338c85479d554e89123b0277a2fb85
commit 5f1b448323338c85479d554e89123b0277a2fb85 Author: Lauro Moura <[email protected]> Date: Mon Jan 28 16:10:43 2019 +0900 eo: Replace ptr(Eina.Strbuf) with plain strbuf. Summary: Also fix CXX compilation after this change. Reviewers: cedric, felipealmeida Reviewed By: felipealmeida Subscribers: #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D7792 --- src/bindings/cxx/eo_cxx/eo_cxx_interop.hh | 8 ++++++++ src/lib/eo/efl_object.eo | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/bindings/cxx/eo_cxx/eo_cxx_interop.hh b/src/bindings/cxx/eo_cxx/eo_cxx_interop.hh index 019a417d14..c0ed323c27 100644 --- a/src/bindings/cxx/eo_cxx/eo_cxx_interop.hh +++ b/src/bindings/cxx/eo_cxx/eo_cxx_interop.hh @@ -34,6 +34,10 @@ template <> struct in_traits<eina::stringshare> { typedef eina::stringshare type; }; template <> struct in_traits<eina::stringshare const> { typedef eina::stringshare const type; }; +template <> +struct in_traits<efl::eina::strbuf> { typedef efl::eina::strbuf type; }; +template <> +struct in_traits<efl::eina::strbuf const> { typedef efl::eina::strbuf const type; }; template <typename T> struct in_traits<T&> { typedef T& type; }; template <typename T> @@ -531,6 +535,10 @@ inline const char* convert_to_c_impl(efl::eina::stringshare x, tag<const char*, { return eina_stringshare_ref(x.c_str()); } +inline Eina_Strbuf* convert_to_c_impl(efl::eina::strbuf& x, tag<Eina_Strbuf*, efl::eina::strbuf, false>) +{ + return x.native_handle(); +} template <typename T, typename U, typename Deleter> T* convert_to_c_impl(std::unique_ptr<U, Deleter>& v, tag<T*, std::unique_ptr<U, Deleter>>) { diff --git a/src/lib/eo/efl_object.eo b/src/lib/eo/efl_object.eo index 657e492a92..5aa1c846d8 100644 --- a/src/lib/eo/efl_object.eo +++ b/src/lib/eo/efl_object.eo @@ -107,7 +107,7 @@ abstract Efl.Object @since 1.21 ]] params { - @in sb: ptr(Eina.Strbuf); [[A string buffer, must not be $null.]] + @in sb: strbuf; [[A string buffer, must not be $null.]] } } @property event_global_freeze_count @class { --
