Context Navigation

DoubleMatExternalResult.cpp

Timestamp:

01/27/12 08:19:58 (13 years ago)

Author:

Eric.Larour

Message:

merged trunk-jpl and trunk for revision 11236

Location:

issm/trunk

Files:

Property svn:ignore

-              old
+              new
+autom4te.cache
+aclocal.m4
 bin
+config.log
+config.h
+config.h.in
+config.status
 configure
+doxygen
+ISSM.paf
+ISSM.ppf
+ISSM.ppf_cache
+libtool
+list
 Makefile
 Makefile.in
-ISSM.paf
-list
-ISSM.ppf_cache
-config.log
-config.h
-.ignore.txt
-config.status
 stamp-h1
 svn-commit*
-ISSM.ppf
-config.h.in
-autom4te.cache
-aclocal.m4
-doxygen

Property svn:mergeinfo changed

-              r9883
+              r11237
         /*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);
         fwrite(name,length,1,fid);
+        xfree((void**)&name);
         /*Now write time and step: */
 …
 /*}}}1*/
 /*FUNCTION DoubleMatExternalResult::GetResultName{{{1*/
 char* DoubleMatExternalResult::GetResultName(void){
         return  EnumToStringx(this->enum_type);
+void DoubleMatExternalResult::GetResultName(char** pname){
+        EnumToStringx(pname,this->enum_type);
+}
 /*}}}*/
 …
         /*recover name: */
         name=this->GetResultName();
+        this->GetResultName(&name);
         /*create matlab matrix: */

Note: See TracChangeset for help on using the changeset viewer.