0030835: Possible performance improvements in methods TDF_Label::FindAttribute

Make attribute iterator work with pointers to attributes, so, creation of handle on each iteration is avoided.

diff --git a/src/TDF/TDF_AttributeIterator.hxx b/src/TDF/TDF_AttributeIterator.hxx
index fa8622c..dbc6103 100644 (file)
--- a/src/TDF/TDF_AttributeIterator.hxx
+++ b/src/TDF/TDF_AttributeIterator.hxx
@@ -61,6 +61,9 @@ public:
   Standard_EXPORT   void Next() ;
   inline   Handle(TDF_Attribute) Value() const;
 
+  //! Provides an access to the internal pointer of the current attribute.
+  //! The method has better performance as not-creating handle.
+  inline const TDF_Attribute* PtrValue() const { return myValue; }
 
 protected:
 

diff --git a/src/TDF/TDF_Label.cxx b/src/TDF/TDF_Label.cxx
index 838a44b..eba97eb 100644 (file)
--- a/src/TDF/TDF_Label.cxx
+++ b/src/TDF/TDF_Label.cxx
@@ -60,8 +60,8 @@ Standard_Boolean TDF_Label::FindAttribute
   if (IsNull()) throw Standard_NullObject("A null Label has no attribute.");
   TDF_AttributeIterator itr (myLabelNode); // Without removed attributes.
   for ( ; itr.More(); itr.Next()) {
-    if (itr.Value()->ID() == anID) {
-      anAttribute = itr.Value();
+    if (itr.PtrValue()->ID() == anID) {
+      anAttribute = itr.PtrValue();
       return Standard_True;
     }
   }

diff --git a/src/TDF/TDF_Label.hxx b/src/TDF/TDF_Label.hxx
index ab01f01..e4a5be3 100644 (file)
--- a/src/TDF/TDF_Label.hxx
+++ b/src/TDF/TDF_Label.hxx
@@ -154,7 +154,7 @@ public:
   template <class T> 
   Standard_Boolean FindAttribute (const Standard_GUID& theID, Handle(T)& theAttr) const
   { 
-    Handle(TDF_Attribute) anAttr = theAttr;
+    Handle(TDF_Attribute) anAttr;
     return FindAttribute (theID, anAttr) && ! (theAttr = Handle(T)::DownCast(anAttr)).IsNull();
   }