lilypond-0.0.11

diff --git a/hdr/keyitem.hh b/hdr/keyitem.hh
index d5b159368bc36666b311f0a3f6df37f0b529ba50..ba49475ce481628749ebeed4ea7293fa511ab73e 100644 (file)
--- a/hdr/keyitem.hh
+++ b/hdr/keyitem.hh
@@ -8,7 +8,7 @@
 #define KEYITEM_HH
 
 #include "item.hh"
-
+#include "vray.hh"
 struct Keyitem : Item {
     svec<int> pitch;
     svec<int> acc;

diff --git a/hdr/localkeyitem.hh b/hdr/localkeyitem.hh
index 5b045c93ae1958ad03fa06ead3ba50d466994f3b..cc786e8e7f5b1ff6ca7fc3234d0f288e7b1bb3b0 100644 (file)
--- a/hdr/localkeyitem.hh
+++ b/hdr/localkeyitem.hh
@@ -7,6 +7,7 @@
 #ifndef LOCALKEYITEM_HH
 #define LOCALKEYITEM_HH
 #include "item.hh"
+#include "vray.hh"
 
 struct Local_acc {
     int name , acc, octave;

diff --git a/hdr/meter.hh b/hdr/meter.hh
index 6af881726577cb0a8dd248d739e0225d752300c5..5498112d376c31dedfd27225354e7ac0a287ad73 100644 (file)
--- a/hdr/meter.hh
+++ b/hdr/meter.hh
@@ -7,6 +7,7 @@
 #ifndef METER_HH
 #define METER_HH
 #include "item.hh"
+#include "vray.hh"
 
 struct Meter: Item {
     svec<String> args;

diff --git a/hdr/sccol.hh b/hdr/sccol.hh
index 44f3fbb16deb235c267a266a6bc023a6cd726583..f8aceb23040813329b40cf6496fd78e3ea688564 100644 (file)
--- a/hdr/sccol.hh
+++ b/hdr/sccol.hh
@@ -7,12 +7,14 @@
 #ifndef SCCOL_HH
 #define SCCOL_HH
 #include "pcol.hh"
+#include "vray.hh"
 
 
 struct Score_column {
 
     /// indirection to column
     PCol * pcol_;
+
     /// length of notes/rests in this column
     svec<Real> durations;
     
@@ -47,3 +49,6 @@ instantiate_compare(Score_column&, Score_column::compare);
 
 #endif // SCCOL_HH
 
+
+
+

diff --git a/src/symtable.cc b/src/symtable.cc
index a28d14670c279477cf294dfe128a5cfaaba1bc1d..39b6fdead0437943f07df05d00763b4a9b7b41bf 100644 (file)
--- a/src/symtable.cc
+++ b/src/symtable.cc
@@ -1,4 +1,5 @@
 #include "misc.hh"
+#include "textdb.hh"
 #include "dimen.hh"
 #include "debug.hh"
 #include "real.hh"
@@ -13,8 +14,10 @@ Symtable::lookup(String s) const
     if (elt_query(s))
        return (*this)[s];
     else {
-       error( "Unknown symbol " +s+'\n');
+       error( "Unknown symbol `" +s+"'\n");
     }
+    Symbol sy;                 // unreachable
+    return sy;
 }
 
 Symtable* 
@@ -27,7 +30,7 @@ void
 Symtables::read(Text_db &symini)
 {
      while (!symini.eof()) {
-        Text_record  r(  symini++);
+        Text_record  r(symini++);
         if (r[0] == "end" )
             return;
         assert (r[0] == "table");
@@ -55,6 +58,3 @@ Symtables::read(Text_db &symini)
         (*this)[tabnam] = sp;           
      }
 }
-
-
-