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

Fix %ignore + %copyctor as reported in #1486281

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@9396 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Marcelo Matus 2006-10-04 03:29:33 +00:00
commit a8d7866a36
3 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
SWIG/CHANGES.current
View file

@ -1,6 +1,10 @@
Version 1.3.30 (in progress) Version 1.3.30 (in progress)
============================ ============================
10/03/2006: mmatus
Fix #1486281 and #1471039.
10/03/2006: olly 10/03/2006: olly
[Perl] Fix for handling strings with zero bytes from Stephen Hutsal. [Perl] Fix for handling strings with zero bytes from Stephen Hutsal.

8
SWIG/Examples/test-suite/constructor_copy.i
View file

@ -92,6 +92,7 @@ SWIG_STD_VECTOR_SPECIALIZE_MINIMUM(Flow, Space::Flow)
%copyctor; %copyctor;
%ignore FlowFlow::FlowFlow;
%inline %{ %inline %{
@ -100,6 +101,13 @@ class Flow {
public: public:
Flow(int i) {} Flow(int i) {}
}; };
class FlowFlow {
public:
FlowFlow(int i) {}
};
} }
%} %}

6
SWIG/Source/Modules/lang.cxx
View file

@ -2299,14 +2299,16 @@ int Language::classDeclaration(Node *n) {
/* copy constructor */ /* copy constructor */
if (CPlusPlus && !abstract && GetFlag(n,"feature:copyctor")) { if (CPlusPlus && !abstract && GetFlag(n,"feature:copyctor")) {
if (!Getattr(n,"has_copy_constructor") && !Getattr(n,"allocate:has_copy_constructor") if (!Getattr(n,"has_copy_constructor") && !Getattr(n,"allocate:has_copy_constructor")
&& (Getattr(n,"allocate:copy_constructor"))) { && (Getattr(n,"allocate:copy_constructor"))
&& (!GetFlag(n,"feature:ignore"))) {
addCopyConstructor(n); addCopyConstructor(n);
} }
} }
/* default destructor */ /* default destructor */
if (!GetFlag(n,"feature:nodefaultdtor") && odefault) { if (!GetFlag(n,"feature:nodefaultdtor") && odefault) {
if (!Getattr(n,"has_destructor") && (!Getattr(n,"allocate:has_destructor")) if (!Getattr(n,"has_destructor") && (!Getattr(n,"allocate:has_destructor"))
&& (Getattr(n,"allocate:default_destructor"))) { && (Getattr(n,"allocate:default_destructor"))
&& (!GetFlag(n,"feature:ignore"))) {
addDestructor(n); addDestructor(n);
} }
} }