release: 0.0.46.jcn1

[lilypond.git] / lily / slur.cc

diff --git a/lily/slur.cc b/lily/slur.cc
index 8de13e023aeb59937b11f89a52c82cba23fc47b1..6e8e9e5f69495ce23884e49762c6e2d27e46c80f 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -59,8 +59,8 @@ Slur::set_default_dir()
 void
 Slur::do_pre_processing()
 {
-    right  = encompass.top()->pcol_l_;
-    left = encompass[0]->pcol_l_;    
+    right_col_l_  = encompass.top()->pcol_l_;
+    left_col_l_ = encompass[0]->pcol_l_;    
 }
 
 Spanner*
@@ -74,9 +74,9 @@ Slur::do_break_at(PCol*l, PCol*r) const
        if (encompass[i]->pcol_l_->line_l_==l->line_l_)
            ret->encompass.push(encompass[i]);
     }
-    if (right != r)
+    if (right_col_l_ != r)
        ret->open_right = true;
-    if (left != l)
+    if (left_col_l_ != l)
        ret->open_left = true;