flower-1.0.23

diff --git a/flower/Variables.make b/flower/Variables.make
index c417e74140268f210e0c882a8357a55aa36d6660..67d1863f279767b9665c8c999ff254830e5faa46 100644 (file)
--- 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 44e2057059637ece5fde0e6a104d3677702201f5..02b218d3cf44c76606c722cb6afcff9188daba57 100644 (file)
--- 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 aae52a7838c5fda5b03fdb079b844465a162d9c0..e38f30128f80ce52fd4534162425ce2a18719cee 100644 (file)
--- 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 294457db0f87af829f3afca887304602d8b469bf..acf437ad0ac98b7ff4da2b37e87c5b1099641e75 100644 (file)
--- 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 0a1a027acd277a6a376b65a5e849eda437b3f731..6e7b0b1279c228982edacbf11eee9775bc07dce6 100644 (file)
--- 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 3ff83d3b72fe3022f31b96a316974e715363dd9e..781e86f970da53430856ee4416b3aa8da1fd3684 100644 (file)
--- 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 16f52b509269e7dc084c7b53889d6ba5a5990400..0533af2111a5510ce0624bf674f805fa8b5a1563 100644 (file)
--- 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 0804c5bbdc7d30e6ed50235fea460ac46548772a..eb5822cf32685e8bbce079668c472ff68cde7d47 100644 (file)
--- 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;