release: 1.1.1

[lilypond.git] / flower / include / vector.hh

diff --git a/flower/include/vector.hh b/flower/include/vector.hh
index 1d986c53b751c52c8e6ab2c94d6cb81a40f2c1ff..b4eeb9759709a32f8aaf4c2599ccdbea7bdad6e1 100644 (file)
--- a/flower/include/vector.hh
+++ b/flower/include/vector.hh
@@ -3,7 +3,7 @@
 
 #include <math.h>
 #include "real.hh"
-#include "varray.hh"
+#include "array.hh"
 
 class Dstream;
 class String;
@@ -41,7 +41,8 @@ public:
        dat.insert (v,i);
     }
     void del (int i) { dat.del (i); }
-    operator String() const;
+
+    String str () const;
 
     void operator +=(Vector v) {
        assert (v.dim() == dim ());
@@ -77,6 +78,7 @@ public:
        return sqrt (norm_sq());
     }
     operator Array<Real>() { return dat; }
+  Array<Real> const &to_array()const { return dat; }  
     void print() const;
     /// set to j-th element of unit-base
     void set_unit (int j) ;