Changeset 1228 for trunk/psLib/src/collections/psVector.c

Timestamp:

Jul 15, 2004, 12:18:02 PM (22 years ago)

Author:

desonia

Message:

extracted the vector of pointers functionality to a new object, psArray.

File:

• trunk/psLib/src/collections/psVector.c (modified) (4 diffs)

trunk/psLib/src/collections/psVector.c

@@ -8 +8 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-26 00:24:30 $
+ *  @version $Revision: 1.13 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-15 22:18:02 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -100 +100 @@
         elementSize = PSELEMTYPE_SIZEOF(elemType);
         if(nalloc < in->n) {
-            if (elemType == PS_TYPE_PTR) {
-                for (int i = nalloc; i < in->n; i++) {   // For reduction in vector size
-                    psMemDecrRefCounter(in->data.PTR[i]);
-                }
-            }
             in->n = nalloc;
         }
@@ -139 +134 @@
 
 
-    // if vector of pointers, dereference old values.
-    if (elemType == PS_TYPE_PTR) {
-        for (int i = 0; i < in->n; i++) {   // For reduction in vector size
-            psMemDecrRefCounter(in->data.PTR[i]);
-            in->data.PTR[i] = NULL;
-        }
-    }
-
     in->data.V = psRealloc(in->data.V,nalloc*PSELEMTYPE_SIZEOF(type));
 
@@ -162 +149 @@
     }
 
-    if (psVec->type.type == PS_TYPE_PTR) {
-        for(int i = 0; i < psVec->n; i++) {
-            psFree(psVec->data.PTR[i]);
-            psVec->data.PTR[i] = NULL;
-        }
-    }
-
     psFree(psVec->data.V);
 }
-
-void psVectorElementFree(psVector *restrict psVec)
-{
-
-    if(psVec == NULL) {
-        return;
-    }
-
-    if (psVec->type.type != PS_TYPE_PTR) {
-        psLogMsg(__func__,PS_LOG_WARN,"psVectorElementFree only operates on void* vectors");
-        return;
-    }
-
-    for(int i = 0; i < psVec->n; i++) {
-        psFree(psVec->data.PTR[i]);
-        psVec->data.PTR[i] = NULL;
-    }
-}
-