From b8210593ef493fb28a74a7294e3e0f0c341edd44 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Tue, 4 Feb 1997 20:34:59 +0000
Subject: [PATCH] flower-1.0.23

---
 flower/Variables.make | 5 +++--
 flower/dstream.cc     | 2 +-
 flower/dstream.hh     | 1 +
 flower/interval.hh    | 2 +-
 flower/interval.tcc   | 2 +-
 flower/path.hh        | 3 ++-
 flower/real.hh        | 2 +-
 flower/string.cc      | 2 +-
 8 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/flower/Variables.make b/flower/Variables.make
index c417e74140..67d1863f27 100644
--- a/flower/Variables.make
+++ b/flower/Variables.make
@@ -1,10 +1,10 @@
 MAJVER=1
 MINVER=0
-PATCHLEVEL=22
+PATCHLEVEL=23
 PACKAGENAME=flower
 
 #PROFILEFLAG=-pg
-DEBUGFLAG=-g -O2 -DNDEBUG
+DEBUGFLAG= -O2 -DNDEBUG # -g
 OPTIFLAG=-DNDEBUG -DNPRINT -O2
 
 #########################################
@@ -35,3 +35,4 @@ ALLSOURCES=$(hh) $(cc) $(inl) $(templatecc)
 DFILES=$(ALLSOURCES) Makefile Variables.make make_version\
 	Sources.make TODO README NEWS
 DDIR=$(DNAME)
+
diff --git a/flower/dstream.cc b/flower/dstream.cc
index 44e2057059..02b218d3cf 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]] = bool(Scalar(r[1]));
+	 (*silent)[r[0]] = (bool)(int)(Scalar(r[1]));
     }
 
 }
diff --git a/flower/dstream.hh b/flower/dstream.hh
index aae52a7838..e38f30128f 100644
--- a/flower/dstream.hh
+++ b/flower/dstream.hh
@@ -28,6 +28,7 @@ public:
       if rcfile == 0, then do not read any rc file
       */
       
+    virtual ~Dstream();
     Dstream &identify_as(String s);
     
     Dstream &operator << (String s);
diff --git a/flower/interval.hh b/flower/interval.hh
index 294457db0f..acf437ad0a 100644
--- a/flower/interval.hh
+++ b/flower/interval.hh
@@ -19,7 +19,7 @@ struct Interval_t {
 
     /****************/
     
-    T center() { return (left + right) /2;}
+    T center() { return (left + right) / T(2);}
     void translate(T t) {
 	left += t;
 	right += t;
diff --git a/flower/interval.tcc b/flower/interval.tcc
index 0a1a027acd..6e7b0b1279 100644
--- a/flower/interval.tcc
+++ b/flower/interval.tcc
@@ -34,7 +34,7 @@ Interval__compare(const Interval_t<T>&a,Interval_t<T> const&b)
 #ifdef AIX
 const Real INFTY = 1e8;	// ARGh. AIX sucks
 #else
-const Real INFTY = HUGE;
+const Real INFTY = HUGE_VAL;
 #endif
 
 template<class T>
diff --git a/flower/path.hh b/flower/path.hh
index 3ff83d3b72..781e86f970 100644
--- a/flower/path.hh
+++ b/flower/path.hh
@@ -15,7 +15,8 @@ public:
     File_path(String);
 
     /// add to end of path.
-    Array<String>:: push;
+    Array<String>::push;
+    void add(String str) { push(str); }
 };
 /**
 
diff --git a/flower/real.hh b/flower/real.hh
index 16f52b5092..0533af2111 100644
--- a/flower/real.hh
+++ b/flower/real.hh
@@ -4,7 +4,7 @@
 
 #include <builtin.h>
 #include <minmax.h>
-#include <std/cmath.h>
+#include <math.h>
 
 typedef double Real;
 
diff --git a/flower/string.cc b/flower/string.cc
index 0804c5bbdc..eb5822cf32 100644
--- a/flower/string.cc
+++ b/flower/string.cc
@@ -47,7 +47,7 @@ String::String(Rational r)
     *this = n;
     if (r.denominator() != 1) {
 	char * d = Itoa(r.denominator());
-	*this +=  '/' + String(d);
+	*this +=  String( '/' ) + String(d);
 	//delete d;
     }
 /*    delete n;
-- 
2.39.5