lilypond-1.2.10

diff --git a/flower/scalar.cc b/flower/scalar.cc
index 951f50359dce9d8061e155d8078daf462f87a1ad..476b6485bdd3727609f224bbeb1b64e3dc1a43bd 100644 (file)
--- a/flower/scalar.cc
+++ b/flower/scalar.cc
@@ -10,7 +10,6 @@
 #include <stdio.h>
 #include "scalar.hh"
 #include "rational.hh"
-#include "matrix.hh"
 
 Scalar::Scalar (Rational r)
 {
@@ -105,12 +104,4 @@ Scalar::to_bool () const
   return true;
 }
 
-Scalar::Scalar(Matrix const &m)
-{
-  *this = m.str ();
-}
 
-Scalar::Scalar (Vector const &v)
-{
-  *this = v.str ();
-}

diff --git a/lily/include/line-spacer.hh b/lily/include/line-spacer.hh
index ee51de47706799efc559a72acdc6eb1ce73c20bc..49bdd56e4fb221a2d6709bec07f649c3ac57ad4a 100644 (file)
--- a/lily/include/line-spacer.hh
+++ b/lily/include/line-spacer.hh
@@ -11,7 +11,6 @@
 #define LINE_SPACER_HH
 #include "lily-proto.hh"
 #include "array.hh"
-#include "vector.hh"
 #include "interval.hh"
 
 /**