Updated expected files to match current wrap test

release/4.3a0
Alex Cunningham 2012-07-05 17:14:40 +00:00
parent 806d86513d
commit fe133ef97c
18 changed files with 54 additions and 36 deletions

View File

@ -7,12 +7,12 @@ classdef Point2 < handle
function obj = Point2(varargin) function obj = Point2(varargin)
if (nargin == 0), obj.self = new_Point2(0,0); end if (nargin == 0), obj.self = new_Point2(0,0); end
if (nargin == 2 && isa(varargin{1},'double') && isa(varargin{2},'double')), obj.self = new_Point2(0,1,varargin{1},varargin{2}); end if (nargin == 2 && isa(varargin{1},'double') && isa(varargin{2},'double')), obj.self = new_Point2(0,1,varargin{1},varargin{2}); end
if nargin ==14, new_Point2_(varargin{1},0); end if nargin ==14, new_Point2(varargin{1},0); end
if nargin ~= 13 && nargin ~= 14 && obj.self == 0, error('Point2 constructor failed'); end if nargin ~= 13 && nargin ~= 14 && obj.self == 0, error('Point2 constructor failed'); end
end end
function delete(obj) function delete(obj)
if obj.self ~= 0 if obj.self ~= 0
new_Point2_(obj.self); new_Point2(obj.self);
obj.self = 0; obj.self = 0;
end end
end end

View File

@ -6,12 +6,12 @@ classdef Point3 < handle
methods methods
function obj = Point3(varargin) function obj = Point3(varargin)
if (nargin == 3 && isa(varargin{1},'double') && isa(varargin{2},'double') && isa(varargin{3},'double')), obj.self = new_Point3(0,0,varargin{1},varargin{2},varargin{3}); end if (nargin == 3 && isa(varargin{1},'double') && isa(varargin{2},'double') && isa(varargin{3},'double')), obj.self = new_Point3(0,0,varargin{1},varargin{2},varargin{3}); end
if nargin ==14, new_Point3_(varargin{1},0); end if nargin ==14, new_Point3(varargin{1},0); end
if nargin ~= 13 && nargin ~= 14 && obj.self == 0, error('Point3 constructor failed'); end if nargin ~= 13 && nargin ~= 14 && obj.self == 0, error('Point3 constructor failed'); end
end end
function delete(obj) function delete(obj)
if obj.self ~= 0 if obj.self ~= 0
new_Point3_(obj.self); new_Point3(obj.self);
obj.self = 0; obj.self = 0;
end end
end end

View File

@ -7,12 +7,12 @@ classdef Test < handle
function obj = Test(varargin) function obj = Test(varargin)
if (nargin == 0), obj.self = new_Test(0,0); end if (nargin == 0), obj.self = new_Test(0,0); end
if (nargin == 2 && isa(varargin{1},'double') && isa(varargin{2},'double')), obj.self = new_Test(0,1,varargin{1},varargin{2}); end if (nargin == 2 && isa(varargin{1},'double') && isa(varargin{2},'double')), obj.self = new_Test(0,1,varargin{1},varargin{2}); end
if nargin ==14, new_Test_(varargin{1},0); end if nargin ==14, new_Test(varargin{1},0); end
if nargin ~= 13 && nargin ~= 14 && obj.self == 0, error('Test constructor failed'); end if nargin ~= 13 && nargin ~= 14 && obj.self == 0, error('Test constructor failed'); end
end end
function delete(obj) function delete(obj)
if obj.self ~= 0 if obj.self ~= 0
new_Test_(obj.self); new_Test(obj.self);
obj.self = 0; obj.self = 0;
end end
end end

View File

@ -6,8 +6,10 @@ typedef boost::shared_ptr<Point2> Shared;
static std::set<Shared*> collector; static std::set<Shared*> collector;
void cleanup(void) { void cleanup(void) {
BOOST_FOREACH(Shared* p, collector) for(std::set<Shared*>::iterator iter = collector.begin(); iter != collector.end(); ) {
collector.erase(p); delete *iter;
collector.erase(iter++);
}
} }
void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[]) void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
{ {

View File

@ -7,8 +7,10 @@ typedef boost::shared_ptr<Point3> Shared;
static std::set<Shared*> collector; static std::set<Shared*> collector;
void cleanup(void) { void cleanup(void) {
BOOST_FOREACH(Shared* p, collector) for(std::set<Shared*>::iterator iter = collector.begin(); iter != collector.end(); ) {
collector.erase(p); delete *iter;
collector.erase(iter++);
}
} }
void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[]) void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
{ {

View File

@ -7,8 +7,10 @@ typedef boost::shared_ptr<Test> Shared;
static std::set<Shared*> collector; static std::set<Shared*> collector;
void cleanup(void) { void cleanup(void) {
BOOST_FOREACH(Shared* p, collector) for(std::set<Shared*>::iterator iter = collector.begin(); iter != collector.end(); ) {
collector.erase(p); delete *iter;
collector.erase(iter++);
}
} }
void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[]) void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
{ {

View File

@ -6,12 +6,12 @@ classdef ClassD < handle
methods methods
function obj = ClassD(varargin) function obj = ClassD(varargin)
if (nargin == 0), obj.self = new_ClassD(0,0); end if (nargin == 0), obj.self = new_ClassD(0,0); end
if nargin ==14, new_ClassD_(varargin{1},0); end if nargin ==14, new_ClassD(varargin{1},0); end
if nargin ~= 13 && nargin ~= 14 && obj.self == 0, error('ClassD constructor failed'); end if nargin ~= 13 && nargin ~= 14 && obj.self == 0, error('ClassD constructor failed'); end
end end
function delete(obj) function delete(obj)
if obj.self ~= 0 if obj.self ~= 0
new_ClassD_(obj.self); new_ClassD(obj.self);
obj.self = 0; obj.self = 0;
end end
end end

View File

@ -6,12 +6,12 @@ classdef ns1ClassA < handle
methods methods
function obj = ns1ClassA(varargin) function obj = ns1ClassA(varargin)
if (nargin == 0), obj.self = new_ns1ClassA(0,0); end if (nargin == 0), obj.self = new_ns1ClassA(0,0); end
if nargin ==14, new_ns1ClassA_(varargin{1},0); end if nargin ==14, new_ns1ClassA(varargin{1},0); end
if nargin ~= 13 && nargin ~= 14 && obj.self == 0, error('ns1ClassA constructor failed'); end if nargin ~= 13 && nargin ~= 14 && obj.self == 0, error('ns1ClassA constructor failed'); end
end end
function delete(obj) function delete(obj)
if obj.self ~= 0 if obj.self ~= 0
new_ns1ClassA_(obj.self); new_ns1ClassA(obj.self);
obj.self = 0; obj.self = 0;
end end
end end

View File

@ -6,12 +6,12 @@ classdef ns1ClassB < handle
methods methods
function obj = ns1ClassB(varargin) function obj = ns1ClassB(varargin)
if (nargin == 0), obj.self = new_ns1ClassB(0,0); end if (nargin == 0), obj.self = new_ns1ClassB(0,0); end
if nargin ==14, new_ns1ClassB_(varargin{1},0); end if nargin ==14, new_ns1ClassB(varargin{1},0); end
if nargin ~= 13 && nargin ~= 14 && obj.self == 0, error('ns1ClassB constructor failed'); end if nargin ~= 13 && nargin ~= 14 && obj.self == 0, error('ns1ClassB constructor failed'); end
end end
function delete(obj) function delete(obj)
if obj.self ~= 0 if obj.self ~= 0
new_ns1ClassB_(obj.self); new_ns1ClassB(obj.self);
obj.self = 0; obj.self = 0;
end end
end end

View File

@ -6,12 +6,12 @@ classdef ns2ClassA < handle
methods methods
function obj = ns2ClassA(varargin) function obj = ns2ClassA(varargin)
if (nargin == 0), obj.self = new_ns2ClassA(0,0); end if (nargin == 0), obj.self = new_ns2ClassA(0,0); end
if nargin ==14, new_ns2ClassA_(varargin{1},0); end if nargin ==14, new_ns2ClassA(varargin{1},0); end
if nargin ~= 13 && nargin ~= 14 && obj.self == 0, error('ns2ClassA constructor failed'); end if nargin ~= 13 && nargin ~= 14 && obj.self == 0, error('ns2ClassA constructor failed'); end
end end
function delete(obj) function delete(obj)
if obj.self ~= 0 if obj.self ~= 0
new_ns2ClassA_(obj.self); new_ns2ClassA(obj.self);
obj.self = 0; obj.self = 0;
end end
end end

View File

@ -6,12 +6,12 @@ classdef ns2ClassC < handle
methods methods
function obj = ns2ClassC(varargin) function obj = ns2ClassC(varargin)
if (nargin == 0), obj.self = new_ns2ClassC(0,0); end if (nargin == 0), obj.self = new_ns2ClassC(0,0); end
if nargin ==14, new_ns2ClassC_(varargin{1},0); end if nargin ==14, new_ns2ClassC(varargin{1},0); end
if nargin ~= 13 && nargin ~= 14 && obj.self == 0, error('ns2ClassC constructor failed'); end if nargin ~= 13 && nargin ~= 14 && obj.self == 0, error('ns2ClassC constructor failed'); end
end end
function delete(obj) function delete(obj)
if obj.self ~= 0 if obj.self ~= 0
new_ns2ClassC_(obj.self); new_ns2ClassC(obj.self);
obj.self = 0; obj.self = 0;
end end
end end

View File

@ -6,12 +6,12 @@ classdef ns2ns3ClassB < handle
methods methods
function obj = ns2ns3ClassB(varargin) function obj = ns2ns3ClassB(varargin)
if (nargin == 0), obj.self = new_ns2ns3ClassB(0,0); end if (nargin == 0), obj.self = new_ns2ns3ClassB(0,0); end
if nargin ==14, new_ns2ns3ClassB_(varargin{1},0); end if nargin ==14, new_ns2ns3ClassB(varargin{1},0); end
if nargin ~= 13 && nargin ~= 14 && obj.self == 0, error('ns2ns3ClassB constructor failed'); end if nargin ~= 13 && nargin ~= 14 && obj.self == 0, error('ns2ns3ClassB constructor failed'); end
end end
function delete(obj) function delete(obj)
if obj.self ~= 0 if obj.self ~= 0
new_ns2ns3ClassB_(obj.self); new_ns2ns3ClassB(obj.self);
obj.self = 0; obj.self = 0;
end end
end end

View File

@ -6,8 +6,10 @@ typedef boost::shared_ptr<ClassD> Shared;
static std::set<Shared*> collector; static std::set<Shared*> collector;
void cleanup(void) { void cleanup(void) {
BOOST_FOREACH(Shared* p, collector) for(std::set<Shared*>::iterator iter = collector.begin(); iter != collector.end(); ) {
collector.erase(p); delete *iter;
collector.erase(iter++);
}
} }
void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[]) void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
{ {

View File

@ -6,8 +6,10 @@ typedef boost::shared_ptr<ns1::ClassA> Shared;
static std::set<Shared*> collector; static std::set<Shared*> collector;
void cleanup(void) { void cleanup(void) {
BOOST_FOREACH(Shared* p, collector) for(std::set<Shared*>::iterator iter = collector.begin(); iter != collector.end(); ) {
collector.erase(p); delete *iter;
collector.erase(iter++);
}
} }
void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[]) void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
{ {

View File

@ -7,8 +7,10 @@ typedef boost::shared_ptr<ns1::ClassB> Shared;
static std::set<Shared*> collector; static std::set<Shared*> collector;
void cleanup(void) { void cleanup(void) {
BOOST_FOREACH(Shared* p, collector) for(std::set<Shared*>::iterator iter = collector.begin(); iter != collector.end(); ) {
collector.erase(p); delete *iter;
collector.erase(iter++);
}
} }
void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[]) void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
{ {

View File

@ -7,8 +7,10 @@ typedef boost::shared_ptr<ns2::ClassA> Shared;
static std::set<Shared*> collector; static std::set<Shared*> collector;
void cleanup(void) { void cleanup(void) {
BOOST_FOREACH(Shared* p, collector) for(std::set<Shared*>::iterator iter = collector.begin(); iter != collector.end(); ) {
collector.erase(p); delete *iter;
collector.erase(iter++);
}
} }
void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[]) void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
{ {

View File

@ -6,8 +6,10 @@ typedef boost::shared_ptr<ns2::ClassC> Shared;
static std::set<Shared*> collector; static std::set<Shared*> collector;
void cleanup(void) { void cleanup(void) {
BOOST_FOREACH(Shared* p, collector) for(std::set<Shared*>::iterator iter = collector.begin(); iter != collector.end(); ) {
collector.erase(p); delete *iter;
collector.erase(iter++);
}
} }
void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[]) void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
{ {

View File

@ -7,8 +7,10 @@ typedef boost::shared_ptr<ns2::ns3::ClassB> Shared;
static std::set<Shared*> collector; static std::set<Shared*> collector;
void cleanup(void) { void cleanup(void) {
BOOST_FOREACH(Shared* p, collector) for(std::set<Shared*>::iterator iter = collector.begin(); iter != collector.end(); ) {
collector.erase(p); delete *iter;
collector.erase(iter++);
}
} }
void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[]) void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
{ {