release: 1.5.38

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

diff --git a/flower/include/interval.hh b/flower/include/interval.hh
index 5a1d3c49af90579f95c01de586f5b757a96d9a19..8d4d83a5dc7381960a169cb83c971897f658f2ec 100644 (file)
--- a/flower/include/interval.hh
+++ b/flower/include/interval.hh
@@ -49,7 +49,8 @@ struct Interval_t : public Drul_array<T> {
     set_empty ();
   }
   Interval_t (T m, T M) : Drul_array<T> (m,M)
-    {}
+    {
+    }
   Interval_t<T> &operator -= (T r) {
     *this += -r;
     return *this;
@@ -65,11 +66,9 @@ struct Interval_t : public Drul_array<T> {
       {
        elem (LEFT) *= r;
        elem (RIGHT) *= r;
-       if (r < T (0)) {
-         T t = elem (LEFT);
-         elem (LEFT) = elem (RIGHT);
-         elem (RIGHT) = t;
-       }
+       if (r < T (0))
+         swap();
+
       }
     return *this;
   }
@@ -86,6 +85,14 @@ struct Interval_t : public Drul_array<T> {
     elem (LEFT) = l;
     elem (RIGHT) =r;
   }
+private:
+
+  void swap ()
+  {
+    T t = elem (LEFT);
+    elem (LEFT) = elem (RIGHT);
+    elem (RIGHT) = t;
+  }
 };