From: David Kastrup <dak@gnu.org>
Date: Mon, 15 Jul 2013 07:41:07 +0000 (+0200)
Subject: Issue 3453: Silence a number of compiler warnings
X-Git-Tag: release/2.17.23-1~16
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=0b6fd562dca66419d585c83e49fee1ec52c65431;p=lilypond.git

Issue 3453: Silence a number of compiler warnings
---

diff --git a/lily/beam.cc b/lily/beam.cc
index 4a2e752947..0932bd37d0 100644
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -743,9 +743,9 @@ Beam::print (SCM grob)
   Interval placements = robust_scm2interval (me->get_property ("normalized-endpoints"), Interval (0.0, 0.0));
 
   Stencil the_beam;
-  int extreme = (segments[0].vertical_count_ == 0
-                 ? segments[0].vertical_count_
-                 : segments.back ().vertical_count_);
+  vsize extreme = (segments[0].vertical_count_ == 0
+                   ? segments[0].vertical_count_
+                   : segments.back ().vertical_count_);
 
   for (vsize i = 0; i < segments.size (); i++)
     {
diff --git a/lily/beaming-pattern.cc b/lily/beaming-pattern.cc
index 411b5fbedb..088cdc1a65 100644
--- a/lily/beaming-pattern.cc
+++ b/lily/beaming-pattern.cc
@@ -208,7 +208,7 @@ find_location (SCM grouping, Moment base_moment, Moment start_moment,
 
   while (*next_group_pos < *next_beat_pos)
     {
-      int group_count = 1;  //default -- 1 base moments in a beam
+      I64 group_count = 1;  //default -- 1 base moments in a beam
       if (scm_is_pair (grouping))
         {
           group_count = scm_to_int (scm_car (grouping));
@@ -217,17 +217,17 @@ find_location (SCM grouping, Moment base_moment, Moment start_moment,
 
       // If we have a tuplet, the count should be determined from
       // the maximum tuplet size for beamed tuplets.
-      int tuplet_number = factor.den ();
-      if (tuplet_number > 1)
+      U64 tuplet_number = factor.den ();
+      if (tuplet_number > 1U)
         {
           // We use 1/8 as the base moment for the tuplet because it's
           // the largest beamed value.  If the tuplet is shorter, it's
           // OK, the code still works
-          int test_count = ( Moment (Rational (1, 8) / factor) / base_moment).num ();
+          I64 test_count = ( Moment (Rational (1, 8) / factor) / base_moment).num ();
           if (test_count > group_count) group_count = test_count;
         }
       *group_pos = *next_group_pos;
-      *next_group_pos = *group_pos + group_count * base_moment;
+      *next_group_pos = *group_pos + Rational(group_count) * base_moment;
     }
 }
 
@@ -238,7 +238,7 @@ Beaming_pattern::find_rhythmic_importance (Beaming_options const &options)
   Moment next_group_pos (0);
   Moment next_beat_pos (options.base_moment_);
   Moment tuplet_start_moment (-1, 1);
-  int tuplet_number = 1;
+  I64 tuplet_number = 1;
 
   SCM grouping = options.grouping_;
   vsize i = 0;
diff --git a/lily/freetype.cc b/lily/freetype.cc
index c48ef614c6..d7a5c28687 100644
--- a/lily/freetype.cc
+++ b/lily/freetype.cc
@@ -112,7 +112,7 @@ ly_FT_get_glyph_outline (FT_Face const &face, size_t signed_idx)
   SCM out = SCM_EOL;
   Offset lastpos;
   Offset firstpos;
-  vsize j = 0;
+  ssize j = 0;
   while (j < outline->n_points)
     {
       if (j == 0)
diff --git a/lily/include/smobs.hh b/lily/include/smobs.hh
index bb703e9503..cd111981bb 100644
--- a/lily/include/smobs.hh
+++ b/lily/include/smobs.hh
@@ -200,7 +200,7 @@ public:
       pass_here.checkin (arg);                                          \
   } while (0)
 #else
-#define ASSERT_LIVE_IS_ALLOWED(arg) do { } \
+#define ASSERT_LIVE_IS_ALLOWED(arg) do { (void)(arg); }  \
   while (0)
 #endif
 
diff --git a/lily/tweak-engraver.cc b/lily/tweak-engraver.cc
index 188780c591..a5d7ff68dd 100644
--- a/lily/tweak-engraver.cc
+++ b/lily/tweak-engraver.cc
@@ -63,11 +63,13 @@ Tweak_engraver::acknowledge_grob (Grob_info info)
                     grobname = scm_from_locale_symbol
                       (info.grob ()->name ().c_str ());
                   if (scm_is_eq (scm_caaar (s), grobname))
-                    if (scm_is_symbol (scm_cdaar (s)))
-                      info.grob ()->set_property (scm_cdaar (s), scm_cdar (s));
-                    else
-                      set_nested_property (info.grob (), scm_cdaar (s),
-                                           scm_cdar (s));
+                    {
+                      if (scm_is_symbol (scm_cdaar (s)))
+                        info.grob ()->set_property (scm_cdaar (s), scm_cdar (s));
+                      else
+                        set_nested_property (info.grob (), scm_cdaar (s),
+                                             scm_cdar (s));
+                    }
                 }
               else if (direct)
                 set_nested_property (info.grob (), scm_cdaar (s),