lilypond-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

silence C++ warnings (issue 231370043 by address@hidden)


From: nine . fierce . ballads
Subject: silence C++ warnings (issue 231370043 by address@hidden)
Date: Mon, 04 May 2015 23:49:14 +0000

Reviewers: ,

Message:
I noticed these recently and it seemed appropriate to fix them this way.

Description:
silence C++ warnings

Please review this at https://codereview.appspot.com/231370043/

Affected files (+2, -2 lines):
  M lily/beaming-pattern.cc
  M lily/page-breaking.cc


Index: lily/beaming-pattern.cc
diff --git a/lily/beaming-pattern.cc b/lily/beaming-pattern.cc
index 1dcb791a8d9ca6bc836a10a1276373a4ab47c6ed..b7c5aa23d2633d9c4138c57e686c915b5419a19a 100644
--- a/lily/beaming-pattern.cc
+++ b/lily/beaming-pattern.cc
@@ -167,7 +167,7 @@ Beaming_pattern::beamify (Beaming_options const &options)
         if (non_flag_dir)
           {
             int importance = infos_[i + 1].rhythmic_importance_;
- int start_dur = intlog2(infos_[i+1].start_moment_.main_part_.den()); + int start_dur = intlog2(static_cast<int>(infos_[i+1].start_moment_.main_part_.den()));
             int count = (importance < 0 && options.subdivide_beams_)
                         ? max(start_dur,3)-2 // 1/8 note has one beam
                         : min (min (infos_[i].count (non_flag_dir),
Index: lily/page-breaking.cc
diff --git a/lily/page-breaking.cc b/lily/page-breaking.cc
index b23cd4637b04684c3b591762df9368593aeeccf8..350a2c472dab46801ec1d9871792575339cee436 100644
--- a/lily/page-breaking.cc
+++ b/lily/page-breaking.cc
@@ -1133,7 +1133,7 @@ Page_breaking::min_page_count (vsize configuration, vsize first_page_num)

if ((!too_few_lines (line_count) && (next_height > cur_page_height && cur_rod_height > 0))
           || too_many_lines (next_line_count)
- || prev && scm_is_eq (prev->page_permission_, ly_symbol2scm ("force"))) + || (prev && scm_is_eq (prev->page_permission_, ly_symbol2scm ("force"))))
         {
           line_count = cur.compressed_nontitle_lines_count_;
           cur_rod_height = cur.full_height ();





reply via email to

[Prev in Thread] Current Thread [Next in Thread]