Followup to bug 550611: Use a different placement-dtor form so as to appease gcc 4.5. rs=tn a=bustage
authorChris Jones <jones.chris.g@gmail.com>
Tue, 09 Nov 2010 00:17:06 -0600
changeset 57143 7fe44a9f25d4324b3896e97f4e255b6cafdc0218
parent 57142 776282c941786de94209630981e60d8b9a4f1842
child 57144 15ec275d4d29b7a0c3e6c9b20c8d4ae29596409f
push idunknown
push userunknown
push dateunknown
reviewerstn, bustage
bugs550611
milestone2.0b8pre
Followup to bug 550611: Use a different placement-dtor form so as to appease gcc 4.5. rs=tn a=bustage
layout/base/FramePropertyTable.cpp
--- a/layout/base/FramePropertyTable.cpp
+++ b/layout/base/FramePropertyTable.cpp
@@ -181,17 +181,17 @@ FramePropertyTable::Remove(nsIFrame* aFr
   void* result = array->ElementAt(index).mValue;
 
   PRUint32 last = array->Length() - 1;
   array->ElementAt(index) = array->ElementAt(last);
   array->RemoveElementAt(last);
 
   if (last == 1) {
     PropertyValue pv = array->ElementAt(0);
-    array->nsTArray<PropertyValue>::~nsTArray<PropertyValue>();
+    array->~nsTArray<PropertyValue>();
     entry->mProp = pv;
   }
   
   return result;
 }
 
 void
 FramePropertyTable::Delete(nsIFrame* aFrame, const FramePropertyDescriptor* aProperty)
@@ -214,17 +214,17 @@ FramePropertyTable::DeleteAllForEntry(En
     aEntry->mProp.DestroyValueFor(aEntry->GetKey());
     return;
   }
 
   nsTArray<PropertyValue>* array = aEntry->mProp.ToArray();
   for (PRUint32 i = 0; i < array->Length(); ++i) {
     array->ElementAt(i).DestroyValueFor(aEntry->GetKey());
   }
-  array->nsTArray<PropertyValue>::~nsTArray<PropertyValue>();
+  array->~nsTArray<PropertyValue>();
 }
 
 void
 FramePropertyTable::DeleteAllFor(nsIFrame* aFrame)
 {
   NS_ASSERTION(aFrame, "Null frame?");
 
   Entry* entry = mEntries.GetEntry(aFrame);