From de29263a2edc6ef7e7d5cff5d35e5b10645cd269 Mon Sep 17 00:00:00 2001
From: "dbaron%dbaron.org"
 <dbaron%dbaron.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 15 Jul 2004 19:58:57 +0000
Subject: [PATCH] Fix DEBUG-only leak with an nsCOMPtr.  Add const.  b=243724 
 r+sr=bzbarsky

git-svn-id: svn://10.0.0.236/trunk@159277 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/widget/src/xpwidgets/nsBaseWidget.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp b/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp
index a382d32589b..d1b2ae77e2c 100644
--- a/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp
+++ b/mozilla/widget/src/xpwidgets/nsBaseWidget.cpp
@@ -307,7 +307,8 @@ void nsBaseWidget::AddChild(nsIWidget* aChild)
 //-------------------------------------------------------------------------
 void nsBaseWidget::RemoveChild(nsIWidget* aChild)
 {
-  NS_ASSERTION(aChild->GetParent() == NS_STATIC_CAST(nsIWidget*, this),
+  NS_ASSERTION(nsCOMPtr<nsIWidget>(dont_AddRef(aChild->GetParent())) ==
+                 NS_STATIC_CAST(nsIWidget*, this),
                "Not one of our kids!");
   
   if (mLastChild == aChild) {
@@ -1029,7 +1030,7 @@ case _value: eventName.AssignWithConversion(_name) ; break
 //////////////////////////////////////////////////////////////
 struct PrefPair
 {
-  char * name;
+  const char * name;
   PRBool value;
 };