From 6fbc050c96961eb19f767acbdaab7d8e28fbcca9 Mon Sep 17 00:00:00 2001
From: Jim Kowalkowski <core-talk@aps.anl.gov>
Date: Sat, 7 Sep 1996 13:03:07 +0000
Subject: [PATCH] fixes to destroyData function

---
 src/gdd/gdd.h          | 12 +++++++++---
 src/gdd/gddAppTable.cc |  5 ++++-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/gdd/gdd.h b/src/gdd/gdd.h
index 845e30591..e4fc47a4b 100644
--- a/src/gdd/gdd.h
+++ b/src/gdd/gdd.h
@@ -8,6 +8,9 @@
  * $Id$
  *
  * $Log$
+ * Revision 1.13  1996/09/04 22:47:09  jhill
+ * allow vxWorks 5.1 and gnu win 32
+ *
  * Revision 1.12  1996/08/27 13:05:06  jbk
  * final repairs to string functions, put() functions, and error code printing
  *
@@ -734,7 +737,7 @@ inline gddStatus gdd::unreference(void)
 		{
 			// managed dd always destroys the entire thing
 			ref_cnt=1;
-			if(destruct) destruct->run(this);
+			if(destruct) destruct->destroy(this);
 			destruct=NULL;
 		}
 		else if(!isFlat())
@@ -749,9 +752,12 @@ inline void gdd::destroyData(void)
 	{
 		// up to destructor to free the bounds
 		if(isContainer())
-			destruct->run(this);
+			destruct->destroy(this);
 		else
-			destruct->run(dataPointer());
+			destruct->destroy(dataPointer());
+
+		destruct=NULL;
+		setData(NULL);
 	}
 	else
 	{
diff --git a/src/gdd/gddAppTable.cc b/src/gdd/gddAppTable.cc
index 7b0190aca..bc7ec9371 100644
--- a/src/gdd/gddAppTable.cc
+++ b/src/gdd/gddAppTable.cc
@@ -4,6 +4,9 @@
 // $Id$
 // 
 // $Log$
+// Revision 1.3  1996/08/27 13:05:08  jbk
+// final repairs to string functions, put() functions, and error code printing
+//
 // Revision 1.2  1996/06/26 21:00:08  jbk
 // Fixed up code in aitHelpers, removed unused variables in others
 // Fixed potential problem in gddAppTable.cc with the map functions
@@ -372,7 +375,7 @@ gddStatus gddApplicationTypeTable::mapAppToIndex(
 		else
 			rc=gddErrorOutOfBounds;
 	}
-	gddAutoPrint("gddAppTable::mapAppToIndex()",rc);
+	// gddAutoPrint("gddAppTable::mapAppToIndex()",rc);
 	return rc;
 }