[Aptitude-svn-commit] r4207 - in branches/aptitude-0.3/aptitude: . src/vscreen

Daniel Burrows dburrows at costa.debian.org
Fri Sep 23 23:39:18 UTC 2005


Author: dburrows
Date: Fri Sep 23 23:39:15 2005
New Revision: 4207

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/vscreen/vs_menubar.cc
   branches/aptitude-0.3/aptitude/src/vscreen/vs_multiplex.cc
Log:
Fix a compilation problem

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Fri Sep 23 23:39:15 2005
@@ -1,5 +1,9 @@
 2005-09-23  Daniel Burrows  <dburrows at debian.org>
 
+	* src/vscreen/vs_multiplex.cc:
+
+	  Make it compile.
+
 	* src/vscreen/vscreen_widget.cc, src/vscreen/vscreen_widget.h:
 
 	  Make get_owner() return a ref_ptr, not a bare pointer.

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_menubar.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_menubar.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_menubar.cc	Fri Sep 23 23:39:15 2005
@@ -250,7 +250,7 @@
     set_subwidget(NULL);
   else
     {
-      assert(w->get_owner() == this);
+      assert(w->get_owner().unsafe_get_ref() == this);
 
       bool found = false;
 

Modified: branches/aptitude-0.3/aptitude/src/vscreen/vs_multiplex.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/vscreen/vs_multiplex.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/vscreen/vs_multiplex.cc	Fri Sep 23 23:39:15 2005
@@ -383,7 +383,7 @@
     {
       if(i->w==w)
 	{
-	  assert(w->get_owner()==this);
+	  assert(w->get_owner().unsafe_get_ref() == this);
 
 	  w->set_owner(NULL);
 



More information about the Aptitude-svn-commit mailing list