jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[ruby] add %typemap(directorout) for shared_ptr.

Browse source
This commit is contained in:
Takashi Tamura 2017-04-10 23:26:18 +09:00
commit b3c2b1c51c
3 changed files with 25 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Examples/test-suite/cpp11_shared_ptr_director.i
View file

@ -9,7 +9,10 @@
%feature("director") Creator; %feature("director") Creator;
%inline %{ %inline %{
struct Created {}; struct Created {
Created() {};
int get_m() { return 1; };
};
struct Creator { struct Creator {
Creator() {}; Creator() {};
@ -17,7 +20,13 @@ struct Creator {
virtual ~Creator() {} virtual ~Creator() {}
}; };
void crash(Creator* creator) { int crash(Creator* creator) {
std::shared_ptr<Created> ptr = creator->create(); std::shared_ptr<Created> ptr = creator->create();
if (ptr) {
return ptr->get_m();
} else {
return -1;
} }
}
%} %}

4
Examples/test-suite/ruby/cpp11_shared_ptr_director_runme.rb
View file

@ -19,6 +19,6 @@ class Derived < Creator
end end
crash(Derived.new(false)) p crash(Derived.new(false))
crash(Derived.new(true)) p crash(Derived.new(true))

12
Lib/ruby/boost_shared_ptr.i
View file

@ -197,6 +197,18 @@
%set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN)); %set_output(SWIG_NewPointerObj(%as_voidptr(smartresult), $descriptor(SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< TYPE > *), SWIG_POINTER_OWN));
} }
%typemap(directorout) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > (void * swig_argp, int swig_res = 0) {
if (NIL_P($input)) {
$result = $ltype();
} else {
swig_res = SWIG_ConvertPtr($input,&swig_argp,$&descriptor, %convertptr_flags);
if (!SWIG_IsOK(swig_res)) {
%dirout_fail(swig_res,"$type");
}
$result = *(%reinterpret_cast(swig_argp, $&ltype));
}
}
%typemap(varin) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > { %typemap(varin) SWIG_SHARED_PTR_QNAMESPACE::shared_ptr< CONST TYPE > {
swig_ruby_owntype newmem = {0, 0}; swig_ruby_owntype newmem = {0, 0};
void *argp = 0; void *argp = 0;