Changeset 11202 for issm/trunk-jpl/src/c/objects/ExternalResults/DoubleMatExternalResult.cpp

Timestamp:

01/25/12 10:52:04 (13 years ago)

Author:

Mathieu Morlighem

Message:

Fixed some g++ warnings: deprecated conversion from string constant to ‘char*’

File:

• issm/trunk-jpl/src/c/objects/ExternalResults/DoubleMatExternalResult.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/objects/ExternalResults/DoubleMatExternalResult.cpp

@@ -196 +196 @@
 
         /*First write enum: */
-        name=EnumToStringx(this->enum_type);
+        EnumToStringx(&name,this->enum_type);
         length=(strlen(name)+1)*sizeof(char);
         fwrite(&length,sizeof(int),1,fid);
@@ -217 +217 @@
 /*}}}1*/
 /*FUNCTION DoubleMatExternalResult::GetResultName{{{1*/
-char* DoubleMatExternalResult::GetResultName(void){
-        return  EnumToStringx(this->enum_type);
+void DoubleMatExternalResult::GetResultName(char** pname){
+        EnumToStringx(pname,this->enum_type);
 }
 /*}}}*/
@@ -235 +235 @@
 
         /*recover name: */
-        name=this->GetResultName();
+        this->GetResultName(&name);
                                 
         /*create matlab matrix: */