From: fred <fred>
Date: Tue, 14 Jan 1997 23:20:17 +0000 (+0000)
Subject: flower-1.0.20
X-Git-Tag: release/1.5.59~6407
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a90edfa94cbc5e51b4a96d944f90468dde5603e0;p=lilypond.git

flower-1.0.20
---

diff --git a/flower/dstream.cc b/flower/dstream.cc
index fc50506195..44e2057059 100644
--- a/flower/dstream.cc
+++ b/flower/dstream.cc
@@ -118,7 +118,7 @@ Dstream::Dstream(ostream *r, const char * cfg_nm )
 	     r.message("not enough fields in Dstream init.");
 	     continue;
 	 }
-	 (*silent)[r[0]] = Scalar(r[1]).to_bool();
+	 (*silent)[r[0]] = bool(Scalar(r[1]));
     }
 
 }
diff --git a/flower/interval.tcc b/flower/interval.tcc
index 46b4fc7e16..0a1a027acd 100644
--- a/flower/interval.tcc
+++ b/flower/interval.tcc
@@ -4,10 +4,9 @@
 #include "string.hh"
 
 
-
 template<class T>
 int
-Interval__compare(const Interval_t<T>&a,Interval_t<T> const&b)
+_Interval__compare(const Interval_t<T>&a,Interval_t<T> const&b)
 {
     if (a.left == b.left && a.right == b.right)
 	return 0;
@@ -18,16 +17,30 @@ Interval__compare(const Interval_t<T>&a,Interval_t<T> const&b)
     if (a.left >= b.left && a.right <= b.right)
 	return -1;
 
-    assert(false);		// not comparable
+    return -2;
+}
+
 
-    return 0;
+template<class T>
+int
+Interval__compare(const Interval_t<T>&a,Interval_t<T> const&b)
+{
+    int i = _Interval__compare(a,b);
+    if (i < -1)
+	assert(false);
+    return i;
 }
 
+#ifdef AIX
+const Real INFTY = 1e8;	// ARGh. AIX sucks
+#else
 const Real INFTY = HUGE;
+#endif
 
 template<class T>
 void
-Interval_t<T>::set_empty() {
+Interval_t<T>::set_empty()
+{
     left = INFTY;
     right = -INFTY;
 }