Run `make grand-replace'.

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

diff --git a/flower/include/interval.tcc b/flower/include/interval.tcc
index 3cee682cbc4c06c8f9ee3a9b33cc91ca468ee4a2..5ff1e416657d57bc781ca944a75471074000776d 100644 (file)
--- a/flower/include/interval.tcc
+++ b/flower/include/interval.tcc
@@ -3,29 +3,32 @@
 
   source file of the Flower Library
 
-  (c) 1996--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #ifndef INTERVAL_TCC
 #define INTERVAL_TCC
 
 #include <cassert>
-#include <cmath>
 
 #include "interval.hh"
-#include "string.hh"
+#include "std-string.hh"
+
+// MacOS 10.3 problems:
+// #include <cmath>
+using namespace std;
 
 template<class T>
 int
 _Interval__compare (const Interval_t<T> &a, Interval_t<T> const &b)
 {
-  if (a.elem (LEFT) == b.elem (LEFT) && a.elem (RIGHT) == b.elem (RIGHT))
+  if (a.at (LEFT) == b.at (LEFT) && a.at (RIGHT) == b.at (RIGHT))
     return 0;
 
-  if (a.elem (LEFT) <= b.elem (LEFT) && a.elem (RIGHT) >= b.elem (RIGHT))
+  if (a.at (LEFT) <= b.at (LEFT) && a.at (RIGHT) >= b.at (RIGHT))
     return 1;
 
-  if (a.elem (LEFT) >= b.elem (LEFT) && a.elem (RIGHT) <= b.elem (RIGHT))
+  if (a.at (LEFT) >= b.at (LEFT) && a.at (RIGHT) <= b.at (RIGHT))
     return -1;
 
   return -2;
@@ -55,33 +58,33 @@ template<class T>
 void
 Interval_t<T>::set_empty ()
 {
-  elem_ref (LEFT) = (T) infinity ();
-  elem_ref (RIGHT) = (T) -infinity ();
+  at (LEFT) = (T) infinity ();
+  at (RIGHT) = (T) -infinity ();
 }
 
 template<class T>
 void
 Interval_t<T>::set_full ()
 {
-  elem_ref (LEFT) = (T) -infinity ();
-  elem_ref (RIGHT) = (T) infinity ();
+  at (LEFT) = (T) -infinity ();
+  at (RIGHT) = (T) infinity ();
 }
 
 template<class T>
 T
 Interval_t<T>::length () const
 {
-  if (elem (RIGHT) <= elem (LEFT))
+  if (at (RIGHT) <= at (LEFT))
     return 0;
   else
-    return elem (RIGHT) - elem (LEFT);
+    return at (RIGHT) - at (LEFT);
 }
 
 template<class T>
 T
 Interval_t<T>::delta () const
 {
-  return elem (RIGHT) - elem (LEFT);
+  return at (RIGHT) - at (LEFT);
 }
 
 /* smallest Interval which includes *this and #h#  */
@@ -89,35 +92,35 @@ template<class T>
 void
 Interval_t<T>::unite (Interval_t<T> h)
 {
-  elem_ref (LEFT) = min (h.elem (LEFT), elem (LEFT));
-  elem_ref (RIGHT) = max (h.elem (RIGHT), elem (RIGHT));
+  at (LEFT) = min (h.at (LEFT), at (LEFT));
+  at (RIGHT) = max (h.at (RIGHT), at (RIGHT));
 }
 
 template<class T>
 void
 Interval_t<T>::intersect (Interval_t<T> h)
 {
-  elem_ref (LEFT) = max (h.elem (LEFT), elem (LEFT));
-  elem_ref (RIGHT) = min (h.elem (RIGHT), elem (RIGHT));
+  at (LEFT) = max (h.at (LEFT), at (LEFT));
+  at (RIGHT) = min (h.at (RIGHT), at (RIGHT));
 }
 
 template<class T>
-String
+string
 Interval_t<T>::to_string () const
 {
   if (is_empty ())
     return "[empty]";
-  String s ("[");
+  string s ("[");
 
-  return (s + T_to_string (elem (LEFT)) + String (",")
-         + T_to_string (elem (RIGHT)) + String ("]"));
+  return (s + T_to_string (at (LEFT)) + string (",")
+         + T_to_string (at (RIGHT)) + string ("]"));
 }
 
 template<class T>
 bool
 Interval_t<T>::contains (T r) const
 {
-  return r >= elem (LEFT) && r <= elem (RIGHT);
+  return r >= at (LEFT) && r <= at (RIGHT);
 }
 
 #define INTERVAL__INSTANTIATE(T) struct Interval_t<T>;                 \