Changeset 8247

Timestamp:

05/11/11 07:27:33 (14 years ago)

Author:

Mathieu Morlighem

Message:

DO NOT use moduleboot and moduleend in EnumToString/EnumToString.cpp and StringToEnum/StringToEnum.cpp: that makes larsen crash

Location:

issm/trunk/src/mex

Files:

• EnumToString/EnumToString.cpp (modified) (2 diffs)
• StringToEnum/StringToEnum.cpp (modified) (2 diffs)
• Test/Test.cpp (modified) (1 diff)

issm/trunk/src/mex/EnumToString/EnumToString.cpp

@@ -9 +9 @@
         char    *name    = NULL;
         int      enum_in;
-
-        /*Boot module: */
-        MODULEBOOT();
 
         /*checks on arguments on the matlab side: */
@@ -24 +21 @@
         /* output: */
         WriteData(NAME,name);
-
-        /*end module: */
-        MODULEEND();
 }
 

issm/trunk/src/mex/StringToEnum/StringToEnum.cpp

@@ -9 +9 @@
         char    *name    = NULL;
         int      enum_out;
-
-        /*Boot module: */
-        MODULEBOOT();
 
         /*checks on arguments on the matlab side: */
@@ -24 +21 @@
         /* output: */
         WriteData(ENUMOUT,enum_out);
-
-        /*end module: */
-        MODULEEND();
 }
 

issm/trunk/src/mex/Test/Test.cpp

@@ -14 +14 @@
         int      numel;
 
-        printf("Parsing options:\n");
-        options=new Options(0,nrhs,prhs);
-
-        options->Get(&test,"test",1.);
-        printf("\n value of \"test\" is %g\n",test);
-
-        options->Get(&name,"model.name","default");
-        printf("\n value of \"model.name\" is %s\n",name);
-
-        options->Get(&test,"CELL[0,2]",1.);
-        printf("\n value of \"CELL[0,2]\" is %g\n",test);
-
-        options->Get(&logical,"logical",true);
-        printf("\n value of \"logical\" is %s\n",logical?"true":"false");
-
-        options->Get(&matrix,&numel,"matrix");
-        printarray(matrix,numel);
-
-        delete options;
-        xfree((void**)&name);
-        xfree((void**)&matrix);
+        MODULEBOOT();
+        MODULEEND();
 }