Skip to content

Commit

Permalink
Revert "[MATLAB] issue #47: Added module load/unload entry points"
Browse files Browse the repository at this point in the history
This reverts commit 7881316.
  • Loading branch information
jaeandersson committed Sep 6, 2015
1 parent badaa8c commit 1f18674
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 32 deletions.
13 changes: 0 additions & 13 deletions Lib/matlab/matlabrun.swg
Expand Up @@ -130,19 +130,6 @@ void* SWIG_Matlab_DeletePointer(SwigPtr* p) {
#ifdef __cplusplus
extern "C"
#endif /* cplusplus */

int SWIG_Matlab_ModuleLoad(int resc, mxArray *resv[], int argc, mxArray *argv[]) {
/* Increase lock count */
mexLock();
return 0;
}

int SWIG_Matlab_ModuleUnload(int resc, mxArray *resv[], int argc, mxArray *argv[]) {
/* Decrease lock count */
mexUnlock();
return 0;
}

void SWIG_Matlab_ExitFcn(void) {
/* Unused at the moment */
}
Expand Down
28 changes: 9 additions & 19 deletions Source/Modules/matlab.cxx
Expand Up @@ -2225,29 +2225,19 @@ void MATLAB::initGateway() {
l_fnames = NewList();

// Constants retrieval function has index 0
String* fname=NewString("swigConstant");
toGateway(fname, fname);
Delete(fname);
String* swigConstant=NewString("swigConstant");
toGateway(swigConstant, swigConstant);
Delete(swigConstant);

// Function name retrieval function has index 1
fname=NewString("swigFunctionName");
toGateway(fname, fname);
Delete(fname);
String* swigFunctionName=NewString("swigFunctionName");
toGateway(swigFunctionName, swigFunctionName);
Delete(swigFunctionName);

// Constant name retrieval function has index 2
fname=NewString("swigConstantName");
toGateway(fname, fname);
Delete(fname);

// Module load has index 3
fname=NewString("SWIG_Matlab_ModuleLoad");
toGateway(fname, fname);
Delete(fname);

// Module unload has index 4
fname=NewString("SWIG_Matlab_ModuleUnload");
toGateway(fname, fname);
Delete(fname);
String* swigConstantName=NewString("swigConstantName");
toGateway(swigConstantName, swigConstantName);
Delete(swigConstantName);
}

int MATLAB::toGateway(String *fullname, String *wname) {
Expand Down

0 comments on commit 1f18674

Please sign in to comment.