Imported Upstream version 2.14.2

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

diff --git a/flower/include/direction.hh b/flower/include/direction.hh
index fab90f19d58affa6a8f786310de0ca2952326d94..befd0aa2ac207e4f2a18208a45bbf0ddb611047b 100644 (file)
--- a/flower/include/direction.hh
+++ b/flower/include/direction.hh
@@ -1,9 +1,20 @@
 /*
-  direction.hh -- declare Direction
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef DIRECTION_HH
@@ -64,7 +75,13 @@ flip (Direction *i)
    if d > 0: the max operator
    if d < 0: the min operator
 */
-template<class T> T minmax (Direction d, T, T);
+template<class T> T minmax (Direction d, T a, T b)
+{
+  if (d == UP)
+    return max (a, b);
+  else
+    return min (a, b);
+}
 
 // String direction_string (Direction, Axis);