Imported Upstream version 2.16.0

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

diff --git a/flower/include/tuple.hh b/flower/include/tuple.hh
index 1f8b0b28fb61fc2886f119d06fae6d0f753bfb61..c88f1935adf71375fcd58a1c7ac3692c7151eb78 100644 (file)
--- 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--2011 Han-Wen Nienhuys <hanwen@lilypond.org>
+  Copyright (C) 2006--2012 Han-Wen Nienhuys <hanwen@lilypond.org>
 
   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<K, 2>
   {
 
   }
-  
+
   Tuple2 (K a, K b)
   {
-    Tuple<K,2> *p(this);       //  ugr.
-    
+    Tuple<K, 2> *p (this);       //  ugr.
+
     p->t_array[0] = a;
     p->t_array[1] = b;
   }
 };
 
-  
 template<class T, int N>
 inline bool
-operator<(Tuple<T, N> const &t1,
-         Tuple<T, N> const &t2)
+operator <(Tuple<T, N> const &t1,
+           Tuple<T, N> 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;