Changeset 11198

Timestamp:

01/25/12 08:47:57 (13 years ago)

Author:

Mathieu Morlighem

Message:

Fixed some const char missing

Location:

issm/trunk-jpl/src/c

Files:

• objects/Loads/Friction.cpp (modified) (2 diffs)
• objects/Loads/Friction.h (modified) (1 diff)
• shared/Matlab/CheckNumMatlabArguments.cpp (modified) (1 diff)
• shared/Matlab/matlabshared.h (modified) (1 diff)
• shared/Matlab/mxGetAssignedField.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/objects/Loads/Friction.cpp

@@ -28 +28 @@
 }
 /*}}}*/
-/*FUNCTION Friction::Friction(char* element_type, Inputs* inputs,Matpar* matpar,int analysis_type){{{1*/
-Friction::Friction(char* element_type_in,Inputs* inputs_in,Matpar* matpar_in, int in_analysis_type){
+/*FUNCTION Friction::Friction(const char* element_type, Inputs* inputs,Matpar* matpar,int analysis_type){{{1*/
+Friction::Friction(const char* element_type_in,Inputs* inputs_in,Matpar* matpar_in, int in_analysis_type){
 
         this->analysis_type=in_analysis_type;
@@ -37 +37 @@
 
         this->matpar=matpar_in;
-
 }
 /*}}}*/

issm/trunk-jpl/src/c/objects/Loads/Friction.h

@@ -23 +23 @@
                 /*methods: */
                 Friction();
-                Friction(char* element_type, Inputs* inputs,Matpar* matpar, int analysis_type);
+                Friction(const char* element_type, Inputs* inputs,Matpar* matpar, int analysis_type);
                 ~Friction();
         

issm/trunk-jpl/src/c/shared/Matlab/CheckNumMatlabArguments.cpp

@@ -9 +9 @@
 #include "mex.h"
 
-int CheckNumMatlabArguments(int nlhs,int NLHS, int nrhs,int NRHS, char* __FUNCT__, void (*function)( void )){
+int CheckNumMatlabArguments(int nlhs,int NLHS, int nrhs,int NRHS, const char* __FUNCT__, void (*function)( void )){
         
         /*checks on arguments on the matlab side: */

issm/trunk-jpl/src/c/shared/Matlab/matlabshared.h

@@ -13 +13 @@
         int ModuleBoot(void);
         int ModuleEnd(void);
-        mxArray* mxGetAssignedField(const mxArray* pmxa_array,int number, char* field);
-        int CheckNumMatlabArguments(int nlhs,int NLHS, int nrhs,int NRHS, char* THISFUNCTION, void (*function)( void ));
+        mxArray* mxGetAssignedField(const mxArray* pmxa_array,int number, const char* field);
+        int CheckNumMatlabArguments(int nlhs,int NLHS, int nrhs,int NRHS, const char* THISFUNCTION, void (*function)( void ));
 #endif
 

issm/trunk-jpl/src/c/shared/Matlab/mxGetAssignedField.cpp

@@ -13 +13 @@
 #include "mex.h"
 
-mxArray* mxGetAssignedField(const mxArray* pmxa_array,int number, char* field){
+mxArray* mxGetAssignedField(const mxArray* pmxa_array,int number,const char* field){
 
         //output
@@ -19 +19 @@
         
         //input
-        mxArray*   inputs[2];
-        mxArray*  pindex=NULL;
-        const   char*   fnames[2];
-        mwSize          ndim=2;
-        mwSize          onebyone[2] = {1,1};
+        mxArray    *inputs[2];
+        mxArray    *pindex      = NULL;
+        const char *fnames[2];
+        mwSize      ndim        = 2;
+        mwSize      onebyone[2] = {1,1};
 
         //We want to call the subsasgn method, and get the returned array.This ensures that if we are running