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

Ruby ownership refactor ready for smart pointers

Browse source 
ruby_owntype replaced with swig_ruby_owntype which contains a member own
for forthcoming smart pointer support.
This commit is contained in:
William S Fulton 2015-09-12 18:13:26 +01:00
commit 3d1e20248f
2 changed files with 27 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Lib/ruby/director.swg
View file

@ -29,8 +29,9 @@ namespace Swig {
virtual ~GCItem() {
}
virtual ruby_owntype get_own() const {
return 0;
virtual swig_ruby_owntype get_own() const {
swig_ruby_owntype own = {0};
return own;
}
};
@ -72,18 +73,18 @@ namespace Swig {
};
struct GCItem_Object : GCItem {
GCItem_Object(ruby_owntype own) : _own(own) {
GCItem_Object(swig_ruby_owntype own) : _own(own) {
}
virtual ~GCItem_Object() {
}
ruby_owntype get_own() const {
swig_ruby_owntype get_own() const {
return _own;
}
private:
ruby_owntype _own;
swig_ruby_owntype _own;
};
template <typename Type>
@ -323,20 +324,20 @@ namespace Swig {
}
}
void swig_acquire_ownership_obj(void *vptr, ruby_owntype own) const {
if (vptr && own) {
void swig_acquire_ownership_obj(void *vptr, swig_ruby_owntype own) const {
if (vptr && own.datafree) {
SWIG_GUARD(swig_mutex_own);
swig_owner[vptr] = new GCItem_Object(own);
}
}
ruby_owntype swig_release_ownership(void *vptr) const {
ruby_owntype own = 0;
swig_ruby_owntype swig_release_ownership(void *vptr) const {
swig_ruby_owntype own = {0};
if (vptr) {
SWIG_GUARD(swig_mutex_own);
swig_ownership_map::iterator iter = swig_owner.find(vptr);
if (iter != swig_owner.end()) {
own = iter->second->get_own();
own.datafree = iter->second->get_own().datafree;
swig_owner.erase(iter);
}
}