release: 0.0.21

[lilypond.git] / src / pcol.cc

diff --git a/src/pcol.cc b/src/pcol.cc
index 2fab154829017478e75252ca6ec77aa70b43d979..52df4297d4ab8be9155d8e98220a6f8f2e685368 100644 (file)
--- a/src/pcol.cc
+++ b/src/pcol.cc
@@ -8,18 +8,19 @@ PCol::width() const
 {
     Interval w;
 
-    for (PCursor<const Item *> ic(its); ic.ok(); ic++)
-       w.unite(ic->width());
+    for (iter_top(its,i); i.ok(); i++)
+       w.unite(i->width());
     if (w.empty())
        w.unite(Interval(0,0));
     return w;
 }
+
 int
 PCol::rank() const
 {
     if(!pscore_)
        return -1;
-    PCursor<PCol*> me=pscore_->find_col(this);
+    PCursor<PCol*> me=pscore_->find_col( (PCol*)this);
     if (!me.ok())
        return -1;
     PCursor<PCol*> bot(pscore_->cols.top());
@@ -43,7 +44,7 @@ PCol::print() const
     } else if (daddy) {
        mtor<<'\n' << ((this == daddy->prebreak) ? "prebreak" : "postbreak");
     }
-    mtor << "extent: " << width().min << ", " << width().max << "\n";
+    mtor << "extent: " << width().str() << "\n";
     mtor << "}\n";
 #endif 
 }
@@ -51,7 +52,7 @@ PCol::print() const
 int
 PCol::compare(const PCol &c1, const PCol &c2)
 {
-    return c1.pscore_->compare_pcols(&c1,&c2);
+    return c1.pscore_->compare_pcols((PCol*)&c1,(PCol*)&c2);
 }
 
 void