diff --git a/SWIG/CHANGES.current b/SWIG/CHANGES.current index bf1de87f3..be67aaf96 100644 --- a/SWIG/CHANGES.current +++ b/SWIG/CHANGES.current @@ -1,6 +1,10 @@ Version 1.3.30 (in progress) ============================ +10/03/2006: mmatus + + Fix #1486281 and #1471039. + 10/03/2006: olly [Perl] Fix for handling strings with zero bytes from Stephen Hutsal. diff --git a/SWIG/Examples/test-suite/constructor_copy.i b/SWIG/Examples/test-suite/constructor_copy.i index f2b44dbd0..70fe3c58c 100644 --- a/SWIG/Examples/test-suite/constructor_copy.i +++ b/SWIG/Examples/test-suite/constructor_copy.i @@ -92,6 +92,7 @@ SWIG_STD_VECTOR_SPECIALIZE_MINIMUM(Flow, Space::Flow) %copyctor; +%ignore FlowFlow::FlowFlow; %inline %{ @@ -100,6 +101,13 @@ class Flow { public: Flow(int i) {} }; + + +class FlowFlow { +public: + FlowFlow(int i) {} +}; + } %} diff --git a/SWIG/Source/Modules/lang.cxx b/SWIG/Source/Modules/lang.cxx index cf64963f5..1bd4b1bd1 100644 --- a/SWIG/Source/Modules/lang.cxx +++ b/SWIG/Source/Modules/lang.cxx @@ -2299,14 +2299,16 @@ int Language::classDeclaration(Node *n) { /* copy constructor */ if (CPlusPlus && !abstract && GetFlag(n,"feature:copyctor")) { 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); } } /* default destructor */ if (!GetFlag(n,"feature:nodefaultdtor") && odefault) { 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); } }