[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 397f17ea6786795d408f4043bb7319989f711b4b
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Apr 5 08:36:51 2002 +0000

    	* src/kwq/qt/qmap.h (QMapNode::~QMapNode): Cast left() and right()
    	to the right type to fix a leak detected by the automated leak
    	checking on Jersey.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@972 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 402740e..a163e83 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-04-05  Maciej Stachowiak  <mjs at apple.com>
+
+	* src/kwq/qt/qmap.h (QMapNode::~QMapNode): Cast left() and right()
+	to the right type to fix a leak detected by the automated leak
+	checking on Jersey.
+
 2002-04-04  Richard Williamson  <rjw at apple.com>
 
         Extra bulletproofing to prevent script execution when in partially
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 402740e..a163e83 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,9 @@
+2002-04-05  Maciej Stachowiak  <mjs at apple.com>
+
+	* src/kwq/qt/qmap.h (QMapNode::~QMapNode): Cast left() and right()
+	to the right type to fix a leak detected by the automated leak
+	checking on Jersey.
+
 2002-04-04  Richard Williamson  <rjw at apple.com>
 
         Extra bulletproofing to prevent script execution when in partially
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 402740e..a163e83 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,9 @@
+2002-04-05  Maciej Stachowiak  <mjs at apple.com>
+
+	* src/kwq/qt/qmap.h (QMapNode::~QMapNode): Cast left() and right()
+	to the right type to fix a leak detected by the automated leak
+	checking on Jersey.
+
 2002-04-04  Richard Williamson  <rjw at apple.com>
 
         Extra bulletproofing to prevent script execution when in partially
diff --git a/WebCore/kwq/KWQMap.h b/WebCore/kwq/KWQMap.h
index c9c0031..5bc3bb0 100644
--- a/WebCore/kwq/KWQMap.h
+++ b/WebCore/kwq/KWQMap.h
@@ -60,8 +60,8 @@ template <class K, class V> class QMapNode : private KWQMapNodeImpl
 
     ~QMapNode()
     {
-	delete left();
-	delete right();
+	delete (QMapNode<K,V> *)left();
+	delete (QMapNode<K,V> *)right();
     }
 
     K key;
diff --git a/WebCore/kwq/qt/qmap.h b/WebCore/kwq/qt/qmap.h
index c9c0031..5bc3bb0 100644
--- a/WebCore/kwq/qt/qmap.h
+++ b/WebCore/kwq/qt/qmap.h
@@ -60,8 +60,8 @@ template <class K, class V> class QMapNode : private KWQMapNodeImpl
 
     ~QMapNode()
     {
-	delete left();
-	delete right();
+	delete (QMapNode<K,V> *)left();
+	delete (QMapNode<K,V> *)right();
     }
 
     K key;
diff --git a/WebCore/src/kwq/qt/qmap.h b/WebCore/src/kwq/qt/qmap.h
index c9c0031..5bc3bb0 100644
--- a/WebCore/src/kwq/qt/qmap.h
+++ b/WebCore/src/kwq/qt/qmap.h
@@ -60,8 +60,8 @@ template <class K, class V> class QMapNode : private KWQMapNodeImpl
 
     ~QMapNode()
     {
-	delete left();
-	delete right();
+	delete (QMapNode<K,V> *)left();
+	delete (QMapNode<K,V> *)right();
     }
 
     K key;

-- 
WebKit Debian packaging