From d094fbaa7498213fa6c62d0fdb98f16199b12176 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Thu, 28 Nov 1996 11:34:13 +0000
Subject: [PATCH] lilypond-0.0.11

---
 hdr/keyitem.hh      |  2 +-
 hdr/localkeyitem.hh |  1 +
 hdr/meter.hh        |  1 +
 hdr/sccol.hh        |  5 +++++
 src/symtable.cc     | 10 +++++-----
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/hdr/keyitem.hh b/hdr/keyitem.hh
index d5b159368b..ba49475ce4 100644
--- 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 5b045c93ae..cc786e8e7f 100644
--- 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 6af8817265..5498112d37 100644
--- 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 44f3fbb16d..f8aceb2304 100644
--- 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 a28d14670c..39b6fdead0 100644
--- 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;	 	 
      }
 }
-
-
-
-- 
2.39.5