Changeset 11198


Ignore:
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:
5 edited

Legend:

Unmodified
Added
Removed
  • issm/trunk-jpl/src/c/objects/Loads/Friction.cpp

    r10135 r11198  
    2828}
    2929/*}}}*/
    30 /*FUNCTION Friction::Friction(char* element_type, Inputs* inputs,Matpar* matpar,int analysis_type){{{1*/
    31 Friction::Friction(char* element_type_in,Inputs* inputs_in,Matpar* matpar_in, int in_analysis_type){
     30/*FUNCTION Friction::Friction(const char* element_type, Inputs* inputs,Matpar* matpar,int analysis_type){{{1*/
     31Friction::Friction(const char* element_type_in,Inputs* inputs_in,Matpar* matpar_in, int in_analysis_type){
    3232
    3333        this->analysis_type=in_analysis_type;
     
    3737
    3838        this->matpar=matpar_in;
    39 
    4039}
    4140/*}}}*/
  • issm/trunk-jpl/src/c/objects/Loads/Friction.h

    r10135 r11198  
    2323                /*methods: */
    2424                Friction();
    25                 Friction(char* element_type, Inputs* inputs,Matpar* matpar, int analysis_type);
     25                Friction(const char* element_type, Inputs* inputs,Matpar* matpar, int analysis_type);
    2626                ~Friction();
    2727       
  • issm/trunk-jpl/src/c/shared/Matlab/CheckNumMatlabArguments.cpp

    r6412 r11198  
    99#include "mex.h"
    1010
    11 int CheckNumMatlabArguments(int nlhs,int NLHS, int nrhs,int NRHS, char* __FUNCT__, void (*function)( void )){
     11int CheckNumMatlabArguments(int nlhs,int NLHS, int nrhs,int NRHS, const char* __FUNCT__, void (*function)( void )){
    1212       
    1313        /*checks on arguments on the matlab side: */
  • issm/trunk-jpl/src/c/shared/Matlab/matlabshared.h

    r10189 r11198  
    1313        int ModuleBoot(void);
    1414        int ModuleEnd(void);
    15         mxArray* mxGetAssignedField(const mxArray* pmxa_array,int number, char* field);
    16         int CheckNumMatlabArguments(int nlhs,int NLHS, int nrhs,int NRHS, char* THISFUNCTION, void (*function)( void ));
     15        mxArray* mxGetAssignedField(const mxArray* pmxa_array,int number, const char* field);
     16        int CheckNumMatlabArguments(int nlhs,int NLHS, int nrhs,int NRHS, const char* THISFUNCTION, void (*function)( void ));
    1717#endif
    1818
  • issm/trunk-jpl/src/c/shared/Matlab/mxGetAssignedField.cpp

    r1 r11198  
    1313#include "mex.h"
    1414
    15 mxArray* mxGetAssignedField(const mxArray* pmxa_array,int number, char* field){
     15mxArray* mxGetAssignedField(const mxArray* pmxa_array,int number,const char* field){
    1616
    1717        //output
     
    1919       
    2020        //input
    21         mxArray*   inputs[2];
    22         mxArray*  pindex=NULL;
    23         const   char*   fnames[2];
    24         mwSize          ndim=2;
    25         mwSize          onebyone[2] = {1,1};
     21        mxArray    *inputs[2];
     22        mxArray    *pindex      = NULL;
     23        const char *fnames[2];
     24        mwSize      ndim        = 2;
     25        mwSize      onebyone[2] = {1,1};
    2626
    2727        //We want to call the subsasgn method, and get the returned array.This ensures that if we are running
Note: See TracChangeset for help on using the changeset viewer.