changeset 6601:1c4545125165

[project @ 2007-04-30 16:31:47 by jwe]
author jwe
date Mon, 30 Apr 2007 16:31:47 +0000
parents ecd3db9a1815
children 8ebd4f842715
files src/ChangeLog src/mex.cc
diffstat 2 files changed, 6 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Mon Apr 30 14:48:22 2007 +0000
+++ b/src/ChangeLog	Mon Apr 30 16:31:47 2007 +0000
@@ -1,3 +1,8 @@
+2007-04-30  John W. Eaton  <jwe@octave.org>
+
+	* mex.cc (mex::cleanup): Don't call unmark for elements of the set
+	inside the loop.  From Laurent Mazet <laurent.mazet@motorola.com>.
+
 2007-04-30  David Bateman  <dbateman@free.fr>
 
 	* OPERATORS/op-int-conv.cc: Define sq and dq string conversion
--- a/src/mex.cc	Mon Apr 30 14:48:22 2007 +0000
+++ b/src/mex.cc	Mon Apr 30 16:31:47 2007 +0000
@@ -2064,14 +2064,7 @@
     // We can't use mex::free here because it modifies memlist.
     for (std::set<void *>::iterator p = context->memlist.begin ();
 	 p != context->memlist.end (); p++)
-      {
-	if (*p)
-	  {
-	    context->unmark (*p);
-
-	    xfree (*p);
-	  }
-      }
+      xfree (*p);
 
     context->memlist.clear ();