Merge pull request #65 from rdeits/rd-fix-error-ids

fix duplicate colon matlab error identifiers
jaeandersson · Jan 5, 2016 · 34f58d4 · 34f58d4
2 parents de0c52d + 388538c
commit 34f58d4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Lib/matlab/matlabtypemaps.swg b/Lib/matlab/matlabtypemaps.swg
@@ -19,7 +19,7 @@
 #define SWIG_SetConstant(name, obj)     SWIG_Matlab_SetConstant(module_ns,name,obj) 
 
 // raise
-#define SWIG_Matlab_Raise(OBJ, TYPE, DESC) mexErrMsgIdAndTxt("SWIG::RuntimeError", "C++ side threw an exception of type " TYPE)
+#define SWIG_Matlab_Raise(OBJ, TYPE, DESC) mexErrMsgIdAndTxt("SWIG:RuntimeError", "C++ side threw an exception of type " TYPE)
 #define SWIG_Raise(obj, type, desc)     SWIG_Matlab_Raise(obj, type, desc)
 
 /* directors are supported in Matlab */

diff --git a/Source/Modules/matlab.cxx b/Source/Modules/matlab.cxx
@@ -432,10 +432,10 @@ int MATLAB::top(Node *n) {
   Iterator i = First(l_modules);
   if (i.item) {
     Printf(f_init, "mxArray *id = mxCreateDoubleScalar(double(4)), *error;\n");
-    Printf(f_init, "if (!id) mexErrMsgIdAndTxt(\"SWIG::RuntimeError\", \"Setup failed\");\n");
+    Printf(f_init, "if (!id) mexErrMsgIdAndTxt(\"SWIG:RuntimeError\", \"Setup failed\");\n");
     for (; i.item; i = Next(i)) {
       Printf(f_init, "error = mexCallMATLABWithTrap(0, 0, 1, &id, \"%s\");\n", i.item);
-      Printf(f_init, "if (error) mexErrMsgIdAndTxt(\"SWIG::RuntimeError\", \"Cannot initialize %s\");\n", i.item);
+      Printf(f_init, "if (error) mexErrMsgIdAndTxt(\"SWIG:RuntimeError\", \"Cannot initialize %s\");\n", i.item);
       Delete(i.item);
     }
     Printf(f_init, "mxDestroyArray(id);\n");