Issue 4550 (2/2) Avoid "using namespace std;" in included files

[lilypond.git] / flower / include / interval.tcc

diff --git a/flower/include/interval.tcc b/flower/include/interval.tcc
index faf9f3db028fc4643b1c38903cbb8a417a597f35..f0973b8b099737c2da329d5c3f32017b55f921ee 100644 (file)
--- a/flower/include/interval.tcc
+++ b/flower/include/interval.tcc
@@ -1,9 +1,20 @@
 /*
-  interval.tcc -- implement Interval_t
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the Flower Library
+  Copyright (C) 1996--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1996--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 INTERVAL_TCC
@@ -16,7 +27,6 @@
 
 // MacOS 10.3 problems:
 // #include <cmath>
-using namespace std;
 
 template<class T>
 int
@@ -59,14 +69,14 @@ void
 Interval_t<T>::set_empty ()
 {
   at (LEFT) = (T) infinity ();
-  at (RIGHT) = (T) -infinity ();
+  at (RIGHT) = (T) - infinity ();
 }
 
 template<class T>
 void
 Interval_t<T>::set_full ()
 {
-  at (LEFT) = (T) -infinity ();
+  at (LEFT) = (T) - infinity ();
   at (RIGHT) = (T) infinity ();
 }
 
@@ -92,28 +102,53 @@ template<class T>
 void
 Interval_t<T>::unite (Interval_t<T> h)
 {
-  at (LEFT) = min (h.at (LEFT), at (LEFT));
-  at (RIGHT) = max (h.at (RIGHT), at (RIGHT));
+  at (LEFT) = std::min (h.at (LEFT), at (LEFT));
+  at (RIGHT) = std::max (h.at (RIGHT), at (RIGHT));
+}
+
+/* Unites h and this interval, but in such a way
+   that h will lie in a particular direction from this
+   interval, with a minimum amount of space in between.
+   (That is, h will be translated before we unite, if
+   that is necessary to prevent overlap. */
+template<class T>
+void
+Interval_t<T>::unite_disjoint (Interval_t<T> h, T padding, Direction d)
+{
+  T dir = d;
+  T translation = dir * (at (d) + dir * padding - h.at (-d));
+  if (translation > (T) 0)
+    h.translate (translation);
+  unite (h);
+}
+
+template<class T>
+Interval_t<T>
+Interval_t<T>::union_disjoint (Interval_t<T> h, T padding, Direction d) const
+{
+  Interval_t<T> iv = *this;
+  iv.unite_disjoint (h, padding, d);
+  return iv;
 }
 
 template<class T>
 void
 Interval_t<T>::intersect (Interval_t<T> h)
 {
-  at (LEFT) = max (h.at (LEFT), at (LEFT));
-  at (RIGHT) = min (h.at (RIGHT), at (RIGHT));
+  at (LEFT) = std::max (h.at (LEFT), at (LEFT));
+  at (RIGHT) = std::min (h.at (RIGHT), at (RIGHT));
 }
 
 template<class T>
-string
+std::string
 Interval_t<T>::to_string () const
 {
   if (is_empty ())
     return "[empty]";
-  string s ("[");
+  std::string s ("[");
 
-  return (s + T_to_string (at (LEFT)) + string (",")
-         + T_to_string (at (RIGHT)) + string ("]"));
+  return (s + T_to_string (at (LEFT)) + std::string (",")
+          + T_to_string (at (RIGHT)) + std::string ("]"));
 }
 
 template<class T>
@@ -123,7 +158,7 @@ Interval_t<T>::contains (T r) const
   return r >= at (LEFT) && r <= at (RIGHT);
 }
 
-#define INTERVAL__INSTANTIATE(T) struct Interval_t<T>;                 \
+#define INTERVAL__INSTANTIATE(T) struct Interval_t<T>;                  \
   template int Interval__compare (const Interval_t<T> &, Interval_t<T> const &)
 
 #endif // INTERVAL_TCC