Resolve warnings: initialization, casting

diff --git a/lily/beam.cc b/lily/beam.cc
index 9fd53474629389fdebd721e50103f5e3a3feed15..4acf18c1439f9aa5699e8d9c23dc68a8204b2c30 100644 (file)
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -1780,7 +1780,7 @@ Beam::pure_rest_collision_callback (SCM smob,
   Grob *left;
   Grob *right;
 
-  if (idx == -1 || my_stems.size () == 1)
+  if (idx == (vsize)-1 || my_stems.size () == 1)
     return scm_from_double (amount);
   else if (idx == 0)
     left = right = my_stems[1];

diff --git a/lily/hairpin.cc b/lily/hairpin.cc
index 31e7840a2390e90c1973dda8b8691d0486393a0f..9f5bb1a7e42edc2b620494b7d052d04a69746cd0 100644 (file)
--- a/lily/hairpin.cc
+++ b/lily/hairpin.cc
@@ -122,7 +122,7 @@ Hairpin::print (SCM smob)
           else
             {
               bool neighbor_found = false;
-              Spanner *adjacent;
+              Spanner *adjacent = NULL;
               extract_grob_set (me, "adjacent-spanners", neighbors);
               for (vsize i = 0; i < neighbors.size (); i++)
                 {