More g++ 4.6.1 compiler warnings (-Wunused-but-set-variable).

diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index 72a509cffaf989bf245684c975b8604c71c2b17b..d6142b1890b257a97fb42e1f284fcec1a19581bd 100644 (file)
--- a/lily/multi-measure-rest.cc
+++ b/lily/multi-measure-rest.cc
@@ -111,11 +111,6 @@ Multi_measure_rest::print (SCM smob)
   Stencil mol;
   mol.add_stencil (symbol_stencil (me, space));
 
-  int measure_count = 0;
-  SCM m (me->get_property ("measure-count"));
-  if (scm_is_number (m))
-    measure_count = scm_to_int (m);
-
   mol.translate_axis (x_off, X_AXIS);
   return mol.smobbed_copy ();
 }

diff --git a/lily/stencil-scheme.cc b/lily/stencil-scheme.cc
index 958bcc44c811472b4d3b34a93be2213e02488303..1f33cd7aec25caa5721499038b88464a9fb569ab 100644 (file)
--- a/lily/stencil-scheme.cc
+++ b/lily/stencil-scheme.cc
@@ -94,15 +94,12 @@ LY_DEFINE (ly_stencil_empty_p, "ly:stencil-empty?",
 LY_DEFINE (ly_stencil_combine_at_edge, "ly:stencil-combine-at-edge",
            4, 2, 0, (SCM first, SCM axis, SCM direction,
                      SCM second,
-                     SCM padding,
-                     SCM minimum),
+                     SCM padding),
            "Construct a stencil by putting @var{second} next to @var{first}."
            "  @var{axis} can be 0 (x-axis) or@tie{}1 (y-axis)."
            "  @var{direction} can be -1 (left or down) or@tie{}1 (right or"
-           "  up).  The stencils are juxtaposed with @var{padding} as extra"
-           " space.  If this puts the reference points closer than"
-           " @var{minimum}, they are moved by the latter amount."
-           "  @var{first} and @var{second} may also be @code{'()} or"
+           " up).  The stencils are juxtaposed with @var{padding} as extra"
+           " space.  @var{first} and @var{second} may also be @code{'()} or"
            " @code{#f}.")
 {
   Stencil *s1 = unsmob_stencil (first);
@@ -122,12 +119,6 @@ LY_DEFINE (ly_stencil_combine_at_edge, "ly:stencil-combine-at-edge",
       LY_ASSERT_TYPE (scm_is_number, padding, 5);
       p = scm_to_double (padding);
     }
-  Real m = 0.0;
-  if (minimum != SCM_UNDEFINED)
-    {
-      LY_ASSERT_TYPE (scm_is_number, minimum, 6);
-      m = scm_to_double (minimum);
-    }
 
   if (s1)
     result = *s1;