From 8b270ba14b0b269498d6b072e4ed24f7c261a2ee Mon Sep 17 00:00:00 2001 From: Keith OHara Date: Sun, 21 Aug 2011 14:01:22 -0700 Subject: [PATCH] Resolve warnings: initialization, casting --- lily/beam.cc | 2 +- lily/hairpin.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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++) { -- 2.39.2