From: Keith OHara <k-ohara5a5a@oco.net>
Date: Sun, 21 Aug 2011 21:01:22 +0000 (-0700)
Subject: Resolve warnings: initialization, casting
X-Git-Tag: release/2.15.9-1~9^2~12
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8b270ba14b0b269498d6b072e4ed24f7c261a2ee;p=lilypond.git

Resolve warnings: initialization, casting
---

diff --git a/lily/beam.cc b/lily/beam.cc
index 9fd5347462..4acf18c143 100644
--- 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 31e7840a23..9f5bb1a7e4 100644
--- 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++)
                 {