Changeset 711 for trunk/gsdl/src/mgpp/text/query.ranked.cpp

Timestamp:

1999-10-18T12:43:31+13:00 (25 years ago)

Author:

cs025

Message:

Changes to eradicate Xmalloc

File:

• trunk/gsdl/src/mgpp/text/query.ranked.cpp (modified) (7 diffs)

trunk/gsdl/src/mgpp/text/query.ranked.cpp

@@ -51 +51 @@
 /*
    $Log$
+   Revision 1.3  1999/10/17 23:43:29  cs025
+   Changes to eradicate Xmalloc
+
    Revision 1.2  1999/10/12 04:13:52  cs025
    Calls to GetEnv eradicated; interface to parsing of query text
@@ -128 +131 @@
     int MaxSize;
     HeapComp HC;
-    HeapEntry HE[1];
+    HeapEntry *HE;
+
+    Heap(int size)
+    {
+      HE = new HeapEntry[size];
+    }
+
+    ~Heap()
+    {
+      if (HE != NULL)
+    delete HE;
+    }
   }
 Heap;
@@ -137 +151 @@
 {
   Heap *H;
-  H = (Heap *) Xmalloc (sizeof (Heap) + (size - 1) * sizeof (HeapEntry));
+  H = new Heap(size);
   if (!H)
     return NULL;
@@ -644 +658 @@
      document weights which we retrieve from the ".idx.wgt" file and put
      the resulting data into a heap */
-
-
   he = H->HE;
   H->NumItems = MaxDocs;
@@ -805 +817 @@
     }
 
-
   if (rqi->Exact && qd->id->ifh.InvfLevel != 3)
     {
@@ -957 +968 @@
     }
     }
-
-
 
   H->HC = Heap_Greater;
@@ -1062 +1071 @@
     LT_free (qd, LT);
 
-  if (H) Xfree (H); /* [RJM 07/98: Memory Leak] */
+  if (H) delete H; /* [RJM 07/98: Memory Leak] */
 
   return (Docs);