X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=flower%2Finclude%2Fdirection.hh;h=dff546749756d42526123a9d85df929e566a6149;hb=cb0b407e567feca71cbc5f9479a06b266c69a26c;hp=97c0f6d79bb59ee9f790c250a71f66c120df3a99;hpb=af60e9b57f205a3c2e044ac8db351b42ef3e26ad;p=lilypond.git

diff --git a/flower/include/direction.hh b/flower/include/direction.hh
index 97c0f6d79b..dff5467497 100644
--- a/flower/include/direction.hh
+++ b/flower/include/direction.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2012 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 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
@@ -20,6 +20,7 @@
 #ifndef DIRECTION_HH
 #define DIRECTION_HH
 
+#include <algorithm>
 #include "axis.hh"
 
 enum Direction
@@ -49,26 +50,9 @@ enum Direction
 };
 
 inline Direction
-other_dir (Direction const d)
+operator - (Direction d)
 {
-  return (Direction) (-d);
-}
-
-inline Direction
-operator - (Direction const d)
-{
-  return other_dir (d);
-}
-
-// to be deleted soon (after coping with issues 2491 and 2493
-inline Direction
-flip (Direction *i)
-{
-  if (*i == (Direction)1)
-    *i = (Direction) - 1;
-  else if (*i == (Direction) - 1)
-    *i = (Direction)1;
-  return *i;
+  return Direction (- static_cast<int> (d)); // cast avoids recursion
 }
 
 #define UP_and_DOWN(d) \
@@ -80,7 +64,6 @@ flip (Direction *i)
 #define LEFT_and_RIGHT(d) \
   Direction d = LEFT; d != CENTER; d = (d == LEFT ? RIGHT : CENTER)
 
-
 /**
    if d > 0: the max operator
    if d < 0: the min operator
@@ -88,11 +71,9 @@ flip (Direction *i)
 template<class T> T minmax (Direction d, T a, T b)
 {
   if (d == UP)
-    return max (a, b);
+    return std::max (a, b);
   else
-    return min (a, b);
+    return std::min (a, b);
 }
 
-// String direction_string (Direction, Axis);
-
 #endif // DIRECTION_HH