*** empty log message ***

[lilypond.git] / flower / include / drul-array.hh

diff --git a/flower/include/drul-array.hh b/flower/include/drul-array.hh
index d537bcb5a04b1fa7cbfa630830ee0400901e564f..e6d8ee0eaf3c9c03ac4221c58593048af841710e 100644 (file)
--- a/flower/include/drul-array.hh
+++ b/flower/include/drul-array.hh
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1997--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 */
 
 
@@ -13,8 +13,6 @@
 #include "direction.hh"
 #include "real.hh"
 
-#include <assert.h>
-
 /**
   Left/right or Up/down arrays. Drul is nicer sounding than udlr
  */
@@ -22,47 +20,47 @@ template<class T>
 struct Drul_array
 {
   T array_[2];
-  T &elem (Direction d)
-    {
-      assert (d==1 || d== -1);
-      return array_[ (d+1)/2];
-    }
-  T &operator[] (Direction d)
+  T &elem_ref (Direction d)
   {
-    return elem (d);
+    assert (d==1 || d== -1);
+    return array_[ (d+1)/2];
   }
   T elem (Direction d) const
-    {
+  {
     assert (d==1 || d== -1);
     return array_[ (d+1)/2];
-    }
-  
+  }
+  T &operator[] (Direction d)
+  {
+    return elem_ref (d);
+  }
   T operator[] (Direction d) const
   {
     return elem (d);
   }
   Drul_array ()
-    {
-    }
+  {
+  }
   Drul_array (T t1, T t2)
-    {
-      array_[0] = t1;
-      array_[1] = t2;
-    }
+  {
+    array_[0] = t1;
+    array_[1] = t2;
+  }
 };
 
 template<class T>
 void
 scale_drul (Drul_array<T> * dr, T x)
 {
-  dr->elem (LEFT) *= x;
-  dr->elem (RIGHT) *= x;
+  dr->elem_ref (LEFT) *= x;
+  dr->elem_ref (RIGHT) *= x;
 }
 
 inline Real
 linear_combination (Drul_array<Real> const &d, Real x)
 {
-  return ((1.0 - x) * Real (d.elem (LEFT))  + (x + 1.0) * Real (d.elem (RIGHT))) * 0.5;
+  return ((1.0 - x) * Real (d.elem (LEFT))
+         + (x + 1.0) * Real (d.elem (RIGHT))) * 0.5;
 }
 
-#endif // DRUL_ARRAY_HH
+#endif /* DRUL_ARRAY_HH */