Fixed wrap test

wrap/tests/expected/@Point2/Point2.m

@@ -5,12 +5,16 @@ classdef Point2 < handle
   end
   methods
     function obj = Point2(varargin)
-      if (nargin == 0), obj.self = new_Point2_(); end
-      if (nargin == 2 && isa(varargin{1},'double') && isa(varargin{2},'double')), obj.self = new_Point2_dd(varargin{1},varargin{2}); end
-      if nargin ~= 13 && obj.self == 0, error('Point2 constructor failed'); 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 ==14, new_Point2_(varargin{1},0); end
+      if nargin ~= 13 && nargin ~= 14 && obj.self == 0, error('Point2 constructor failed'); end
     end
     function delete(obj)
-       delete_Point2(obj);
+      if obj.self ~= 0
+        new_Point2_(obj.self);
+        obj.self = 0;
+      end
     end
     function display(obj), obj.print(''); end
     function disp(obj), obj.display; end

wrap/tests/expected/@Point2/argChar.cpp

@@ -1,10 +1,14 @@
 // automatically generated by wrap
 #include <wrap/matlab.h>
+#include <set>
 #include <Point2.h>
+typedef boost::shared_ptr<Point2> Shared;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("argChar",nargout,nargin-1,1);
-  boost::shared_ptr<Point2> self = unwrap_shared_ptr< Point2 >(in[0],"Point2");
-  char a = unwrap< char >(in[1]);
-  self->argChar(a);
+  mxArray* mxh = mxGetProperty(in[0],0,"self");
+  Shared* self = *reinterpret_cast<Shared**> (mxGetPr(mxh));
+  Shared obj = *self;
+      char a = unwrap< char >(in[1]);
+  obj->argChar(a);
 }

wrap/tests/expected/@Point2/argChar.m

@@ -1,5 +1,4 @@
-% automatically generated by wrap
+% result = obj.argChar(a)
 function result = argChar(obj,a)
-% usage: obj.argChar(a)
   error('need to compile argChar.cpp');
 end

wrap/tests/expected/@Point2/argUChar.cpp

@@ -1,10 +1,14 @@
 // automatically generated by wrap
 #include <wrap/matlab.h>
+#include <set>
 #include <Point2.h>
+typedef boost::shared_ptr<Point2> Shared;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("argUChar",nargout,nargin-1,1);
-  boost::shared_ptr<Point2> self = unwrap_shared_ptr< Point2 >(in[0],"Point2");
-  unsigned char a = unwrap< unsigned char >(in[1]);
-  self->argUChar(a);
+  mxArray* mxh = mxGetProperty(in[0],0,"self");
+  Shared* self = *reinterpret_cast<Shared**> (mxGetPr(mxh));
+  Shared obj = *self;
+      unsigned char a = unwrap< unsigned char >(in[1]);
+  obj->argUChar(a);
 }

wrap/tests/expected/@Point2/argUChar.m

@@ -1,5 +1,4 @@
-% automatically generated by wrap
+% result = obj.argUChar(a)
 function result = argUChar(obj,a)
-% usage: obj.argUChar(a)
   error('need to compile argUChar.cpp');
 end

wrap/tests/expected/@Point2/dim.cpp

@@ -1,10 +1,14 @@
 // automatically generated by wrap
 #include <wrap/matlab.h>
+#include <set>
 #include <Point2.h>
+typedef boost::shared_ptr<Point2> Shared;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("dim",nargout,nargin-1,0);
-  boost::shared_ptr<Point2> self = unwrap_shared_ptr< Point2 >(in[0],"Point2");
-  int result = self->dim();
+  mxArray* mxh = mxGetProperty(in[0],0,"self");
+  Shared* self = *reinterpret_cast<Shared**> (mxGetPr(mxh));
+  Shared obj = *self;
+  int result = obj->dim();
   out[0] = wrap< int >(result);
 }

wrap/tests/expected/@Point2/dim.m

@@ -1,5 +1,4 @@
-% automatically generated by wrap
+% result = obj.dim()
 function result = dim(obj)
-% usage: obj.dim()
   error('need to compile dim.cpp');
 end

wrap/tests/expected/@Point2/returnChar.cpp

@@ -1,10 +1,14 @@
 // automatically generated by wrap
 #include <wrap/matlab.h>
+#include <set>
 #include <Point2.h>
+typedef boost::shared_ptr<Point2> Shared;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("returnChar",nargout,nargin-1,0);
-  boost::shared_ptr<Point2> self = unwrap_shared_ptr< Point2 >(in[0],"Point2");
-  char result = self->returnChar();
+  mxArray* mxh = mxGetProperty(in[0],0,"self");
+  Shared* self = *reinterpret_cast<Shared**> (mxGetPr(mxh));
+  Shared obj = *self;
+  char result = obj->returnChar();
   out[0] = wrap< char >(result);
 }

wrap/tests/expected/@Point2/returnChar.m

@@ -1,5 +1,4 @@
-% automatically generated by wrap
+% result = obj.returnChar()
 function result = returnChar(obj)
-% usage: obj.returnChar()
   error('need to compile returnChar.cpp');
 end

wrap/tests/expected/@Point2/vectorConfusion.cpp

@@ -1,10 +1,16 @@
 // automatically generated by wrap
 #include <wrap/matlab.h>
+#include <set>
 #include <Point2.h>
+typedef boost::shared_ptr<VectorNotEigen> SharedVectorNotEigen;
+typedef boost::shared_ptr<Point2> Shared;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("vectorConfusion",nargout,nargin-1,0);
-  boost::shared_ptr<Point2> self = unwrap_shared_ptr< Point2 >(in[0],"Point2");
-  VectorNotEigen result = self->vectorConfusion();
-  out[0] = wrap_shared_ptr(boost::make_shared< VectorNotEigen >(result),"VectorNotEigen");
+  mxArray* mxh = mxGetProperty(in[0],0,"self");
+  Shared* self = *reinterpret_cast<Shared**> (mxGetPr(mxh));
+  Shared obj = *self;
+  VectorNotEigen result = obj->vectorConfusion();
+  SharedVectorNotEigen* ret = new SharedVectorNotEigen(new VectorNotEigen(result));
+  out[0] = wrap_collect_shared_ptr(ret,"VectorNotEigen");
 }

wrap/tests/expected/@Point2/vectorConfusion.m

@@ -1,5 +1,4 @@
-% automatically generated by wrap
+% result = obj.vectorConfusion()
 function result = vectorConfusion(obj)
-% usage: obj.vectorConfusion()
   error('need to compile vectorConfusion.cpp');
 end

wrap/tests/expected/@Point2/x.cpp

@@ -1,10 +1,14 @@
 // automatically generated by wrap
 #include <wrap/matlab.h>
+#include <set>
 #include <Point2.h>
+typedef boost::shared_ptr<Point2> Shared;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("x",nargout,nargin-1,0);
-  boost::shared_ptr<Point2> self = unwrap_shared_ptr< Point2 >(in[0],"Point2");
-  double result = self->x();
+  mxArray* mxh = mxGetProperty(in[0],0,"self");
+  Shared* self = *reinterpret_cast<Shared**> (mxGetPr(mxh));
+  Shared obj = *self;
+  double result = obj->x();
   out[0] = wrap< double >(result);
 }

wrap/tests/expected/@Point2/x.m

@@ -1,5 +1,4 @@
-% automatically generated by wrap
+% result = obj.x()
 function result = x(obj)
-% usage: obj.x()
   error('need to compile x.cpp');
 end

wrap/tests/expected/@Point2/y.cpp

@@ -1,10 +1,14 @@
 // automatically generated by wrap
 #include <wrap/matlab.h>
+#include <set>
 #include <Point2.h>
+typedef boost::shared_ptr<Point2> Shared;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("y",nargout,nargin-1,0);
-  boost::shared_ptr<Point2> self = unwrap_shared_ptr< Point2 >(in[0],"Point2");
-  double result = self->y();
+  mxArray* mxh = mxGetProperty(in[0],0,"self");
+  Shared* self = *reinterpret_cast<Shared**> (mxGetPr(mxh));
+  Shared obj = *self;
+  double result = obj->y();
   out[0] = wrap< double >(result);
 }

wrap/tests/expected/@Point2/y.m

@@ -1,5 +1,4 @@
-% automatically generated by wrap
+% result = obj.y()
 function result = y(obj)
-% usage: obj.y()
   error('need to compile y.cpp');
 end

wrap/tests/expected/@Point3/Point3.m

@@ -5,11 +5,15 @@ classdef Point3 < handle
   end
   methods
     function obj = Point3(varargin)
-      if (nargin == 3 && isa(varargin{1},'double') && isa(varargin{2},'double') && isa(varargin{3},'double')), obj.self = new_Point3_ddd(varargin{1},varargin{2},varargin{3}); end
-      if nargin ~= 13 && obj.self == 0, error('Point3 constructor failed'); 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 ~= 13 && nargin ~= 14 && obj.self == 0, error('Point3 constructor failed'); end
     end
     function delete(obj)
-       delete_Point3(obj);
+      if obj.self ~= 0
+        new_Point3_(obj.self);
+        obj.self = 0;
+      end
     end
     function display(obj), obj.print(''); end
     function disp(obj), obj.display; end

wrap/tests/expected/@Point3/norm.cpp

@@ -1,11 +1,15 @@
 // automatically generated by wrap
 #include <wrap/matlab.h>
+#include <set>
 #include <Point3.h>
 using namespace geometry;
+typedef boost::shared_ptr<Point3> Shared;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("norm",nargout,nargin-1,0);
-  boost::shared_ptr<Point3> self = unwrap_shared_ptr< Point3 >(in[0],"Point3");
-  double result = self->norm();
+  mxArray* mxh = mxGetProperty(in[0],0,"self");
+  Shared* self = *reinterpret_cast<Shared**> (mxGetPr(mxh));
+  Shared obj = *self;
+  double result = obj->norm();
   out[0] = wrap< double >(result);
 }

wrap/tests/expected/@Test/Test.m

@@ -5,12 +5,16 @@ classdef Test < handle
   end
   methods
     function obj = Test(varargin)
-      if (nargin == 0), obj.self = new_Test_(); end
-      if (nargin == 2 && isa(varargin{1},'double') && isa(varargin{2},'double')), obj.self = new_Test_dM(varargin{1},varargin{2}); end
-      if nargin ~= 13 && obj.self == 0, error('Test constructor failed'); 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 ==14, new_Test_(varargin{1},0); end
+      if nargin ~= 13 && nargin ~= 14 && obj.self == 0, error('Test constructor failed'); end
     end
     function delete(obj)
-       delete_Test(obj);
+      if obj.self ~= 0
+        new_Test_(obj.self);
+        obj.self = 0;
+      end
     end
     function display(obj), obj.print(''); end
     function disp(obj), obj.display; end

wrap/tests/expected/@Test/arg_EigenConstRef.cpp

@@ -1,11 +1,15 @@
 // automatically generated by wrap
 #include <wrap/matlab.h>
+#include <set>
 #include <folder/path/to/Test.h>
 using namespace geometry;
+typedef boost::shared_ptr<Test> Shared;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("arg_EigenConstRef",nargout,nargin-1,1);
-  boost::shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
-  Matrix& value = *unwrap_shared_ptr< Matrix >(in[1], "Matrix");
-  self->arg_EigenConstRef(value);
+  mxArray* mxh = mxGetProperty(in[0],0,"self");
+  Shared* self = *reinterpret_cast<Shared**> (mxGetPr(mxh));
+  Shared obj = *self;
+      Matrix& value = *unwrap_shared_ptr< Matrix >(in[1], "Matrix");
+  obj->arg_EigenConstRef(value);
 }

wrap/tests/expected/@Test/arg_EigenConstRef.m

@@ -1,5 +1,4 @@
-% automatically generated by wrap
+% result = obj.arg_EigenConstRef(value)
 function result = arg_EigenConstRef(obj,value)
-% usage: obj.arg_EigenConstRef(value)
   error('need to compile arg_EigenConstRef.cpp');
 end

wrap/tests/expected/@Test/create_MixedPtrs.cpp

@@ -1,12 +1,20 @@
 // automatically generated by wrap
 #include <wrap/matlab.h>
+#include <set>
 #include <folder/path/to/Test.h>
 using namespace geometry;
+typedef boost::shared_ptr<Test> SharedTest;
+typedef boost::shared_ptr<Test> SharedTest;
+typedef boost::shared_ptr<Test> Shared;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("create_MixedPtrs",nargout,nargin-1,0);
-  boost::shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
-  pair< Test, boost::shared_ptr<Test> > result = self->create_MixedPtrs();
-  out[0] = wrap_shared_ptr(boost::make_shared< Test >(result.first),"Test");
-  out[1] = wrap_shared_ptr(result.second,"Test");
+  mxArray* mxh = mxGetProperty(in[0],0,"self");
+  Shared* self = *reinterpret_cast<Shared**> (mxGetPr(mxh));
+  Shared obj = *self;
+  pair< Test, SharedTest > result = obj->create_MixedPtrs();
+  SharedTest* ret = new SharedTest(new Test(result.first));
+  out[0] = wrap_collect_shared_ptr(ret,"Test");
+  SharedTest* ret = new SharedTest(result.second);
+  out[1] = wrap_collect_shared_ptr(ret,"Test");
 }

wrap/tests/expected/@Test/create_MixedPtrs.m

@@ -1,5 +1,4 @@
-% automatically generated by wrap
+% [first,second] = obj.create_MixedPtrs()
 function [first,second] = create_MixedPtrs(obj)
-% usage: obj.create_MixedPtrs()
   error('need to compile create_MixedPtrs.cpp');
 end

wrap/tests/expected/@Test/create_ptrs.cpp

@@ -1,12 +1,20 @@
 // automatically generated by wrap
 #include <wrap/matlab.h>
+#include <set>
 #include <folder/path/to/Test.h>
 using namespace geometry;
+typedef boost::shared_ptr<Test> SharedTest;
+typedef boost::shared_ptr<Test> SharedTest;
+typedef boost::shared_ptr<Test> Shared;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("create_ptrs",nargout,nargin-1,0);
-  boost::shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
-  pair< boost::shared_ptr<Test>, boost::shared_ptr<Test> > result = self->create_ptrs();
-  out[0] = wrap_shared_ptr(result.first,"Test");
-  out[1] = wrap_shared_ptr(result.second,"Test");
+  mxArray* mxh = mxGetProperty(in[0],0,"self");
+  Shared* self = *reinterpret_cast<Shared**> (mxGetPr(mxh));
+  Shared obj = *self;
+  pair< SharedTest, SharedTest > result = obj->create_ptrs();
+  SharedTest* ret = new SharedTest(result.first);
+  out[0] = wrap_collect_shared_ptr(ret,"Test");
+  SharedTest* ret = new SharedTest(result.second);
+  out[1] = wrap_collect_shared_ptr(ret,"Test");
 }

wrap/tests/expected/@Test/create_ptrs.m

@@ -1,5 +1,4 @@
-% automatically generated by wrap
+% [first,second] = obj.create_ptrs()
 function [first,second] = create_ptrs(obj)
-% usage: obj.create_ptrs()
   error('need to compile create_ptrs.cpp');
 end

wrap/tests/expected/@Test/print.cpp

@@ -1,10 +1,14 @@
 // automatically generated by wrap
 #include <wrap/matlab.h>
+#include <set>
 #include <folder/path/to/Test.h>
 using namespace geometry;
+typedef boost::shared_ptr<Test> Shared;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("print",nargout,nargin-1,0);
-  boost::shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
-  self->print();
+  mxArray* mxh = mxGetProperty(in[0],0,"self");
+  Shared* self = *reinterpret_cast<Shared**> (mxGetPr(mxh));
+  Shared obj = *self;
+  obj->print();
 }

wrap/tests/expected/@Test/return_Point2Ptr.cpp

@@ -1,12 +1,18 @@
 // automatically generated by wrap
 #include <wrap/matlab.h>
+#include <set>
 #include <folder/path/to/Test.h>
 using namespace geometry;
+typedef boost::shared_ptr<Point2> SharedPoint2;
+typedef boost::shared_ptr<Test> Shared;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("return_Point2Ptr",nargout,nargin-1,1);
-  boost::shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
-  bool value = unwrap< bool >(in[1]);
-  boost::shared_ptr<Point2> result = self->return_Point2Ptr(value);
-  out[0] = wrap_shared_ptr(result,"Point2");
+  mxArray* mxh = mxGetProperty(in[0],0,"self");
+  Shared* self = *reinterpret_cast<Shared**> (mxGetPr(mxh));
+  Shared obj = *self;
+      bool value = unwrap< bool >(in[1]);
+  SharedPoint2 result = obj->return_Point2Ptr(value);
+  SharedPoint2* ret = new SharedPoint2(result);
+  out[0] = wrap_collect_shared_ptr(ret,"Point2");
 }

wrap/tests/expected/@Test/return_Point2Ptr.m

@@ -1,5 +1,4 @@
-% automatically generated by wrap
+% result = obj.return_Point2Ptr(value)
 function result = return_Point2Ptr(obj,value)
-% usage: obj.return_Point2Ptr(value)
   error('need to compile return_Point2Ptr.cpp');
 end

wrap/tests/expected/@Test/return_Test.cpp

@@ -1,12 +1,18 @@
 // automatically generated by wrap
 #include <wrap/matlab.h>
+#include <set>
 #include <folder/path/to/Test.h>
 using namespace geometry;
+typedef boost::shared_ptr<Test> SharedTest;
+typedef boost::shared_ptr<Test> Shared;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("return_Test",nargout,nargin-1,1);
-  boost::shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
+  mxArray* mxh = mxGetProperty(in[0],0,"self");
+  Shared* self = *reinterpret_cast<Shared**> (mxGetPr(mxh));
+  Shared obj = *self;
   boost::shared_ptr<Test> value = unwrap_shared_ptr< Test >(in[1], "Test");
-  Test result = self->return_Test(value);
-  out[0] = wrap_shared_ptr(boost::make_shared< Test >(result),"Test");
+  Test result = obj->return_Test(value);
+  SharedTest* ret = new SharedTest(new Test(result));
+  out[0] = wrap_collect_shared_ptr(ret,"Test");
 }

wrap/tests/expected/@Test/return_Test.m

@@ -1,5 +1,4 @@
-% automatically generated by wrap
+% result = obj.return_Test(value)
 function result = return_Test(obj,value)
-% usage: obj.return_Test(value)
   error('need to compile return_Test.cpp');
 end

wrap/tests/expected/@Test/return_TestPtr.cpp

@@ -1,12 +1,18 @@
 // automatically generated by wrap
 #include <wrap/matlab.h>
+#include <set>
 #include <folder/path/to/Test.h>
 using namespace geometry;
+typedef boost::shared_ptr<Test> SharedTest;
+typedef boost::shared_ptr<Test> Shared;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("return_TestPtr",nargout,nargin-1,1);
-  boost::shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
+  mxArray* mxh = mxGetProperty(in[0],0,"self");
+  Shared* self = *reinterpret_cast<Shared**> (mxGetPr(mxh));
+  Shared obj = *self;
   boost::shared_ptr<Test> value = unwrap_shared_ptr< Test >(in[1], "Test");
-  boost::shared_ptr<Test> result = self->return_TestPtr(value);
-  out[0] = wrap_shared_ptr(result,"Test");
+  SharedTest result = obj->return_TestPtr(value);
+  SharedTest* ret = new SharedTest(result);
+  out[0] = wrap_collect_shared_ptr(ret,"Test");
 }

wrap/tests/expected/@Test/return_TestPtr.m

@@ -1,5 +1,4 @@
-% automatically generated by wrap
+% result = obj.return_TestPtr(value)
 function result = return_TestPtr(obj,value)
-% usage: obj.return_TestPtr(value)
   error('need to compile return_TestPtr.cpp');
 end

wrap/tests/expected/@Test/return_bool.cpp

@@ -1,12 +1,16 @@
 // automatically generated by wrap
 #include <wrap/matlab.h>
+#include <set>
 #include <folder/path/to/Test.h>
 using namespace geometry;
+typedef boost::shared_ptr<Test> Shared;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("return_bool",nargout,nargin-1,1);
-  boost::shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
-  bool value = unwrap< bool >(in[1]);
-  bool result = self->return_bool(value);
+  mxArray* mxh = mxGetProperty(in[0],0,"self");
+  Shared* self = *reinterpret_cast<Shared**> (mxGetPr(mxh));
+  Shared obj = *self;
+      bool value = unwrap< bool >(in[1]);
+  bool result = obj->return_bool(value);
   out[0] = wrap< bool >(result);
 }

wrap/tests/expected/@Test/return_bool.m

@@ -1,5 +1,4 @@
-% automatically generated by wrap
+% result = obj.return_bool(value)
 function result = return_bool(obj,value)
-% usage: obj.return_bool(value)
   error('need to compile return_bool.cpp');
 end

wrap/tests/expected/@Test/return_double.cpp

@@ -1,12 +1,16 @@
 // automatically generated by wrap
 #include <wrap/matlab.h>
+#include <set>
 #include <folder/path/to/Test.h>
 using namespace geometry;
+typedef boost::shared_ptr<Test> Shared;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("return_double",nargout,nargin-1,1);
-  boost::shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
-  double value = unwrap< double >(in[1]);
-  double result = self->return_double(value);
+  mxArray* mxh = mxGetProperty(in[0],0,"self");
+  Shared* self = *reinterpret_cast<Shared**> (mxGetPr(mxh));
+  Shared obj = *self;
+      double value = unwrap< double >(in[1]);
+  double result = obj->return_double(value);
   out[0] = wrap< double >(result);
 }

wrap/tests/expected/@Test/return_double.m

@@ -1,5 +1,4 @@
-% automatically generated by wrap
+% result = obj.return_double(value)
 function result = return_double(obj,value)
-% usage: obj.return_double(value)
   error('need to compile return_double.cpp');
 end

wrap/tests/expected/@Test/return_field.cpp

@@ -1,12 +1,16 @@
 // automatically generated by wrap
 #include <wrap/matlab.h>
+#include <set>
 #include <folder/path/to/Test.h>
 using namespace geometry;
+typedef boost::shared_ptr<Test> Shared;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("return_field",nargout,nargin-1,1);
-  boost::shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
-  Test& t = *unwrap_shared_ptr< Test >(in[1], "Test");
-  bool result = self->return_field(t);
+  mxArray* mxh = mxGetProperty(in[0],0,"self");
+  Shared* self = *reinterpret_cast<Shared**> (mxGetPr(mxh));
+  Shared obj = *self;
+      Test& t = *unwrap_shared_ptr< Test >(in[1], "Test");
+  bool result = obj->return_field(t);
   out[0] = wrap< bool >(result);
 }

wrap/tests/expected/@Test/return_field.m

@@ -1,5 +1,4 @@
-% automatically generated by wrap
+% result = obj.return_field(t)
 function result = return_field(obj,t)
-% usage: obj.return_field(t)
   error('need to compile return_field.cpp');
 end

wrap/tests/expected/@Test/return_int.cpp

@@ -1,12 +1,16 @@
 // automatically generated by wrap
 #include <wrap/matlab.h>
+#include <set>
 #include <folder/path/to/Test.h>
 using namespace geometry;
+typedef boost::shared_ptr<Test> Shared;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("return_int",nargout,nargin-1,1);
-  boost::shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
-  int value = unwrap< int >(in[1]);
-  int result = self->return_int(value);
+  mxArray* mxh = mxGetProperty(in[0],0,"self");
+  Shared* self = *reinterpret_cast<Shared**> (mxGetPr(mxh));
+  Shared obj = *self;
+      int value = unwrap< int >(in[1]);
+  int result = obj->return_int(value);
   out[0] = wrap< int >(result);
 }

wrap/tests/expected/@Test/return_int.m

@@ -1,5 +1,4 @@
-% automatically generated by wrap
+% result = obj.return_int(value)
 function result = return_int(obj,value)
-% usage: obj.return_int(value)
   error('need to compile return_int.cpp');
 end

wrap/tests/expected/@Test/return_matrix1.cpp

@@ -1,12 +1,16 @@
 // automatically generated by wrap
 #include <wrap/matlab.h>
+#include <set>
 #include <folder/path/to/Test.h>
 using namespace geometry;
+typedef boost::shared_ptr<Test> Shared;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("return_matrix1",nargout,nargin-1,1);
-  boost::shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
-  Matrix value = unwrap< Matrix >(in[1]);
-  Matrix result = self->return_matrix1(value);
+  mxArray* mxh = mxGetProperty(in[0],0,"self");
+  Shared* self = *reinterpret_cast<Shared**> (mxGetPr(mxh));
+  Shared obj = *self;
+      Matrix value = unwrap< Matrix >(in[1]);
+  Matrix result = obj->return_matrix1(value);
   out[0] = wrap< Matrix >(result);
 }

wrap/tests/expected/@Test/return_matrix1.m

@@ -1,5 +1,4 @@
-% automatically generated by wrap
+% result = obj.return_matrix1(value)
 function result = return_matrix1(obj,value)
-% usage: obj.return_matrix1(value)
   error('need to compile return_matrix1.cpp');
 end

wrap/tests/expected/@Test/return_matrix2.cpp

@@ -1,12 +1,16 @@
 // automatically generated by wrap
 #include <wrap/matlab.h>
+#include <set>
 #include <folder/path/to/Test.h>
 using namespace geometry;
+typedef boost::shared_ptr<Test> Shared;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("return_matrix2",nargout,nargin-1,1);
-  boost::shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
-  Matrix value = unwrap< Matrix >(in[1]);
-  Matrix result = self->return_matrix2(value);
+  mxArray* mxh = mxGetProperty(in[0],0,"self");
+  Shared* self = *reinterpret_cast<Shared**> (mxGetPr(mxh));
+  Shared obj = *self;
+      Matrix value = unwrap< Matrix >(in[1]);
+  Matrix result = obj->return_matrix2(value);
   out[0] = wrap< Matrix >(result);
 }

wrap/tests/expected/@Test/return_matrix2.m

@@ -1,5 +1,4 @@
-% automatically generated by wrap
+% result = obj.return_matrix2(value)
 function result = return_matrix2(obj,value)
-% usage: obj.return_matrix2(value)
   error('need to compile return_matrix2.cpp');
 end

wrap/tests/expected/@Test/return_pair.cpp

@@ -1,14 +1,18 @@
 // automatically generated by wrap
 #include <wrap/matlab.h>
+#include <set>
 #include <folder/path/to/Test.h>
 using namespace geometry;
+typedef boost::shared_ptr<Test> Shared;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("return_pair",nargout,nargin-1,2);
-  boost::shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
-  Vector v = unwrap< Vector >(in[1]);
-  Matrix A = unwrap< Matrix >(in[2]);
-  pair< Vector, Matrix > result = self->return_pair(v,A);
+  mxArray* mxh = mxGetProperty(in[0],0,"self");
+  Shared* self = *reinterpret_cast<Shared**> (mxGetPr(mxh));
+  Shared obj = *self;
+      Vector v = unwrap< Vector >(in[1]);
+      Matrix A = unwrap< Matrix >(in[2]);
+  pair< Vector, Matrix > result = obj->return_pair(v,A);
   out[0] = wrap< Vector >(result.first);
   out[1] = wrap< Matrix >(result.second);
 }

wrap/tests/expected/@Test/return_pair.m

@@ -1,5 +1,4 @@
-% automatically generated by wrap
+% [first,second] = obj.return_pair(v,A)
 function [first,second] = return_pair(obj,v,A)
-% usage: obj.return_pair(v,A)
   error('need to compile return_pair.cpp');
 end

wrap/tests/expected/@Test/return_ptrs.cpp

@@ -1,14 +1,22 @@
 // automatically generated by wrap
 #include <wrap/matlab.h>
+#include <set>
 #include <folder/path/to/Test.h>
 using namespace geometry;
+typedef boost::shared_ptr<Test> SharedTest;
+typedef boost::shared_ptr<Test> SharedTest;
+typedef boost::shared_ptr<Test> Shared;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("return_ptrs",nargout,nargin-1,2);
-  boost::shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
+  mxArray* mxh = mxGetProperty(in[0],0,"self");
+  Shared* self = *reinterpret_cast<Shared**> (mxGetPr(mxh));
+  Shared obj = *self;
   boost::shared_ptr<Test> p1 = unwrap_shared_ptr< Test >(in[1], "Test");
   boost::shared_ptr<Test> p2 = unwrap_shared_ptr< Test >(in[2], "Test");
-  pair< boost::shared_ptr<Test>, boost::shared_ptr<Test> > result = self->return_ptrs(p1,p2);
-  out[0] = wrap_shared_ptr(result.first,"Test");
-  out[1] = wrap_shared_ptr(result.second,"Test");
+  pair< SharedTest, SharedTest > result = obj->return_ptrs(p1,p2);
+  SharedTest* ret = new SharedTest(result.first);
+  out[0] = wrap_collect_shared_ptr(ret,"Test");
+  SharedTest* ret = new SharedTest(result.second);
+  out[1] = wrap_collect_shared_ptr(ret,"Test");
 }

wrap/tests/expected/@Test/return_ptrs.m

@@ -1,5 +1,4 @@
-% automatically generated by wrap
+% [first,second] = obj.return_ptrs(p1,p2)
 function [first,second] = return_ptrs(obj,p1,p2)
-% usage: obj.return_ptrs(p1,p2)
   error('need to compile return_ptrs.cpp');
 end

wrap/tests/expected/@Test/return_size_t.cpp

@@ -1,12 +1,16 @@
 // automatically generated by wrap
 #include <wrap/matlab.h>
+#include <set>
 #include <folder/path/to/Test.h>
 using namespace geometry;
+typedef boost::shared_ptr<Test> Shared;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("return_size_t",nargout,nargin-1,1);
-  boost::shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
-  size_t value = unwrap< size_t >(in[1]);
-  size_t result = self->return_size_t(value);
+  mxArray* mxh = mxGetProperty(in[0],0,"self");
+  Shared* self = *reinterpret_cast<Shared**> (mxGetPr(mxh));
+  Shared obj = *self;
+      size_t value = unwrap< size_t >(in[1]);
+  size_t result = obj->return_size_t(value);
   out[0] = wrap< size_t >(result);
 }

wrap/tests/expected/@Test/return_size_t.m

@@ -1,5 +1,4 @@
-% automatically generated by wrap
+% result = obj.return_size_t(value)
 function result = return_size_t(obj,value)
-% usage: obj.return_size_t(value)
   error('need to compile return_size_t.cpp');
 end

wrap/tests/expected/@Test/return_string.cpp

@@ -1,12 +1,16 @@
 // automatically generated by wrap
 #include <wrap/matlab.h>
+#include <set>
 #include <folder/path/to/Test.h>
 using namespace geometry;
+typedef boost::shared_ptr<Test> Shared;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("return_string",nargout,nargin-1,1);
-  boost::shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
-  string value = unwrap< string >(in[1]);
-  string result = self->return_string(value);
+  mxArray* mxh = mxGetProperty(in[0],0,"self");
+  Shared* self = *reinterpret_cast<Shared**> (mxGetPr(mxh));
+  Shared obj = *self;
+      string value = unwrap< string >(in[1]);
+  string result = obj->return_string(value);
   out[0] = wrap< string >(result);
 }

wrap/tests/expected/@Test/return_string.m

@@ -1,5 +1,4 @@
-% automatically generated by wrap
+% result = obj.return_string(value)
 function result = return_string(obj,value)
-% usage: obj.return_string(value)
   error('need to compile return_string.cpp');
 end

wrap/tests/expected/@Test/return_vector1.cpp

@@ -1,12 +1,16 @@
 // automatically generated by wrap
 #include <wrap/matlab.h>
+#include <set>
 #include <folder/path/to/Test.h>
 using namespace geometry;
+typedef boost::shared_ptr<Test> Shared;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("return_vector1",nargout,nargin-1,1);
-  boost::shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
-  Vector value = unwrap< Vector >(in[1]);
-  Vector result = self->return_vector1(value);
+  mxArray* mxh = mxGetProperty(in[0],0,"self");
+  Shared* self = *reinterpret_cast<Shared**> (mxGetPr(mxh));
+  Shared obj = *self;
+      Vector value = unwrap< Vector >(in[1]);
+  Vector result = obj->return_vector1(value);
   out[0] = wrap< Vector >(result);
 }

wrap/tests/expected/@Test/return_vector1.m

@@ -1,5 +1,4 @@
-% automatically generated by wrap
+% result = obj.return_vector1(value)
 function result = return_vector1(obj,value)
-% usage: obj.return_vector1(value)
   error('need to compile return_vector1.cpp');
 end

wrap/tests/expected/@Test/return_vector2.cpp

@@ -1,12 +1,16 @@
 // automatically generated by wrap
 #include <wrap/matlab.h>
+#include <set>
 #include <folder/path/to/Test.h>
 using namespace geometry;
+typedef boost::shared_ptr<Test> Shared;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("return_vector2",nargout,nargin-1,1);
-  boost::shared_ptr<Test> self = unwrap_shared_ptr< Test >(in[0],"Test");
-  Vector value = unwrap< Vector >(in[1]);
-  Vector result = self->return_vector2(value);
+  mxArray* mxh = mxGetProperty(in[0],0,"self");
+  Shared* self = *reinterpret_cast<Shared**> (mxGetPr(mxh));
+  Shared obj = *self;
+      Vector value = unwrap< Vector >(in[1]);
+  Vector result = obj->return_vector2(value);
   out[0] = wrap< Vector >(result);
 }

wrap/tests/expected/@Test/return_vector2.m

@@ -1,5 +1,4 @@
-% automatically generated by wrap
+% result = obj.return_vector2(value)
 function result = return_vector2(obj,value)
-% usage: obj.return_vector2(value)
   error('need to compile return_vector2.cpp');
 end

wrap/tests/expected/Makefile

@@ -9,10 +9,6 @@ all: Point2 Point3 Test
 # Point2
 new_Point2_.$(MEXENDING): new_Point2_.cpp
 	$(MEX) $(mex_flags) new_Point2_.cpp  -output new_Point2_
-new_Point2_dd.$(MEXENDING): new_Point2_dd.cpp
-	$(MEX) $(mex_flags) new_Point2_dd.cpp  -output new_Point2_dd
-delete_Point2.$(MEXENDING): delete_Point2.cpp
-	$(MEX) $(mex_flags) delete_Point2.cpp  -output delete_Point2
 @Point2/x.$(MEXENDING): @Point2/x.cpp
 	$(MEX) $(mex_flags) @Point2/x.cpp  -output @Point2/x
 @Point2/y.$(MEXENDING): @Point2/y.cpp
@@ -28,13 +24,11 @@ delete_Point2.$(MEXENDING): delete_Point2.cpp
 @Point2/vectorConfusion.$(MEXENDING): @Point2/vectorConfusion.cpp
 	$(MEX) $(mex_flags) @Point2/vectorConfusion.cpp  -output @Point2/vectorConfusion
 
-Point2: new_Point2_.$(MEXENDING) new_Point2_dd.$(MEXENDING) delete_Point2.$(MEXENDING) @Point2/x.$(MEXENDING) @Point2/y.$(MEXENDING) @Point2/dim.$(MEXENDING) @Point2/returnChar.$(MEXENDING) @Point2/argChar.$(MEXENDING) @Point2/argUChar.$(MEXENDING) @Point2/vectorConfusion.$(MEXENDING) 
+Point2: new_Point2_.$(MEXENDING) @Point2/x.$(MEXENDING) @Point2/y.$(MEXENDING) @Point2/dim.$(MEXENDING) @Point2/returnChar.$(MEXENDING) @Point2/argChar.$(MEXENDING) @Point2/argUChar.$(MEXENDING) @Point2/vectorConfusion.$(MEXENDING) 
 
 # Point3
-new_Point3_ddd.$(MEXENDING): new_Point3_ddd.cpp
-	$(MEX) $(mex_flags) new_Point3_ddd.cpp  -output new_Point3_ddd
-delete_Point3.$(MEXENDING): delete_Point3.cpp
-	$(MEX) $(mex_flags) delete_Point3.cpp  -output delete_Point3
+new_Point3_.$(MEXENDING): new_Point3_.cpp
+	$(MEX) $(mex_flags) new_Point3_.cpp  -output new_Point3_
 Point3_staticFunction.$(MEXENDING): Point3_staticFunction.cpp
 	$(MEX) $(mex_flags) Point3_staticFunction.cpp  -output Point3_staticFunction
 Point3_StaticFunctionRet.$(MEXENDING): Point3_StaticFunctionRet.cpp
@@ -42,15 +36,11 @@ Point3_StaticFunctionRet.$(MEXENDING): Point3_StaticFunctionRet.cpp
 @Point3/norm.$(MEXENDING): @Point3/norm.cpp
 	$(MEX) $(mex_flags) @Point3/norm.cpp  -output @Point3/norm
 
-Point3: new_Point3_ddd.$(MEXENDING) delete_Point3.$(MEXENDING) Point3_staticFunction.$(MEXENDING) Point3_StaticFunctionRet.$(MEXENDING) @Point3/norm.$(MEXENDING) 
+Point3: new_Point3_.$(MEXENDING) Point3_staticFunction.$(MEXENDING) Point3_StaticFunctionRet.$(MEXENDING) @Point3/norm.$(MEXENDING) 
 
 # Test
 new_Test_.$(MEXENDING): new_Test_.cpp
 	$(MEX) $(mex_flags) new_Test_.cpp  -output new_Test_
-new_Test_dM.$(MEXENDING): new_Test_dM.cpp
-	$(MEX) $(mex_flags) new_Test_dM.cpp  -output new_Test_dM
-delete_Test.$(MEXENDING): delete_Test.cpp
-	$(MEX) $(mex_flags) delete_Test.cpp  -output delete_Test
 @Test/return_pair.$(MEXENDING): @Test/return_pair.cpp
 	$(MEX) $(mex_flags) @Test/return_pair.cpp  -output @Test/return_pair
 @Test/return_bool.$(MEXENDING): @Test/return_bool.cpp
@@ -90,7 +80,7 @@ delete_Test.$(MEXENDING): delete_Test.cpp
 @Test/print.$(MEXENDING): @Test/print.cpp
 	$(MEX) $(mex_flags) @Test/print.cpp  -output @Test/print
 
-Test: new_Test_.$(MEXENDING) new_Test_dM.$(MEXENDING) delete_Test.$(MEXENDING) @Test/return_pair.$(MEXENDING) @Test/return_bool.$(MEXENDING) @Test/return_size_t.$(MEXENDING) @Test/return_int.$(MEXENDING) @Test/return_double.$(MEXENDING) @Test/return_string.$(MEXENDING) @Test/return_vector1.$(MEXENDING) @Test/return_matrix1.$(MEXENDING) @Test/return_vector2.$(MEXENDING) @Test/return_matrix2.$(MEXENDING) @Test/arg_EigenConstRef.$(MEXENDING) @Test/return_field.$(MEXENDING) @Test/return_TestPtr.$(MEXENDING) @Test/return_Test.$(MEXENDING) @Test/return_Point2Ptr.$(MEXENDING) @Test/create_ptrs.$(MEXENDING) @Test/create_MixedPtrs.$(MEXENDING) @Test/return_ptrs.$(MEXENDING) @Test/print.$(MEXENDING) 
+Test: new_Test_.$(MEXENDING) @Test/return_pair.$(MEXENDING) @Test/return_bool.$(MEXENDING) @Test/return_size_t.$(MEXENDING) @Test/return_int.$(MEXENDING) @Test/return_double.$(MEXENDING) @Test/return_string.$(MEXENDING) @Test/return_vector1.$(MEXENDING) @Test/return_matrix1.$(MEXENDING) @Test/return_vector2.$(MEXENDING) @Test/return_matrix2.$(MEXENDING) @Test/arg_EigenConstRef.$(MEXENDING) @Test/return_field.$(MEXENDING) @Test/return_TestPtr.$(MEXENDING) @Test/return_Test.$(MEXENDING) @Test/return_Point2Ptr.$(MEXENDING) @Test/create_ptrs.$(MEXENDING) @Test/create_MixedPtrs.$(MEXENDING) @Test/return_ptrs.$(MEXENDING) @Test/print.$(MEXENDING) 
 
 
 

wrap/tests/expected/Point3_StaticFunctionRet.cpp

@@ -1,11 +1,15 @@
 // automatically generated by wrap
 #include <wrap/matlab.h>
+#include <set>
 #include <Point3.h>
 using namespace geometry;
+typedef boost::shared_ptr<Point3> SharedPoint3;
+typedef boost::shared_ptr<Point3> Shared;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("Point3_StaticFunctionRet",nargout,nargin,1);
-  double z = unwrap< double >(in[0]);
+      double z = unwrap< double >(in[0]);
   Point3 result = Point3::StaticFunctionRet(z);
-  out[0] = wrap_shared_ptr(boost::make_shared< Point3 >(result),"Point3");
+  SharedPoint3* ret = new SharedPoint3(new Point3(result));
+  out[0] = wrap_collect_shared_ptr(ret,"Point3");
 }

wrap/tests/expected/Point3_staticFunction.cpp

@@ -1,7 +1,10 @@
 // automatically generated by wrap
 #include <wrap/matlab.h>
+#include <set>
 #include <Point3.h>
 using namespace geometry;
+typedef boost::shared_ptr<double> Shareddouble;
+typedef boost::shared_ptr<Point3> Shared;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("Point3_staticFunction",nargout,nargin,0);

wrap/tests/expected/delete_Point2.cpp

@@ -1,8 +0,0 @@
-// automatically generated by wrap
-#include <wrap/matlab.h>
-#include <Point2.h>
-void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
-{
-  checkArguments("delete_Point2",nargout,nargin,1);
-  delete_shared_ptr< Point2 >(in[0],"Point2");
-}

wrap/tests/expected/delete_Point2.m

@@ -1,4 +0,0 @@
-% automatically generated by wrap
-function result = delete_Point2(obj)
-  error('need to compile delete_Point2.cpp');
-end

wrap/tests/expected/delete_Point3.cpp

@@ -1,9 +0,0 @@
-// automatically generated by wrap
-#include <wrap/matlab.h>
-#include <Point3.h>
-using namespace geometry;
-void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
-{
-  checkArguments("delete_Point3",nargout,nargin,1);
-  delete_shared_ptr< Point3 >(in[0],"Point3");
-}

wrap/tests/expected/delete_Point3.m

@@ -1,4 +0,0 @@
-% automatically generated by wrap
-function result = delete_Point3(obj)
-  error('need to compile delete_Point3.cpp');
-end

wrap/tests/expected/delete_Test.cpp

@@ -1,9 +0,0 @@
-// automatically generated by wrap
-#include <wrap/matlab.h>
-#include <folder/path/to/Test.h>
-using namespace geometry;
-void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
-{
-  checkArguments("delete_Test",nargout,nargin,1);
-  delete_shared_ptr< Test >(in[0],"Test");
-}

wrap/tests/expected/delete_Test.m

@@ -1,4 +0,0 @@
-% automatically generated by wrap
-function result = delete_Test(obj)
-  error('need to compile delete_Test.cpp');
-end

wrap/tests/expected/make_geometry.m

@@ -10,8 +10,6 @@ addpath(toolboxpath);
 %% Point2
 cd(toolboxpath)
 mex -O5 new_Point2_.cpp
-mex -O5 new_Point2_dd.cpp
-mex -O5 delete_Point2.cpp
 
 cd @Point2
 mex -O5 x.cpp
@@ -24,8 +22,7 @@ mex -O5 vectorConfusion.cpp
 
 %% Point3
 cd(toolboxpath)
-mex -O5 new_Point3_ddd.cpp
-mex -O5 delete_Point3.cpp
+mex -O5 new_Point3_.cpp
 mex -O5 Point3_staticFunction.cpp
 mex -O5 Point3_StaticFunctionRet.cpp
 
@@ -35,8 +32,6 @@ mex -O5 norm.cpp
 %% Test
 cd(toolboxpath)
 mex -O5 new_Test_.cpp
-mex -O5 new_Test_dM.cpp
-mex -O5 delete_Test.cpp
 
 cd @Test
 mex -O5 return_pair.cpp

wrap/tests/expected/new_Point2_.cpp

@@ -1,9 +1,48 @@
 // automatically generated by wrap
 #include <wrap/matlab.h>
+#include <set>
 #include <Point2.h>
+typedef boost::shared_ptr<Point2> Shared;
+
+static std::set<Shared*> collector;
+
+struct Destruct
+{
+  void operator() (Shared* p)
+  {
+    collector.erase(p);
+  }
+};
+
+void cleanup(void) {
+  std::for_each( collector.begin(), collector.end(), Destruct() );
+}
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
-  checkArguments("new_Point2_",nargout,nargin,0);
-  Point2* self = new Point2();
-  out[0] = wrap_constructed(self,"Point2");
+  mexAtExit(cleanup);
+
+  const mxArray* input = in[0];
+  Shared* self = *(Shared**) mxGetData(input);
+
+  if(self) {
+    if(nargin > 1) {
+      collector.insert(self);
+    }
+    else if(collector.erase(self))
+      delete self;
+  } else {
+    int nc = unwrap<int>(in[1]);
+    if(nc == 0) {
+      self = new Shared(new Point2());
+    }
+    if(nc == 1) {
+      double x = unwrap< double >(in[2]);
+      double y = unwrap< double >(in[3]);
+      self = new Shared(new Point2(x,y));
+    }
+    collector.insert(self);
+    std::cout << "constructed " << self << ", size=" << collector.size() << std::endl;
+    out[0] = mxCreateNumericMatrix(1, 1, mxUINT32OR64_CLASS, mxREAL);
+    *reinterpret_cast<Shared**> (mxGetPr(out[0])) = self;
+  }
 }

wrap/tests/expected/new_Point2_.m

@@ -1,4 +1,4 @@
 % automatically generated by wrap
-function result = new_Point2_(obj)
+function result = new_Point2_(obj,x,y)
   error('need to compile new_Point2_.cpp');
 end

wrap/tests/expected/new_Point2_dd.cpp

@@ -1,11 +0,0 @@
-// automatically generated by wrap
-#include <wrap/matlab.h>
-#include <Point2.h>
-void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
-{
-  checkArguments("new_Point2_dd",nargout,nargin,2);
-  double x = unwrap< double >(in[0]);
-  double y = unwrap< double >(in[1]);
-  Point2* self = new Point2(x,y);
-  out[0] = wrap_constructed(self,"Point2");
-}

wrap/tests/expected/new_Point2_dd.m

@@ -1,4 +0,0 @@
-% automatically generated by wrap
-function result = new_Point2_dd(obj,x,y)
-  error('need to compile new_Point2_dd.cpp');
-end

wrap/tests/expected/new_Point3_.cpp

@@ -0,0 +1,47 @@
+// automatically generated by wrap
+#include <wrap/matlab.h>
+#include <set>
+#include <Point3.h>
+using namespace geometry;
+typedef boost::shared_ptr<Point3> Shared;
+
+static std::set<Shared*> collector;
+
+struct Destruct
+{
+  void operator() (Shared* p)
+  {
+    collector.erase(p);
+  }
+};
+
+void cleanup(void) {
+  std::for_each( collector.begin(), collector.end(), Destruct() );
+}
+void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
+{
+  mexAtExit(cleanup);
+
+  const mxArray* input = in[0];
+  Shared* self = *(Shared**) mxGetData(input);
+
+  if(self) {
+    if(nargin > 1) {
+      collector.insert(self);
+    }
+    else if(collector.erase(self))
+      delete self;
+  } else {
+    int nc = unwrap<int>(in[1]);
+    if(nc == 0) {
+      double x = unwrap< double >(in[2]);
+      double y = unwrap< double >(in[3]);
+      double z = unwrap< double >(in[4]);
+      self = new Shared(new Point3(x,y,z));
+    }
+    collector.insert(self);
+    std::cout << "constructed " << self << ", size=" << collector.size() << std::endl;
+    out[0] = mxCreateNumericMatrix(1, 1, mxUINT32OR64_CLASS, mxREAL);
+    *reinterpret_cast<Shared**> (mxGetPr(out[0])) = self;
+  }
+}

wrap/tests/expected/new_Point3_.m

@@ -0,0 +1,4 @@
+% automatically generated by wrap
+function result = new_Point3_(obj,x,y,z)
+  error('need to compile new_Point3_.cpp');
+end

wrap/tests/expected/new_Point3_ddd.cpp

@@ -1,13 +0,0 @@
-// automatically generated by wrap
-#include <wrap/matlab.h>
-#include <Point3.h>
-using namespace geometry;
-void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
-{
-  checkArguments("new_Point3_ddd",nargout,nargin,3);
-  double x = unwrap< double >(in[0]);
-  double y = unwrap< double >(in[1]);
-  double z = unwrap< double >(in[2]);
-  Point3* self = new Point3(x,y,z);
-  out[0] = wrap_constructed(self,"Point3");
-}

wrap/tests/expected/new_Point3_ddd.m

@@ -1,4 +0,0 @@
-% automatically generated by wrap
-function result = new_Point3_ddd(obj,x,y,z)
-  error('need to compile new_Point3_ddd.cpp');
-end

wrap/tests/expected/new_Test_.cpp

@@ -1,10 +1,49 @@
 // automatically generated by wrap
 #include <wrap/matlab.h>
+#include <set>
 #include <folder/path/to/Test.h>
 using namespace geometry;
+typedef boost::shared_ptr<Test> Shared;
+
+static std::set<Shared*> collector;
+
+struct Destruct
+{
+  void operator() (Shared* p)
+  {
+    collector.erase(p);
+  }
+};
+
+void cleanup(void) {
+  std::for_each( collector.begin(), collector.end(), Destruct() );
+}
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
-  checkArguments("new_Test_",nargout,nargin,0);
-  Test* self = new Test();
-  out[0] = wrap_constructed(self,"Test");
+  mexAtExit(cleanup);
+
+  const mxArray* input = in[0];
+  Shared* self = *(Shared**) mxGetData(input);
+
+  if(self) {
+    if(nargin > 1) {
+      collector.insert(self);
+    }
+    else if(collector.erase(self))
+      delete self;
+  } else {
+    int nc = unwrap<int>(in[1]);
+    if(nc == 0) {
+      self = new Shared(new Test());
+    }
+    if(nc == 1) {
+      double a = unwrap< double >(in[2]);
+      Matrix b = unwrap< Matrix >(in[3]);
+      self = new Shared(new Test(a,b));
+    }
+    collector.insert(self);
+    std::cout << "constructed " << self << ", size=" << collector.size() << std::endl;
+    out[0] = mxCreateNumericMatrix(1, 1, mxUINT32OR64_CLASS, mxREAL);
+    *reinterpret_cast<Shared**> (mxGetPr(out[0])) = self;
+  }
 }

wrap/tests/expected/new_Test_.m

@@ -1,4 +1,4 @@
 % automatically generated by wrap
-function result = new_Test_(obj)
+function result = new_Test_(obj,a,b)
   error('need to compile new_Test_.cpp');
 end

wrap/tests/expected/new_Test_dM.cpp

@@ -1,12 +0,0 @@
-// automatically generated by wrap
-#include <wrap/matlab.h>
-#include <folder/path/to/Test.h>
-using namespace geometry;
-void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
-{
-  checkArguments("new_Test_dM",nargout,nargin,2);
-  double a = unwrap< double >(in[0]);
-  Matrix b = unwrap< Matrix >(in[1]);
-  Test* self = new Test(a,b);
-  out[0] = wrap_constructed(self,"Test");
-}

wrap/tests/expected/new_Test_dM.m

@@ -1,4 +0,0 @@
-% automatically generated by wrap
-function result = new_Test_dM(obj,a,b)
-  error('need to compile new_Test_dM.cpp');
-end

wrap/tests/expected_namespaces/@ClassD/ClassD.m

@@ -5,11 +5,15 @@ classdef ClassD < handle
   end
   methods
     function obj = ClassD(varargin)
-      if (nargin == 0), obj.self = new_ClassD_(); end
-      if nargin ~= 13 && obj.self == 0, error('ClassD constructor failed'); end
+      if (nargin == 0), obj.self = new_ClassD_(0,0); end
+      if nargin ==14, new_ClassD_(varargin{1},0); end
+      if nargin ~= 13 && nargin ~= 14 && obj.self == 0, error('ClassD constructor failed'); end
     end
     function delete(obj)
-       delete_ClassD(obj);
+      if obj.self ~= 0
+        new_ClassD_(obj.self);
+        obj.self = 0;
+      end
     end
     function display(obj), obj.print(''); end
     function disp(obj), obj.display; end

wrap/tests/expected_namespaces/@ns1ClassA/ns1ClassA.m

@@ -5,11 +5,15 @@ classdef ns1ClassA < handle
   end
   methods
     function obj = ns1ClassA(varargin)
-      if (nargin == 0), obj.self = new_ns1ClassA_(); end
-      if nargin ~= 13 && obj.self == 0, error('ns1ClassA constructor failed'); end
+      if (nargin == 0), obj.self = new_ns1ClassA_(0,0); end
+      if nargin ==14, new_ns1ClassA_(varargin{1},0); end
+      if nargin ~= 13 && nargin ~= 14 && obj.self == 0, error('ns1ClassA constructor failed'); end
     end
     function delete(obj)
-       delete_ns1ClassA(obj);
+      if obj.self ~= 0
+        new_ns1ClassA_(obj.self);
+        obj.self = 0;
+      end
     end
     function display(obj), obj.print(''); end
     function disp(obj), obj.display; end

wrap/tests/expected_namespaces/@ns1ClassB/ns1ClassB.m

@@ -5,11 +5,15 @@ classdef ns1ClassB < handle
   end
   methods
     function obj = ns1ClassB(varargin)
-      if (nargin == 0), obj.self = new_ns1ClassB_(); end
-      if nargin ~= 13 && obj.self == 0, error('ns1ClassB constructor failed'); end
+      if (nargin == 0), obj.self = new_ns1ClassB_(0,0); end
+      if nargin ==14, new_ns1ClassB_(varargin{1},0); end
+      if nargin ~= 13 && nargin ~= 14 && obj.self == 0, error('ns1ClassB constructor failed'); end
     end
     function delete(obj)
-       delete_ns1ClassB(obj);
+      if obj.self ~= 0
+        new_ns1ClassB_(obj.self);
+        obj.self = 0;
+      end
     end
     function display(obj), obj.print(''); end
     function disp(obj), obj.display; end

wrap/tests/expected_namespaces/@ns2ClassA/memberFunction.cpp

@@ -1,11 +1,15 @@
 // automatically generated by wrap
 #include <wrap/matlab.h>
+#include <set>
 #include <path/to/ns2.h>
 #include <path/to/ns2/ClassA.h>
+typedef boost::shared_ptr<ns2::ClassA> Shared;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("memberFunction",nargout,nargin-1,0);
-  boost::shared_ptr<ns2::ClassA> self = unwrap_shared_ptr< ns2::ClassA >(in[0],"ns2ClassA");
-  double result = self->memberFunction();
+  mxArray* mxh = mxGetProperty(in[0],0,"self");
+  Shared* self = *reinterpret_cast<Shared**> (mxGetPr(mxh));
+  Shared obj = *self;
+  double result = obj->memberFunction();
   out[0] = wrap< double >(result);
 }

wrap/tests/expected_namespaces/@ns2ClassA/ns2ClassA.m

@@ -5,11 +5,15 @@ classdef ns2ClassA < handle
   end
   methods
     function obj = ns2ClassA(varargin)
-      if (nargin == 0), obj.self = new_ns2ClassA_(); end
-      if nargin ~= 13 && obj.self == 0, error('ns2ClassA constructor failed'); end
+      if (nargin == 0), obj.self = new_ns2ClassA_(0,0); end
+      if nargin ==14, new_ns2ClassA_(varargin{1},0); end
+      if nargin ~= 13 && nargin ~= 14 && obj.self == 0, error('ns2ClassA constructor failed'); end
     end
     function delete(obj)
-       delete_ns2ClassA(obj);
+      if obj.self ~= 0
+        new_ns2ClassA_(obj.self);
+        obj.self = 0;
+      end
     end
     function display(obj), obj.print(''); end
     function disp(obj), obj.display; end

wrap/tests/expected_namespaces/@ns2ClassA/nsArg.cpp

@@ -1,12 +1,16 @@
 // automatically generated by wrap
 #include <wrap/matlab.h>
+#include <set>
 #include <path/to/ns2.h>
 #include <path/to/ns2/ClassA.h>
+typedef boost::shared_ptr<ns2::ClassA> Shared;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("nsArg",nargout,nargin-1,1);
-  boost::shared_ptr<ns2::ClassA> self = unwrap_shared_ptr< ns2::ClassA >(in[0],"ns2ClassA");
-  ns1::ClassB& arg = *unwrap_shared_ptr< ns1::ClassB >(in[1], "ns1ClassB");
-  int result = self->nsArg(arg);
+  mxArray* mxh = mxGetProperty(in[0],0,"self");
+  Shared* self = *reinterpret_cast<Shared**> (mxGetPr(mxh));
+  Shared obj = *self;
+      ns1::ClassB& arg = *unwrap_shared_ptr< ns1::ClassB >(in[1], "ns1ClassB");
+  int result = obj->nsArg(arg);
   out[0] = wrap< int >(result);
 }

wrap/tests/expected_namespaces/@ns2ClassA/nsReturn.cpp

@@ -1,12 +1,18 @@
 // automatically generated by wrap
 #include <wrap/matlab.h>
+#include <set>
 #include <path/to/ns2.h>
 #include <path/to/ns2/ClassA.h>
+typedef boost::shared_ptr<ns2::ns3::ClassB> SharedClassB;
+typedef boost::shared_ptr<ns2::ClassA> Shared;
 void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
 {
   checkArguments("nsReturn",nargout,nargin-1,1);
-  boost::shared_ptr<ns2::ClassA> self = unwrap_shared_ptr< ns2::ClassA >(in[0],"ns2ClassA");
-  double q = unwrap< double >(in[1]);
-  ns2::ns3::ClassB result = self->nsReturn(q);
-  out[0] = wrap_shared_ptr(boost::make_shared< ns2::ns3::ClassB >(result),"ns2ns3ClassB");
+  mxArray* mxh = mxGetProperty(in[0],0,"self");
+  Shared* self = *reinterpret_cast<Shared**> (mxGetPr(mxh));
+  Shared obj = *self;
+      double q = unwrap< double >(in[1]);
+  ns2::ns3::ClassB result = obj->nsReturn(q);
+  SharedClassB* ret = new SharedClassB(new ns2::ns3::ClassB(result));
+  out[0] = wrap_collect_shared_ptr(ret,"ns2ns3ClassB");
 }

wrap/tests/expected_namespaces/@ns2ClassC/ns2ClassC.m

@@ -5,11 +5,15 @@ classdef ns2ClassC < handle
   end
   methods
     function obj = ns2ClassC(varargin)
-      if (nargin == 0), obj.self = new_ns2ClassC_(); end
-      if nargin ~= 13 && obj.self == 0, error('ns2ClassC constructor failed'); end
+      if (nargin == 0), obj.self = new_ns2ClassC_(0,0); end
+      if nargin ==14, new_ns2ClassC_(varargin{1},0); end
+      if nargin ~= 13 && nargin ~= 14 && obj.self == 0, error('ns2ClassC constructor failed'); end
     end
     function delete(obj)
-       delete_ns2ClassC(obj);
+      if obj.self ~= 0
+        new_ns2ClassC_(obj.self);
+        obj.self = 0;
+      end
     end
     function display(obj), obj.print(''); end
     function disp(obj), obj.display; end

wrap/tests/expected_namespaces/@ns2ns3ClassB/ns2ns3ClassB.m

@@ -5,11 +5,15 @@ classdef ns2ns3ClassB < handle
   end
   methods
     function obj = ns2ns3ClassB(varargin)
-      if (nargin == 0), obj.self = new_ns2ns3ClassB_(); end
-      if nargin ~= 13 && obj.self == 0, error('ns2ns3ClassB constructor failed'); end
+      if (nargin == 0), obj.self = new_ns2ns3ClassB_(0,0); end
+      if nargin ==14, new_ns2ns3ClassB_(varargin{1},0); end
+      if nargin ~= 13 && nargin ~= 14 && obj.self == 0, error('ns2ns3ClassB constructor failed'); end
     end
     function delete(obj)
-       delete_ns2ns3ClassB(obj);
+      if obj.self ~= 0
+        new_ns2ns3ClassB_(obj.self);
+        obj.self = 0;
+      end
     end
     function display(obj), obj.print(''); end
     function disp(obj), obj.display; end

wrap/tests/expected_namespaces/Makefile

@@ -9,24 +9,18 @@ all: ns1ClassA ns1ClassB ns2ClassA ns2ns3ClassB ns2ClassC ClassD
 # ns1ClassA
 new_ns1ClassA_.$(MEXENDING): new_ns1ClassA_.cpp
 	$(MEX) $(mex_flags) new_ns1ClassA_.cpp  -output new_ns1ClassA_
-delete_ns1ClassA.$(MEXENDING): delete_ns1ClassA.cpp
-	$(MEX) $(mex_flags) delete_ns1ClassA.cpp  -output delete_ns1ClassA
 
-ns1ClassA: new_ns1ClassA_.$(MEXENDING) delete_ns1ClassA.$(MEXENDING) 
+ns1ClassA: new_ns1ClassA_.$(MEXENDING) 
 
 # ns1ClassB
 new_ns1ClassB_.$(MEXENDING): new_ns1ClassB_.cpp
 	$(MEX) $(mex_flags) new_ns1ClassB_.cpp  -output new_ns1ClassB_
-delete_ns1ClassB.$(MEXENDING): delete_ns1ClassB.cpp
-	$(MEX) $(mex_flags) delete_ns1ClassB.cpp  -output delete_ns1ClassB
 
-ns1ClassB: new_ns1ClassB_.$(MEXENDING) delete_ns1ClassB.$(MEXENDING) 
+ns1ClassB: new_ns1ClassB_.$(MEXENDING) 
 
 # ns2ClassA
 new_ns2ClassA_.$(MEXENDING): new_ns2ClassA_.cpp
 	$(MEX) $(mex_flags) new_ns2ClassA_.cpp  -output new_ns2ClassA_
-delete_ns2ClassA.$(MEXENDING): delete_ns2ClassA.cpp
-	$(MEX) $(mex_flags) delete_ns2ClassA.cpp  -output delete_ns2ClassA
 ns2ClassA_afunction.$(MEXENDING): ns2ClassA_afunction.cpp
 	$(MEX) $(mex_flags) ns2ClassA_afunction.cpp  -output ns2ClassA_afunction
 @ns2ClassA/memberFunction.$(MEXENDING): @ns2ClassA/memberFunction.cpp
@@ -36,31 +30,25 @@ ns2ClassA_afunction.$(MEXENDING): ns2ClassA_afunction.cpp
 @ns2ClassA/nsReturn.$(MEXENDING): @ns2ClassA/nsReturn.cpp
 	$(MEX) $(mex_flags) @ns2ClassA/nsReturn.cpp  -output @ns2ClassA/nsReturn
 
-ns2ClassA: new_ns2ClassA_.$(MEXENDING) delete_ns2ClassA.$(MEXENDING) ns2ClassA_afunction.$(MEXENDING) @ns2ClassA/memberFunction.$(MEXENDING) @ns2ClassA/nsArg.$(MEXENDING) @ns2ClassA/nsReturn.$(MEXENDING) 
+ns2ClassA: new_ns2ClassA_.$(MEXENDING) ns2ClassA_afunction.$(MEXENDING) @ns2ClassA/memberFunction.$(MEXENDING) @ns2ClassA/nsArg.$(MEXENDING) @ns2ClassA/nsReturn.$(MEXENDING) 
 
 # ns2ns3ClassB
 new_ns2ns3ClassB_.$(MEXENDING): new_ns2ns3ClassB_.cpp
 	$(MEX) $(mex_flags) new_ns2ns3ClassB_.cpp  -output new_ns2ns3ClassB_
-delete_ns2ns3ClassB.$(MEXENDING): delete_ns2ns3ClassB.cpp
-	$(MEX) $(mex_flags) delete_ns2ns3ClassB.cpp  -output delete_ns2ns3ClassB
 
-ns2ns3ClassB: new_ns2ns3ClassB_.$(MEXENDING) delete_ns2ns3ClassB.$(MEXENDING) 
+ns2ns3ClassB: new_ns2ns3ClassB_.$(MEXENDING) 
 
 # ns2ClassC
 new_ns2ClassC_.$(MEXENDING): new_ns2ClassC_.cpp
 	$(MEX) $(mex_flags) new_ns2ClassC_.cpp  -output new_ns2ClassC_
-delete_ns2ClassC.$(MEXENDING): delete_ns2ClassC.cpp
-	$(MEX) $(mex_flags) delete_ns2ClassC.cpp  -output delete_ns2ClassC
 
-ns2ClassC: new_ns2ClassC_.$(MEXENDING) delete_ns2ClassC.$(MEXENDING) 
+ns2ClassC: new_ns2ClassC_.$(MEXENDING) 
 
 # ClassD
 new_ClassD_.$(MEXENDING): new_ClassD_.cpp
 	$(MEX) $(mex_flags) new_ClassD_.cpp  -output new_ClassD_
-delete_ClassD.$(MEXENDING): delete_ClassD.cpp
-	$(MEX) $(mex_flags) delete_ClassD.cpp  -output delete_ClassD
 
-ClassD: new_ClassD_.$(MEXENDING) delete_ClassD.$(MEXENDING) 
+ClassD: new_ClassD_.$(MEXENDING) 
 
 
 

wrap/tests/expected_namespaces/delete_ClassD.cpp

@@ -1,8 +0,0 @@
-// automatically generated by wrap
-#include <wrap/matlab.h>
-#include <ClassD.h>
-void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
-{
-  checkArguments("delete_ClassD",nargout,nargin,1);
-  delete_shared_ptr< ClassD >(in[0],"ClassD");
-}

wrap/tests/expected_namespaces/delete_ClassD.m

@@ -1,4 +0,0 @@
-% automatically generated by wrap
-function result = delete_ClassD(obj)
-  error('need to compile delete_ClassD.cpp');
-end

wrap/tests/expected_namespaces/delete_ns1ClassA.cpp

@@ -1,8 +0,0 @@
-// automatically generated by wrap
-#include <wrap/matlab.h>
-#include <path/to/ns1.h>
-void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
-{
-  checkArguments("delete_ns1ClassA",nargout,nargin,1);
-  delete_shared_ptr< ns1::ClassA >(in[0],"ns1ClassA");
-}

wrap/tests/expected_namespaces/delete_ns1ClassA.m

@@ -1,4 +0,0 @@
-% automatically generated by wrap
-function result = delete_ns1ClassA(obj)
-  error('need to compile delete_ns1ClassA.cpp');
-end

wrap/tests/expected_namespaces/delete_ns1ClassB.cpp

@@ -1,9 +0,0 @@
-// automatically generated by wrap
-#include <wrap/matlab.h>
-#include <path/to/ns1.h>
-#include <path/to/ns1/ClassB.h>
-void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
-{
-  checkArguments("delete_ns1ClassB",nargout,nargin,1);
-  delete_shared_ptr< ns1::ClassB >(in[0],"ns1ClassB");
-}

wrap/tests/expected_namespaces/delete_ns1ClassB.m

@@ -1,4 +0,0 @@
-% automatically generated by wrap
-function result = delete_ns1ClassB(obj)
-  error('need to compile delete_ns1ClassB.cpp');
-end

wrap/tests/expected_namespaces/delete_ns2ClassA.cpp

@@ -1,9 +0,0 @@
-// automatically generated by wrap
-#include <wrap/matlab.h>
-#include <path/to/ns2.h>
-#include <path/to/ns2/ClassA.h>
-void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
-{
-  checkArguments("delete_ns2ClassA",nargout,nargin,1);
-  delete_shared_ptr< ns2::ClassA >(in[0],"ns2ClassA");
-}

wrap/tests/expected_namespaces/delete_ns2ClassA.m

@@ -1,4 +0,0 @@
-% automatically generated by wrap
-function result = delete_ns2ClassA(obj)
-  error('need to compile delete_ns2ClassA.cpp');
-end

wrap/tests/expected_namespaces/delete_ns2ClassC.cpp

@@ -1,8 +0,0 @@
-// automatically generated by wrap
-#include <wrap/matlab.h>
-#include <path/to/ns2.h>
-void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
-{
-  checkArguments("delete_ns2ClassC",nargout,nargin,1);
-  delete_shared_ptr< ns2::ClassC >(in[0],"ns2ClassC");
-}

wrap/tests/expected_namespaces/delete_ns2ClassC.m

@@ -1,4 +0,0 @@
-% automatically generated by wrap
-function result = delete_ns2ClassC(obj)
-  error('need to compile delete_ns2ClassC.cpp');
-end

wrap/tests/expected_namespaces/delete_ns2ns3ClassB.cpp

@@ -1,9 +0,0 @@
-// automatically generated by wrap
-#include <wrap/matlab.h>
-#include <path/to/ns2.h>
-#include <path/to/ns3.h>
-void mexFunction(int nargout, mxArray *out[], int nargin, const mxArray *in[])
-{
-  checkArguments("delete_ns2ns3ClassB",nargout,nargin,1);
-  delete_shared_ptr< ns2::ns3::ClassB >(in[0],"ns2ns3ClassB");
-}

wrap/tests/expected_namespaces/delete_ns2ns3ClassB.m

@@ -1,4 +0,0 @@
-% automatically generated by wrap
-function result = delete_ns2ns3ClassB(obj)
-  error('need to compile delete_ns2ns3ClassB.cpp');
-end

wrap/tests/expected_namespaces/make_testNamespaces.m

@@ -10,21 +10,18 @@ addpath(toolboxpath);
 %% ns1ClassA
 cd(toolboxpath)
 mex -O5 new_ns1ClassA_.cpp
-mex -O5 delete_ns1ClassA.cpp
 
 cd @ns1ClassA
 
 %% ns1ClassB
 cd(toolboxpath)
 mex -O5 new_ns1ClassB_.cpp
-mex -O5 delete_ns1ClassB.cpp
 
 cd @ns1ClassB
 
 %% ns2ClassA
 cd(toolboxpath)
 mex -O5 new_ns2ClassA_.cpp
-mex -O5 delete_ns2ClassA.cpp
 mex -O5 ns2ClassA_afunction.cpp
 
 cd @ns2ClassA
@@ -35,21 +32,18 @@ mex -O5 nsReturn.cpp
 %% ns2ns3ClassB
 cd(toolboxpath)
 mex -O5 new_ns2ns3ClassB_.cpp
-mex -O5 delete_ns2ns3ClassB.cpp
 
 cd @ns2ns3ClassB
 
 %% ns2ClassC
 cd(toolboxpath)
 mex -O5 new_ns2ClassC_.cpp
-mex -O5 delete_ns2ClassC.cpp
 
 cd @ns2ClassC
 
 %% ClassD
 cd(toolboxpath)
 mex -O5 new_ClassD_.cpp
-mex -O5 delete_ClassD.cpp
 
 cd @ClassD