X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=flower%2Finclude%2Ftuple.hh;h=b7f788ee94d18e681d2c0ee23cf923e85d2691c1;hb=058370efc7e9710f149d0f444328bb1fcd7bdec1;hp=5316d2111eeadc55a8e72e4dfccdc747fd17c7c4;hpb=e18531db1f79fb685fbd16d6a2a67bf4b6c09915;p=lilypond.git diff --git a/flower/include/tuple.hh b/flower/include/tuple.hh index 5316d2111e..b7f788ee94 100644 --- a/flower/include/tuple.hh +++ b/flower/include/tuple.hh @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2006--2010 Han-Wen Nienhuys + Copyright (C) 2006--2014 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 @@ -27,7 +27,7 @@ struct Tuple Tuple () { } - + Tuple (T const *src) { for (int i = 0; i < N; i++) @@ -42,28 +42,27 @@ struct Tuple2 : public Tuple { } - + Tuple2 (K a, K b) { - Tuple *p(this); // ugr. - + Tuple *p (this); // ugr. + p->t_array[0] = a; p->t_array[1] = b; } }; - template inline bool -operator<(Tuple const &t1, - Tuple const &t2) +operator <(Tuple const &t1, + Tuple const &t2) { - for (int i = 0; i < N ; i++) + for (int i = 0; i < N; i++) { if (t1.t_array[i] > t2.t_array[i]) - return false; + return false; if (t1.t_array[i] < t2.t_array[i]) - return true; + return true; } return false;