Changeset 711 for trunk/gsdl/src/mgpp/text/weights.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/weights.cpp (modified) (5 diffs)

trunk/gsdl/src/mgpp/text/weights.cpp

@@ -43 +43 @@
 /*
    $Log$
+   Revision 1.2  1999/10/17 23:43:31  cs025
+   Changes to eradicate Xmalloc
+
    Revision 1.1  1999/10/11 02:58:41  cs025
    Base install of MG-PP
@@ -68 +71 @@
   int num;
 
-  if (!(awd = (approx_weights_data *) Xmalloc (sizeof (*awd))))
+  if (!(awd = new approx_weights_data))
     {
       mg_errno = MG_NOMEM;
@@ -84 +87 @@
 
   num = (num_of_docs * awd->bits + 31) / 32;
-  if (!(awd->DocWeights = (long unsigned int *) Xmalloc (sizeof (unsigned long) * num)))
+  if (!(awd->DocWeights = new (unsigned long)[num]))
     {
-      Xfree (awd);
+      delete awd;
       mg_errno = MG_NOMEM;
       return (NULL);
@@ -107 +110 @@
     {
       int i, size = (1 << awd->bits);
-      if (!(awd->table = (float *) Xmalloc (size * sizeof (float))))
+      if (!(awd->table = new float[size]))
       return (awd);
       awd->table[0] = awd->L;
@@ -155 +158 @@
 FreeWeights (approx_weights_data * awd)
 {
-  Xfree (awd->DocWeights);
+  delete (awd->DocWeights);
   if (awd->table)
-    Xfree (awd->table);
-  Xfree (awd);
+    delete (awd->table);
+  delete awd;
 }