From: fred <fred>
Date: Tue, 26 Mar 2002 21:28:16 +0000 (+0000)
Subject: lilypond-1.1.0
X-Git-Tag: release/1.5.59~2820
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=1908869093815ba659b0a45aa3020ff2b154d004;p=lilypond.git

lilypond-1.1.0
---

diff --git a/flower/dstream.cc b/flower/dstream.cc
index 784bf36fbe..10542ee06a 100644
--- a/flower/dstream.cc
+++ b/flower/dstream.cc
@@ -16,7 +16,7 @@
 #include "rational.hh"
 
 /// indent of each level
-const INDTAB = 2;
+const int INDTAB = 2;
 
 /*
   should use Regexp library.
diff --git a/flower/include/dictionary.hh b/flower/include/dictionary.hh
index 55f0e4fedd..d3c9a7afb3 100644
--- a/flower/include/dictionary.hh
+++ b/flower/include/dictionary.hh
@@ -100,7 +100,6 @@ public:
 	  nexti = (nexti + j*j)%sz;
 	}
       
-    finish:
       return retval;
     }
 };
@@ -181,7 +180,10 @@ public:
 
   V operator [] (String k) const
     {
-      return elem (k);
+      V retval;
+      if (!elem_b (k))
+	return retval ;
+      retval ((Dictionary<V> *) this)->elem (k);
     }
 
   V remove (String s)