lilypond-0.0.10

diff --git a/hdr/sccol.hh b/hdr/sccol.hh
index f18b659e7e65943fc2c36af5c2341b7f20499d53..44f3fbb16deb235c267a266a6bc023a6cd726583 100644 (file)
--- a/hdr/sccol.hh
+++ b/hdr/sccol.hh
@@ -12,7 +12,7 @@
 struct Score_column {
 
     /// indirection to column
-    PCol * pcol;
+    PCol * pcol_;
     /// length of notes/rests in this column
     svec<Real> durations;
     
@@ -28,7 +28,7 @@ struct Score_column {
        return sgn(c1.when - c2.when);
     }
     void set_breakable() {
-        pcol->set_breakable();
+        pcol_->set_breakable();
     }
     bool used();
     void print() const;

diff --git a/src/sccol.cc b/src/sccol.cc
index 1dfc8f21764c9c898fef527a15071410e42caa3e..417b967e1c94588ed0164aae43b1689fcef3d4df 100644 (file)
--- a/src/sccol.cc
+++ b/src/sccol.cc
@@ -4,13 +4,13 @@
 Score_column::Score_column(Real w)
 {
     when = w;
-    pcol = new PCol(0);
+    pcol_ = new PCol(0);
     musical = false;
 }
 
 bool
 Score_column::used() {
-    return pcol->used;
+    return pcol_->used;
 }
 
 void
@@ -22,7 +22,7 @@ Score_column::print() const
     for (int i=0; i < durations.sz(); i++)
        mtor << durations[i] << " ";
     mtor << "]\n";
-    pcol->print();
+    pcol_->print();
     mtor << "}\n";
 #endif
 }