free attributes list; SCL git c77471a

Nicholas Reed · Nicholas Reed · commit 3fa087693c09 · 2012-06-19T19:44:06.000Z
diff --git a/src/clstepcore/STEPattribute.h b/src/clstepcore/STEPattribute.h
@@ -91,6 +91,7 @@ class SCL_CORE_EXPORT STEPattribute {
 
     public:
         const AttrDescriptor * aDesc;
+        int refCount;
 
         // You know which of these to use based on the return value of
         // NonRefType() - see below. BASE_TYPE is defined in baseType.h
diff --git a/src/clstepcore/STEPattribute.inline.cc b/src/clstepcore/STEPattribute.inline.cc
@@ -18,69 +18,69 @@
 
 ///  This is needed so that STEPattribute's can be passed as references to inline functions
 STEPattribute::STEPattribute( const STEPattribute & a )
-    : aDesc( a.aDesc ), _derive( 0 ), _redefAttr( 0 ) {}
+    : _derive( 0 ), _redefAttr( 0 ), aDesc( a.aDesc ), refCount( 0 ) {}
 
 ///  INTEGER
 STEPattribute::STEPattribute( const class AttrDescriptor & d, SDAI_Integer  *p )
-    : aDesc( &d ), _derive( 0 ), _redefAttr( 0 ) {
+    : _derive( 0 ), _redefAttr( 0 ), aDesc( &d ), refCount( 0 )  {
     ptr.i = p;
     assert( &d ); //ensure that the AttrDescriptor is not a null pointer
 }
 
 ///  BINARY
 STEPattribute::STEPattribute( const class AttrDescriptor & d, SDAI_Binary  *p )
-    : aDesc( &d ), _derive( 0 ), _redefAttr( 0 ) {
+    : _derive( 0 ), _redefAttr( 0 ), aDesc( &d ), refCount( 0 ) {
     ptr.b = p;
     assert( &d ); //ensure that the AttrDescriptor is not a null pointer
 }
 
 ///  STRING
 STEPattribute::STEPattribute( const class AttrDescriptor & d, SDAI_String  *p )
-    : aDesc( &d ), _derive( 0 ), _redefAttr( 0 ) {
+    : _derive( 0 ),  _redefAttr( 0 ), aDesc( &d ), refCount( 0 ) {
     ptr.S = p;
     assert( &d ); //ensure that the AttrDescriptor is not a null pointer
 }
 
 ///  REAL & NUMBER
 STEPattribute::STEPattribute( const class AttrDescriptor & d, SDAI_Real  *p )
-    : aDesc( &d ), _derive( 0 ), _redefAttr( 0 ) {
+    : _derive( 0 ), _redefAttr( 0 ), aDesc( &d ), refCount( 0 ) {
     ptr.r = p;
     assert( &d ); //ensure that the AttrDescriptor is not a null pointer
 }
 
 ///  ENTITY
 STEPattribute::STEPattribute( const class AttrDescriptor & d,
                               SDAI_Application_instance * *p )
-    : aDesc( &d ), _derive( 0 ), _redefAttr( 0 ) {
+    : _derive( 0 ),  _redefAttr( 0 ), aDesc( &d ), refCount( 0 ) {
     ptr.c = p;
     assert( &d ); //ensure that the AttrDescriptor is not a null pointer
 }
 
 ///  AGGREGATE
 STEPattribute::STEPattribute( const class AttrDescriptor & d, STEPaggregate * p )
-    : aDesc( &d ), _derive( 0 ), _redefAttr( 0 ) {
+    : _derive( 0 ),  _redefAttr( 0 ), aDesc( &d ), refCount( 0 ) {
     ptr.a =  p;
     assert( &d ); //ensure that the AttrDescriptor is not a null pointer
 }
 
 ///  ENUMERATION  and Logical
 STEPattribute::STEPattribute( const class AttrDescriptor & d, SDAI_Enum  *p )
-    : aDesc( &d ), _derive( 0 ), _redefAttr( 0 ) {
+    : _derive( 0 ),  _redefAttr( 0 ), aDesc( &d ), refCount( 0 ) {
     ptr.e = p;
     assert( &d ); //ensure that the AttrDescriptor is not a null pointer
 }
 
 ///  SELECT
 STEPattribute::STEPattribute( const class AttrDescriptor & d,
                               class SDAI_Select  *p )
-    : aDesc( &d ), _derive( 0 ), _redefAttr( 0 ) {
+    : _derive( 0 ),  _redefAttr( 0 ), aDesc( &d ), refCount( 0 ) {
     ptr.sh = p;
     assert( &d ); //ensure that the AttrDescriptor is not a null pointer
 }
 
 ///  UNDEFINED
 STEPattribute::STEPattribute( const class AttrDescriptor & d, SCLundefined * p )
-    : aDesc( &d ), _derive( 0 ), _redefAttr( 0 ) {
+    : _derive( 0 ), _redefAttr( 0 ), aDesc( &d ), refCount( 0 ) {
     ptr.u = p;
     assert( &d ); //ensure that the AttrDescriptor is not a null pointer
 }
diff --git a/src/clstepcore/STEPattributeList.cc b/src/clstepcore/STEPattributeList.cc
@@ -70,6 +70,7 @@ void STEPattributeList::push( STEPattribute * a ) {
     }
 
     if( push ) {
+        a->refCount ++;
         AttrListNode * saln = new AttrListNode( a );
         AppendNode( saln );
     }
diff --git a/src/clstepcore/sdaiApplication_instance.cc b/src/clstepcore/sdaiApplication_instance.cc
@@ -40,7 +40,18 @@ SDAI_Application_instance::SDAI_Application_instance( int fileid, int complex )
 }
 
 SDAI_Application_instance::~SDAI_Application_instance() {
+    STEPattribute *attr;
+
     ResetAttributes();
+    do {
+        attr = NextAttribute();
+        if (attr) {
+            attr->refCount --;
+            if (attr->refCount <= 0)
+                delete attr;
+        }   
+    } while (attr);
+
 
     if( MultipleInheritance() ) {
         delete nextMiEntity;

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,7 @@ void STEPattributeList::push( STEPattribute * a ) {`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`if( push ) {`
	`73`	`+ a->refCount ++;`
`73`	`74`	`AttrListNode * saln = new AttrListNode( a );`
`74`	`75`	`AppendNode( saln );`
`75`	`76`	`}`