enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 6 Projects Releases Wiki Activity

eo-cxx: Fix conversion from char* to std::string

This commit is contained in:
Felipe Magno de Almeida 2017-09-15 14:53:19 -03:00
parent 6714763dab
commit 6ded80a9b5
1 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/bindings/cxx/eo_cxx/eo_cxx_interop.hh
View File

@ -749,7 +749,9 @@ inline eina::string_view convert_to_return(const char** value, tag<const char**,
{
return {*value};
}
inline std::string convert_to_return(const char* value, tag<const char*, std::string>)
template <typename S>
inline std::string convert_to_return(const char* value, tag<const char*, S>
, typename std::enable_if<std::is_same<typename std::remove_cv<S>::type, std::string>::value>::type* = 0)
{
if(value)
{
@ -760,7 +762,36 @@ inline std::string convert_to_return(const char* value, tag<const char*, std::st
else
return {};
}
inline std::string convert_to_return(const char** value, tag<const char**, std::string>)
template <typename S>
inline std::string convert_to_return(const char** value, tag<const char**, S>
, typename std::enable_if<std::is_same<typename std::remove_cv<S>::type, std::string>::value>::type* = 0)
{
if(value)
{
std::string r{*value};
free((void*)*value);
free((void*)value);
return r;
}
else
return {};
}
template <typename S>
inline std::string convert_to_return(char* value, tag<char*, S>
, typename std::enable_if<std::is_same<typename std::remove_cv<S>::type, std::string>::value>::type* = 0)
{
if(value)
{
std::string r{value};
free((void*)value);
return r;
}
else
return {};
}
template <typename S>
inline std::string convert_to_return(char** value, tag<char**, S>
, typename std::enable_if<std::is_same<typename std::remove_cv<S>::type, std::string>::value>::type* = 0)
{
if(value)
{