flower-1.0.6

diff --git a/flower/matrix.cc b/flower/matrix.cc
index 1afe5951c8babf8d8c409f1ed5a4f46918615e72..b95a4ab1f9ddc3ebdeef0fb6330bc72f886bff8f 100644 (file)
--- a/flower/matrix.cc
+++ b/flower/matrix.cc
@@ -1,6 +1,4 @@
 #include "matrix.hh"
-#include "string.hh"
-
 
 Real
 Matrix::norm() const

diff --git a/flower/string.hh b/flower/string.hh
index d3d27742610a1a38724e2d8886a2bd1c5ff30a78..77912beda2f1bd3b79797375d66459a799cecf72 100644 (file)
--- a/flower/string.hh
+++ b/flower/string.hh
@@ -50,6 +50,7 @@ public:
     char *copy_array() const; //  return a "new"-ed copy of contents
 
     const char *ptr() const;
+    const char *ptr() { return ((const String *)this)->ptr(); }
     /// return the data. Don't use for writing the data.
     operator const char *() const { return ptr(); }
     

diff --git a/flower/vector.cc b/flower/vector.cc
index 2cbfdfc8991c9fafc89618a831973af538fa4f2d..bb3008ee5e902cd7318c028fc0bd8a2919d43879 100644 (file)
--- a/flower/vector.cc
+++ b/flower/vector.cc
@@ -1,5 +1,4 @@
 #include "vector.hh"
-#include "string.hh"
 
 Vector::Vector(const Vector&n)
           :dat(n.dat)
@@ -9,7 +8,9 @@ Vector::Vector(const Vector&n)
 Vector
 Vector::operator-() const
 {
-    Vector v(*this); v*=-1; return v;
+    Vector v(*this);
+    v*=-1;
+    return v;
 }
 
 void

diff --git a/flower/vray.hh b/flower/vray.hh
index d56cad00d634b3dbbce029ac9956ab97366bcdd1..c03e651034208436be148ddcf12fb6d2f9b24e87 100644 (file)
--- a/flower/vray.hh
+++ b/flower/vray.hh
@@ -141,6 +141,11 @@ public:
        sort(compare, lower, last-1);
        sort(compare, last+1, lower);
     }
+    void concat(svec<T> const &src) {
+       int s = size;
+       set_size(size + src.size);
+       arrcpy(thearray+s,src.thearray, src.size);      
+    }
 };
 /**