Changeset 13385

Timestamp:

09/18/12 09:40:43 (13 years ago)

Author:

Mathieu Morlighem

Message:

CHG: special case to retrive string, need to return a copy of the default value otherwise delete will crash

Location:

issm/trunk-jpl/src/c

Files:

• Container/Options.h (modified) (1 diff)
• classes/bamg/Geometry.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/Container/Options.h

@@ -100 +100 @@
 
 #endif //ifndef _INPUTS_H_
+
+template <> inline void Options::Get(char** pvalue,const char* name,char* default_value){ /*{{{*/
+
+        vector<Object*>::iterator object;
+        GenericOption<char*>* genericoption=NULL;
+
+        /*Get option*/
+        genericoption=(GenericOption<char*>*)GetOption(name);
+
+        /*If the pointer is not NULL, the option has been found*/
+        if(genericoption){
+                genericoption->Get(pvalue);
+        }
+        else{
+                /*Make a copy*/
+                char* outstring=NULL;
+                int   stringsize;
+
+                stringsize=strlen(default_value)+1;
+                outstring=xNew<char>(stringsize);
+                xMemCpy<char>(outstring,default_value,stringsize);
+                *pvalue=outstring;
+        }
+}
+/*}}}*/

issm/trunk-jpl/src/c/classes/bamg/Geometry.cpp

@@ -529 +529 @@
                                 _printLine_("reference numbers: " << v->ReferenceNumber << " " << vertices[i].ReferenceNumber);
                                 _printLine_("Id: " << i+1);
+                                _printLine_("Coords: ["<<v->r.x<<" "<<v->r.y<<"] ["<<vertices[i].r.x<<" "<<vertices[i].r.y<<"]");
+
                                 delete [] next_p;
                                 delete [] head_v;