From 2d556e54796f00c0f041386738b048783c2637cc Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Sun, 26 Dec 2010 10:53:59 +0100 Subject: [PATCH] Fix compiler warnings. --- lily/beaming-pattern.cc | 2 +- lily/break-substitution.cc | 4 ++-- lily/duration.cc | 4 ++-- lily/figured-bass-engraver.cc | 2 +- lily/font-metric.cc | 2 +- lily/lily-guile.cc | 2 +- lily/lookup.cc | 2 +- lily/midi-item.cc | 2 +- lily/pango-font.cc | 2 +- lily/pitch.cc | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lily/beaming-pattern.cc b/lily/beaming-pattern.cc index 7567caa700..d58424cb5a 100644 --- a/lily/beaming-pattern.cc +++ b/lily/beaming-pattern.cc @@ -189,7 +189,7 @@ Beaming_pattern::find_rhythmic_importance (Beaming_options const &options) // in an 8th-note triplet with a quarter-note beat, 1/3 of a beat should be // more important than 1/2. if (infos_[i].rhythmic_importance_ >= 0) - infos_[i].rhythmic_importance_ = (dt / options.base_moment_).den (); + infos_[i].rhythmic_importance_ = (int) (dt / options.base_moment_).den (); i++; } diff --git a/lily/break-substitution.cc b/lily/break-substitution.cc index cbc88255f3..3d89f18710 100644 --- a/lily/break-substitution.cc +++ b/lily/break-substitution.cc @@ -295,8 +295,8 @@ struct Substitution_entry } else { - left_ = sr[LEFT]; - right_ = sr[RIGHT]; + left_ = (short) sr[LEFT]; + right_ = (short) sr[RIGHT]; } } Substitution_entry () diff --git a/lily/duration.cc b/lily/duration.cc index 814bf6e159..627ede23da 100644 --- a/lily/duration.cc +++ b/lily/duration.cc @@ -61,8 +61,8 @@ Duration::Duration (Rational r, bool scale) satisfies the left inequality and is within a factor of 2 of satistying the right one. Therefore either k = k' or k = k'+1 */ - int p = r.num (); - int q = r.den (); + int p = (int) r.num (); + int q = (int) r.den (); int k = intlog2 (q) - intlog2 (p); if (shift_left(p, k) < q) k++; diff --git a/lily/figured-bass-engraver.cc b/lily/figured-bass-engraver.cc index b4c92f8862..711537ec41 100644 --- a/lily/figured-bass-engraver.cc +++ b/lily/figured-bass-engraver.cc @@ -182,7 +182,7 @@ Figured_bass_engraver::stop_translation_timestep () IMPLEMENT_TRANSLATOR_LISTENER (Figured_bass_engraver, rest); void -Figured_bass_engraver::listen_rest (Stream_event *ev) +Figured_bass_engraver::listen_rest (Stream_event *) { have_rest_ = true; } diff --git a/lily/font-metric.cc b/lily/font-metric.cc index b2ff830696..28bf90a0b6 100644 --- a/lily/font-metric.cc +++ b/lily/font-metric.cc @@ -79,7 +79,7 @@ Font_metric::count () const } Box -Font_metric::get_indexed_char_dimensions (size_t k) const +Font_metric::get_indexed_char_dimensions (size_t) const { return Box (Interval (0, 0), Interval (0, 0)); } diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index fea8836250..95610af236 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -661,7 +661,7 @@ SCM parse_symbol_list (char const *symbols) { while (isspace (*symbols)) - *symbols++; + symbols++; string s = symbols; replace_all (&s, '\n', ' '); replace_all (&s, '\t', ' '); diff --git a/lily/lookup.cc b/lily/lookup.cc index 207dd06bf4..6457c0caa5 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -401,7 +401,7 @@ Lookup::slur (Bezier curve, Real curvethick, Real linethick, Bezier back_dash, curve_dash; Real seg_length = (back_segment.control_[3] - back_segment.control_[0]).length (); - int pattern_count = seg_length / dash_period; + int pattern_count = (int) (seg_length / dash_period); Real pattern_length = 1.0 / (pattern_count + dash_fraction); Real start_t, end_t; for (int p = 0; p <= pattern_count; p++) diff --git a/lily/midi-item.cc b/lily/midi-item.cc index 263c978d07..547b67a5f0 100644 --- a/lily/midi-item.cc +++ b/lily/midi-item.cc @@ -87,7 +87,7 @@ Midi_instrument::to_string () const SCM program = scm_call_1 (proc, ly_symbol2scm (audio_->str_.c_str ())); found = (program != SCM_BOOL_F); if (found) - program_byte = scm_to_int (program); + program_byte = (Byte) scm_to_int (program); else warning (_f ("no such MIDI instrument: `%s'", audio_->str_.c_str ())); diff --git a/lily/pango-font.cc b/lily/pango-font.cc index 21ab85ab66..480dd8c465 100644 --- a/lily/pango-font.cc +++ b/lily/pango-font.cc @@ -300,7 +300,7 @@ Pango_font::physical_font_tab () const extern bool music_strings_to_paths; Stencil -Pango_font::text_stencil (Output_def *state, +Pango_font::text_stencil (Output_def * /* state */, string str, bool music_string) const { /* diff --git a/lily/pitch.cc b/lily/pitch.cc index e9872fdf8e..e9dd522351 100644 --- a/lily/pitch.cc +++ b/lily/pitch.cc @@ -56,7 +56,7 @@ Pitch::compare (Pitch const &m1, Pitch const &m2) if (n) return n; if (a) - return a; + return a > (Rational)0; return 0; } -- 2.39.5