Changeset 12447

Timestamp:

06/18/12 13:30:04 (13 years ago)

Author:

utke

Message:

should have read the manual page more carefully the first time around ... need the old size but also handling of the other corner cases.

Location:

issm/trunk-jpl/src/c/shared

Files:

• Alloc/xNewDelete.h (modified) (1 diff)
• TriMesh/TriMeshUtils.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/shared/Alloc/xNewDelete.h ¶

@@ -59 +59 @@
 
 template <class T> 
-T* xReNew(T* old, unsigned int size) {
+T* xReNew(T* old, unsigned int old_size, unsigned int size) {
 #ifdef USE_CXX_MEMORY_MANAGMENT_FOR_NON_POD_TYPES
-  assert(old);
-  T* aT_p=xNew<T>(size);
-  for (unsigned int i=0; i<size;++i) 
-    aT_p[i]=old[i];
-  xDelete<T>(old);
+  T* aT_p=NULL;
+  if (!old) { // no old memory
+    if (size)  
+      aT_p=xNew<T>(size);
+  }
+  else { // have old memory
+    if (!size)  // but 0 size
+      xDelete<T>(old);
+    else { // non-zero size
+      if (size>old_size) { // do something only if it is bigger
+        aT_p=xNew<T>(size);
+        for (unsigned int i=0; i<old_size;++i) 
+          aT_p[i]=old[i]; // copy the items
+        xDelete<T>(old);
+      }
+      else // size is equal or less than old size
+        aT_p=old; // do nothing
+    }
+  }
   return aT_p;
 #else 

issm/trunk-jpl/src/c/shared/TriMesh/TriMeshUtils.cpp ¶

@@ -66 +66 @@
                                 else{
                                         /*Reallocate another max_number_elements slots in the GridElements: */
-                                        GridElementsRealloc=xReNew<int>(GridElements,(current_size+max_number_elements));
+                                        GridElementsRealloc=xReNew<int>(GridElements,current_size,(current_size+max_number_elements));
                                         if (!GridElementsRealloc){
                                                 noerr=0;