Merge remote branch 'origin/master' into import-gui

[pspp] / src / data / casereader.c

diff --git a/src/data/casereader.c b/src/data/casereader.c
index c8050c6cde4c7b2a35d6d2b45aa752c3ecbee1e8..e50096f5e8cc10980ec93b5b682042072466d2c9 100644 (file)
--- a/src/data/casereader.c
+++ b/src/data/casereader.c
@@ -91,10 +91,10 @@ casereader_destroy (struct casereader *reader)
   bool ok = true;
   if (reader != NULL)
     {
-      reader->class->destroy (reader, reader->aux);
-      ok = taint_destroy (reader->taint);
-      caseproto_unref (reader->proto);
-      free (reader);
+      //      reader->class->destroy (reader, reader->aux);
+      // ok = taint_destroy (reader->taint);
+      // caseproto_unref (reader->proto);
+      //  free (reader);
     }
   return ok;
 }
@@ -239,13 +239,12 @@ static casenumber
 casereader_count_cases__ (const struct casereader *reader,
                           casenumber max_cases)
 {
-  struct casereader *clone;
-  casenumber n_cases;
-
-  clone = casereader_clone (reader);
-  n_cases = casereader_advance (clone, max_cases);
-  casereader_destroy (clone);
-
+  struct casereader *clone = casereader_clone (reader);
+  casenumber n_cases = casereader_advance (clone, max_cases);
+#if (__GNUC__ == 4 ) && (__GNUC_MINOR__ == 4)
+  // volatile int x = 1;
+#endif
+  //  casereader_destroy (clone);
   return n_cases;
 }