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

Add helper scoped_dohptr class

Browse source 
This is useful for avoiding having to explicitly write Delete() calls for DOH
objects.
This commit is contained in:
Vadim Zeitlin 2016-04-21 01:30:31 +02:00
commit 41d46460b8
1 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Source/Modules/c.cxx
View file

@ -37,6 +37,22 @@ int SwigType_isbuiltin(SwigType *t) {
namespace namespace
{ {
// Delete a DOH object on scope exit.
class scoped_dohptr
{
public:
explicit scoped_dohptr(DOH* obj) : obj_(obj) {}
~scoped_dohptr() { Delete(obj_); }
operator DOH*() const { return obj_; }
private:
scoped_dohptr(scoped_dohptr const&);
scoped_dohptr& operator=(scoped_dohptr const&);
DOH* const obj_;
};
// Helper class to output "begin" fragment in the ctor and "end" in the dtor. // Helper class to output "begin" fragment in the ctor and "end" in the dtor.
class begin_end_output_guard class begin_end_output_guard
{ {
@ -1352,10 +1368,8 @@ ready:
if (SwigType_isreference(type)) if (SwigType_isreference(type))
return NIL; return NIL;
SwigType *btype = SwigType_base(type); scoped_dohptr btype(SwigType_base(type));
const bool can_be_repr_in_c = SwigType_isbuiltin(btype) || SwigType_isenum(btype); if (!SwigType_isbuiltin(btype) && !SwigType_isenum(btype))
Delete(btype);
if (!can_be_repr_in_c)
return NIL; return NIL;
} }
} }