lilypond-1.1.0

diff --git a/flower/dstream.cc b/flower/dstream.cc
index 784bf36fbee75749269aceb18595528c3f685aa6..10542ee06a52a6575a258104be20003241a8d5a9 100644 (file)
--- 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 55f0e4fedd932edba9f1c4f320319860311b362f..d3c9a7afb331137c8a666a8b999f60141eb07a1a 100644 (file)
--- 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)