Changeset 5262 in orxonox.OLD for trunk/src/lib/util

Timestamp:

Sep 26, 2005, 11:33:55 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: file-parsing works

File:

• trunk/src/lib/util/array.h (modified) (3 diffs)

trunk/src/lib/util/array.h

@@ -15 +15 @@
 
 /*!
-  \file array.h
-  \brief Contains the Array Class that handles arrays of classes.
+  @file array.h
+  @brief Contains the Array Class that handles arrays of classes.
   this class creates a Array of a semi-Dynamic length.
   beware, that after finalizing the array may not be resized again.
@@ -90 +90 @@
 {
   PRINTF(5)("deleting array\n");
-  Entry* walker = this->firstEntry;
-  Entry* previous;
-  while (walker)
+  if (!this->finalized)
   {
-    previous = walker;
-    walker = walker->next;
-    delete previous;
+    Entry* walker = this->firstEntry;
+    Entry* previous;
+    while (walker)
+    {
+      previous = walker;
+      walker = walker->next;
+      delete previous;
+    }
   }
-  if (finalized)
+  if (this->finalized)
     delete[] this->array;
 }
@@ -109 +112 @@
 void Array<T>::finalizeArray ()
 {
+  if (this->finalized)
+    return;
   PRINTF(5)("Finalizing array. Length: %i\n", entryCount);
   if (!(this->array = new T [this->entryCount]))
     PRINTF(1)("could not allocate %i data Blocks\n", this->entryCount);
   Entry* walker = this->firstEntry;
-  for (int i=0; i<this->entryCount; i++)
+  for (int i=0; i < this->entryCount; i++)
   {
     this->array[i] = walker->value;