Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(408)

Unified Diff: lily/part-combine-iterator.cc

Issue 6057044: Part_combine_iterator::derived_mark: don't abort marking prematurely. (Closed) Base URL: http://git.savannah.gnu.org/gitweb/?p=lilypond.git/trunk/
Patch Set: Sc...ip the complexity. Created 11 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lily/part-combine-iterator.cc
diff --git a/lily/part-combine-iterator.cc b/lily/part-combine-iterator.cc
index eb1cca43e57092ed886f3166c6ae739d97c03970..db6b77cbc614f1b7146aa5b925e1eea9d2cde0a8 100644
--- a/lily/part-combine-iterator.cc
+++ b/lily/part-combine-iterator.cc
@@ -158,19 +158,14 @@ Part_combine_iterator::derived_mark () const
scm_gc_mark (first_iter_->self_scm ());
if (second_iter_)
scm_gc_mark (second_iter_->self_scm ());
-
- Stream_event *ptrs[]
- =
- {
- unisono_event_,
- mmrest_event_,
- solo_two_event_,
- solo_one_event_,
- 0
- };
- for (int i = 0; ptrs[i]; i++)
- if (ptrs[i])
- scm_gc_mark (ptrs[i]->self_scm ());
+ if (unisono_event_)
+ scm_gc_mark (unisono_event_->self_scm ());
+ if (mmrest_event_)
+ scm_gc_mark (mmrest_event_->self_scm ());
+ if (solo_one_event_)
+ scm_gc_mark (solo_one_event_->self_scm ());
+ if (solo_two_event_)
+ scm_gc_mark (solo_two_event_->self_scm ());
}
void
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b