lilypond-0.0.18

diff --git a/src/break.cc b/src/break.cc
index 6cb1d3303b4a4d823aa4bb1c5278f8496b212080..ff86e848af358ce838b06121a02178b3a1bb664f 100644 (file)
--- a/src/break.cc
+++ b/src/break.cc
@@ -10,7 +10,7 @@
 
 // construct an appropriate Spacing_problem and solve it. 
 svec<Real>
-PScore::solve_line(svec<const PCol *> curline) const
+PScore::solve_line(svec< PCol *> curline) const
 {
    Spacing_problem sp;
 
@@ -28,7 +28,7 @@ PScore::solve_line(svec<const PCol *> curline) const
 }
 
 bool
-PScore::feasible(svec<const PCol *> curline) const
+PScore::feasible(svec< PCol *> curline) const
 {
     Real l =0;
     for (int i=0; i < curline.sz(); i++)
@@ -49,14 +49,14 @@ PScore::problem_OK() const
 }
 
 struct Col_configuration {
-    svec<const PCol*> line;
+    svec< PCol*> line;
     svec<Real> config;
     Real energy;
 
     Col_configuration() {
        energy = INFTY;
     }
-    void add(const PCol*c) { line.add(c);}
+    void add( PCol*c) { line.add(c);}
     void setsol(svec<Real> sol) {
        config = sol;
        energy = config.last();
@@ -85,7 +85,7 @@ PScore::calc_breaking()
     problem_OK();
     PCursor<PCol *> curcol(cols);
            
-    svec<const PCol *> breakpoints(find_breaks());
+    svec<PCol *> breakpoints(find_breaks());
     assert(breakpoints.sz()>=2);
     for (int i=0 ; i < breakpoints.sz() -1; ) {
        Col_configuration minimum;

diff --git a/src/pscore.cc b/src/pscore.cc
index fcd03ca55a18a0163f19e58f00b3e2f190bd6623..a34d86b0ba6ebe6118f00a8dd2f67fee3c398838 100644 (file)
--- a/src/pscore.cc
+++ b/src/pscore.cc
@@ -77,7 +77,7 @@ PScore::typeset_spanner(Spanner*sp, PStaff*ps)
 
 
 void
-PScore::add_line(svec<const PCol *> curline, svec<Real> config)
+PScore::add_line(svec< PCol *> curline, svec<Real> config)
 {    
     Line_of_score *p = new Line_of_score(curline,this);
     lines.bottom().add(p);     
@@ -105,7 +105,7 @@ PScore::get_spacing(PCol*l, PCol*r)
 
 
 int
-PScore::compare_pcols(const PCol*a, const PCol*b)const
+PScore::compare_pcols(PCol*a,  PCol*b)const
 {
     PCursor<PCol*> ac(find_col(a));
     PCursor<PCol*> bc(find_col(b));
@@ -116,10 +116,10 @@ PScore::compare_pcols(const PCol*a, const PCol*b)const
 /*
   return all breakable columns
  */
-svec<const PCol *>
+svec< PCol *>
 PScore::find_breaks() const
 {
-    svec<const PCol *> retval;
+    svec< PCol *> retval;
     for (PCursor<PCol *> c(cols); c.ok(); c++)
        if (c->breakable())
            retval.add(c);
@@ -217,7 +217,7 @@ PScore::postprocess()
 }
 
 PCursor<PCol *>
-PScore::find_col(const PCol *c)const
+PScore::find_col(PCol *c)const
 {
     PCol*what = (PCol*)c;
     if (what->daddy )