Changeset 13395 for issm/trunk/src/modules/StringToEnum/StringToEnum.cpp

Timestamp:

09/19/12 09:32:34 (12 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 13393

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/modules/StringToEnum/StringToEnum.cpp (modified) (2 diffs)

issm/trunk

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4

issm/trunk/src/modules/StringToEnum/StringToEnum.cpp

@@ -5 +5 @@
 #include "./StringToEnum.h"
 
-void mexFunction( int nlhs, mxArray* plhs[], int nrhs, const mxArray* prhs[]){
+void StringToEnumUsage(void){/*{{{*/
+        _pprintLine_("");
+        _pprintLine_("   usage: " << __FUNCT__ << "enum = StringToEnum(string);");
+        _pprintLine_("");
+}/*}}}*/
+WRAPPER(StringToEnum){
 
         char    *name    = NULL;
         int      enum_out;
 
-        /*checks on arguments on the matlab side: */
-        if(nrhs!=NRHS){
-                StringToEnumUsage(); _error2_("usage. See above");
-        }
+        /*Boot module: */
+        MODULEBOOT();
+
+        /*checks on arguments: */
+        CHECKARGUMENTS(NLHS,NRHS,&StringToEnumUsage);
 
         /*Fetch inputs: */
@@ -23 +29 @@
         /* output: */
         WriteData(ENUMOUT,enum_out);
+
+        /*end module: */
+        MODULEEND();
 }
-
-void StringToEnumUsage(void)
-{
-        _pprintLine_("");
-        _pprintLine_("   usage: " << __FUNCT__ << "enum = StringToEnum(string);");
-        _pprintLine_("");
-}

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4