From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 5 Jan 2007 02:40:28 +0000 (+0100)
Subject: Use paper_column::rank as array index.
X-Git-Tag: release/2.11.9-1~14
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=99cf5bbced0d84b453cbbfdfff81468dd319b9a9;p=lilypond.git

Use paper_column::rank as array index.
---

diff --git a/lily/system.cc b/lily/system.cc
index 6ae37f93fa..233c5a7101 100644
--- a/lily/system.cc
+++ b/lily/system.cc
@@ -446,9 +446,7 @@ System::broken_col_range (Item const *left, Item const *right) const
   
   extract_grob_set (this, "columns", cols);
 
-  vsize i = binary_search (cols, (Grob *) left,
-			   Paper_column::less_than);
-
+  vsize i = Paper_column::get_rank (left);
   int end_rank = Paper_column::get_rank (right);
   if (i < cols.size ())
     i++;
@@ -495,11 +493,7 @@ Grob*
 System::column (int which) const
 {
   extract_grob_set (this, "columns", columns);
-  for (vsize i = 0; i < columns.size (); i++)
-    if (dynamic_cast<Paper_column*> (columns[i])->get_rank () == which)
-      return columns[i];
-  programming_error ("couldn't find the column of the requested index");
-  return columns[0];
+  return columns[which]
 }
 
 Paper_score*