Merge branch 'master' of git://git.sv.gnu.org/lilypond

[lilypond.git] / lily / pitch-interval.cc

diff --git a/lily/pitch-interval.cc b/lily/pitch-interval.cc
index 73c619e1bfd31125c7efddffecf27d79c6728b89..ee2d4e32810fc51ee8b1d96ca0c216cf3d6b1f62 100644 (file)
--- a/lily/pitch-interval.cc
+++ b/lily/pitch-interval.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "pitch-interval.hh"
@@ -12,27 +12,27 @@
 
 Pitch_interval::Pitch_interval (Pitch p1, Pitch p2)
 {
-  elem_ref (LEFT) = p1;
-  elem_ref (RIGHT) = p2;
+  at (LEFT) = p1;
+  at (RIGHT) = p2;
 }
 
 Pitch_interval::Pitch_interval ()
 {
-  elem_ref (LEFT) = Pitch (100, 0, 0);
-  elem_ref (RIGHT) = Pitch (-100, 0, 0);
+  at (LEFT) = Pitch (100, 0, 0);
+  at (RIGHT) = Pitch (-100, 0, 0);
 }
 
 bool
 Pitch_interval::is_empty () const
 {
-  return elem (LEFT) > elem (RIGHT);
+  return at (LEFT) > at (RIGHT);
 }
 
 void
 Pitch_interval::add_point (Pitch p)
 {
-  if (elem_ref (LEFT) > p)
-    elem_ref (LEFT) = p;
-  if (elem_ref (RIGHT) < p)
-    elem_ref (RIGHT) = p;
+  if (at (LEFT) > p)
+    at (LEFT) = p;
+  if (at (RIGHT) < p)
+    at (RIGHT) = p;
 }