Index: /issm/trunk-jpl/src/c/objects/Loads/Friction.cpp
===================================================================
--- /issm/trunk-jpl/src/c/objects/Loads/Friction.cpp	(revision 11197)
+++ /issm/trunk-jpl/src/c/objects/Loads/Friction.cpp	(revision 11198)
@@ -28,6 +28,6 @@
 }
 /*}}}*/
-/*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,5 +37,4 @@
 
 	this->matpar=matpar_in;
-
 }
 /*}}}*/
Index: /issm/trunk-jpl/src/c/objects/Loads/Friction.h
===================================================================
--- /issm/trunk-jpl/src/c/objects/Loads/Friction.h	(revision 11197)
+++ /issm/trunk-jpl/src/c/objects/Loads/Friction.h	(revision 11198)
@@ -23,5 +23,5 @@
 		/*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();
 	
Index: /issm/trunk-jpl/src/c/shared/Matlab/CheckNumMatlabArguments.cpp
===================================================================
--- /issm/trunk-jpl/src/c/shared/Matlab/CheckNumMatlabArguments.cpp	(revision 11197)
+++ /issm/trunk-jpl/src/c/shared/Matlab/CheckNumMatlabArguments.cpp	(revision 11198)
@@ -9,5 +9,5 @@
 #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: */
Index: /issm/trunk-jpl/src/c/shared/Matlab/matlabshared.h
===================================================================
--- /issm/trunk-jpl/src/c/shared/Matlab/matlabshared.h	(revision 11197)
+++ /issm/trunk-jpl/src/c/shared/Matlab/matlabshared.h	(revision 11198)
@@ -13,6 +13,6 @@
 	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
 
Index: /issm/trunk-jpl/src/c/shared/Matlab/mxGetAssignedField.cpp
===================================================================
--- /issm/trunk-jpl/src/c/shared/Matlab/mxGetAssignedField.cpp	(revision 11197)
+++ /issm/trunk-jpl/src/c/shared/Matlab/mxGetAssignedField.cpp	(revision 11198)
@@ -13,5 +13,5 @@
 #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,9 +19,9 @@
 	
 	//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