Run grand replace for 2015.

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

diff --git a/flower/include/interval.tcc b/flower/include/interval.tcc
index 7a1440a31986b55a6bff52cd7df734f0665da8b0..72be6e81e92161984a74cfb6128902bb3d2ade31 100644 (file)
--- a/flower/include/interval.tcc
+++ b/flower/include/interval.tcc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1996--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1996--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
@@ -70,14 +70,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 ();
 }
 
@@ -123,6 +123,15 @@ Interval_t<T>::unite_disjoint (Interval_t<T> h, T padding, Direction d)
   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)
@@ -140,7 +149,7 @@ Interval_t<T>::to_string () const
   string s ("[");
 
   return (s + T_to_string (at (LEFT)) + string (",")
-         + T_to_string (at (RIGHT)) + string ("]"));
+          + T_to_string (at (RIGHT)) + string ("]"));
 }
 
 template<class T>
@@ -150,7 +159,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