X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Finterval.hh;h=8160b37c2ca4b943cca8cbd4805642e3e0ca462a;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=512200f6cf035b70f6f97a83318c469b2a0c04ac;hpb=bd815715c3aa550810f75529a8c0bfb092856668;p=lilypond.git diff --git a/flower/include/interval.hh b/flower/include/interval.hh index 512200f6cf..8160b37c2c 100644 --- a/flower/include/interval.hh +++ b/flower/include/interval.hh @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1996--2010 Han-Wen Nienhuys + Copyright (C) 1996--2015 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -31,7 +31,7 @@ template struct Interval_t : public Drul_array { - Drul_array::at; + using Drul_array::at; static T infinity (); static string T_to_string (T arg); @@ -68,6 +68,8 @@ struct Interval_t : public Drul_array at (RIGHT) = max (at (RIGHT), p); } T length () const; + + // Returns RIGHT - LEFT, even if the interval is empty. T delta () const; void set_empty (); void set_full (); @@ -108,10 +110,10 @@ struct Interval_t : public Drul_array { if (!is_empty ()) { - at (LEFT) *= r; - at (RIGHT) *= r; - if (r < T (0)) - swap (); + at (LEFT) *= r; + at (RIGHT) *= r; + if (r < T (0)) + swap (); } return *this; } @@ -226,7 +228,7 @@ Interval_t::center () const } typedef Interval_t Interval; -typedef Interval_t Slice; // weird name +typedef Interval_t Slice; // weird name #endif // INTERVAL_HH