Merge commit 'origin/dev/jneeman' into systems-per-page

[lilypond.git] / flower / include / interval.hh

diff --git a/flower/include/interval.hh b/flower/include/interval.hh
index c485f32016a7e72304eb13016827ae5cb396c997..a38c14b0fcf3fde52850e3a006f5485130444ffc 100644 (file)
--- a/flower/include/interval.hh
+++ b/flower/include/interval.hh
@@ -1,7 +1,7 @@
 /*
   interval.hh -- part of flowerlib
 
-  (c) 1996--2006 Han-Wen Nienhuys
+  (c) 1996--2009 Han-Wen Nienhuys
 */
 
 #ifndef INTERVAL_HH
@@ -59,9 +59,6 @@ struct Interval_t : public Drul_array<T>
   void set_empty ();
   void set_full ();
 
-  /*
-    TODO: strip hungarian suffix.
-  */
   bool is_empty () const
   {
     return at (LEFT) > at (RIGHT);
@@ -103,11 +100,7 @@ struct Interval_t : public Drul_array<T>
     return *this;
   }
 
-  Real linear_combination (Real x) const
-  {
-    Drul_array<Real> da (at (LEFT), at (RIGHT));
-    return ::linear_combination (da, x);
-  }
+  Real linear_combination (Real x) const;
   string to_string () const;
 
   bool contains (T r) const;