Changeset 19105 for issm/trunk/src/c/classes/Options/GenericOption.h

Timestamp:

02/12/15 16:48:40 (10 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 19103

Location:

issm/trunk

Files:

• . (modified) (2 props)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/classes/Options/GenericOption.h (modified) (1 diff)

issm/trunk

@@ +1 @@
+build-fw
+build-ad
 nightlylog
 configure.sh

@@ +1 @@
+build-fw
+build-ad
 nightlylog
 configure.sh

issm/trunk/src/c

@@ -5 +5 @@
 *.obj
 *.exe
+issm
+kriging
 appscan.*
 ouncemake*
@@ -14 +16 @@
 probe.results
 stXXXX*
-.deps
-.dirstamp
+*.deps
+*.dirstamp
 .libs

@@ -5 +5 @@
 *.obj
 *.exe
+issm
+kriging
 appscan.*
 ouncemake*
@@ -14 +16 @@
 probe.results
 stXXXX*
-.deps
-.dirstamp
+*.deps
+*.dirstamp
 .libs

issm/trunk/src/c/classes/Options/GenericOption.h

@@ -132 +132 @@
 /*}}}*/
 
+/*Special destructors when there is a pointer*/
+template <> inline GenericOption<char*>::~GenericOption(){ /*{{{*/
+
+        if(name)   xDelete<char>(name);
+        if(size)   xDelete<int>(size);
+        if(value)  xDelete<char>(value);
+} 
+/*}}}*/
+
 #endif  /* _OPTIONOBJECT_H */

@@ +1 @@
+build-fw
+build-ad
 nightlylog
 configure.sh

@@ -5 +5 @@
 *.obj
 *.exe
+issm
+kriging
 appscan.*
 ouncemake*
@@ -14 +16 @@
 probe.results
 stXXXX*
-.deps
-.dirstamp
+*.deps
+*.dirstamp
 .libs