From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 10 Sep 2002 21:33:32 +0000 (+0000)
Subject: * lily/include/sequential-iterator.hh (class Sequential_iterator):
X-Git-Tag: release/1.6.3~26
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=202cd70feaa9d7465590e370ff3ab6e1cb1f53fb;p=lilypond.git

* lily/include/sequential-iterator.hh (class Sequential_iterator):
don't use Protected_scm for music-iterator members.

* lily/music-iterator.cc (Music_iterator): initialize music_
---

diff --git a/ChangeLog b/ChangeLog
index 1c263d0685..0c976568ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,11 @@
+2002-09-10  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+	* lily/include/sequential-iterator.hh (class Sequential_iterator):
+	don't use Protected_scm for music-iterator members. 
+
+	* lily/music-iterator.cc (Music_iterator): initialize music_
 	
+
 2002-09-09  Juergen Reuter  <reuter@ipd.uka.de>
 
 	* input/test/accid.ly: updated test file to show all available
diff --git a/lily/include/sequential-iterator.hh b/lily/include/sequential-iterator.hh
index 554e3657c2..efdc5634ea 100644
--- a/lily/include/sequential-iterator.hh
+++ b/lily/include/sequential-iterator.hh
@@ -73,7 +73,7 @@ protected:
 protected:
   Moment here_mom_;
   Music_iterator * iter_;
-  Protected_scm  list_;
+  SCM  list_;
   SCM cursor_;
   
   virtual void next_element (bool side_effect);
diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index d4ea1f1b96..bf8216ff4b 100644
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -21,6 +21,7 @@
 
 Music_iterator::Music_iterator ()
 {
+  music_ = 0;
   smobify_self ();
 }
 
diff --git a/lily/sequential-iterator.cc b/lily/sequential-iterator.cc
index 95bd2729f1..edd5ab5ee8 100644
--- a/lily/sequential-iterator.cc
+++ b/lily/sequential-iterator.cc
@@ -77,6 +77,7 @@ Sequential_iterator::derived_mark ()const
 {
   if (iter_)
     scm_gc_mark (iter_->self_scm());
+  scm_gc_mark (list_);
 }