lilypond-1.0.2

diff --git a/flower/include/scalar.hh b/flower/include/scalar.hh
index a963a2fb2a4a620af96ac17bf576841b79efadec..8f442d9041caeaf0b4ae05766d9474a14f157612 100644 (file)
--- a/flower/include/scalar.hh
+++ b/flower/include/scalar.hh
@@ -12,7 +12,6 @@
 
 #include "string.hh"
 #include "real.hh"
-#include "matrix.hh"
 
 /// Perl -like scalar type.
 struct Scalar : public String 
@@ -34,8 +33,8 @@ struct Scalar : public String
     urg, these are bit silly; perhaps should make "Print_string" class
     (derive from Scalar?)
    */
-  Scalar (Vector v) { *this = v.str (); }
-  Scalar (Matrix m) { *this = m.str (); }
+  Scalar (Vector const &v);
+  Scalar (Matrix const &m);
 
   /**   perl -like string to bool conversion.
    */

diff --git a/flower/scalar.cc b/flower/scalar.cc
index c1f69eda6002d6ad4caf797d0ff752358997932e..7008880cccb9b84b3d48342c9b0ac2f2d253bd8b 100644 (file)
--- a/flower/scalar.cc
+++ b/flower/scalar.cc
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include "scalar.hh"
 #include "rational.hh"
+#include "matrix.hh"
 
 Scalar::Scalar (Rational r)
 {
@@ -72,3 +73,13 @@ Scalar::to_bool () const
     return false;
   return true;
 }
+
+Scalar::Scalar(Matrix const &m)
+{
+  *this = m.str ();
+}
+
+Scalar::Scalar (Vector const &v)
+{
+  *this = v.str ();
+}