Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(534)

Unified Diff: lily/page-breaking.cc

Issue 569220043: Issue 5658: Include <cmath> consistently, not <math.h> (Closed)
Patch Set: Cleanup: !isinf && !isnan == isfinite Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « lily/lyric-extender.cc ('k') | lily/page-layout-problem.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: lily/page-breaking.cc
diff --git a/lily/page-breaking.cc b/lily/page-breaking.cc
index 2378f173630ce5380463f52565caf6dbe548f9ab..ab6dbc43b957521e41c15abe04a3a94d22955a1f 100644
--- a/lily/page-breaking.cc
+++ b/lily/page-breaking.cc
@@ -635,7 +635,7 @@ Page_breaking::make_pages (vector<vsize> lines_per_page, SCM systems)
config = layout.solution (rag);
if ((ragged () && layout.force () < 0.0)
- || isinf (layout.force ()))
+ || std::isinf (layout.force ()))
warning (_f ("page %d has been compressed", page_num));
else
last_page_force = layout.force ();
@@ -1385,7 +1385,7 @@ Page_breaking::pack_systems_on_least_pages (vsize configuration, int first_page_
Real prev_force = space.force_;
space.append_system (cached_line_details_[line]);
if ((line > page_first_line)
- && (isinf (space.force_)
+ && (std::isinf (space.force_)
|| ((line > 0)
&& scm_is_eq (cached_line_details_[line - 1].page_permission_,
ly_symbol2scm ("force")))))
@@ -1407,7 +1407,7 @@ Page_breaking::pack_systems_on_least_pages (vsize configuration, int first_page_
* was the last one. If the systems put on it don't fit anymore, the last
* system is moved to a new page */
space.resize (page_height (page_num, true));
- if ((line > page_first_line) && (isinf (space.force_)))
+ if ((line > page_first_line) && (std::isinf (space.force_)))
{
res.systems_per_page_.push_back (line - page_first_line);
res.force_.push_back (prev_force);
« no previous file with comments | « lily/lyric-extender.cc ('k') | lily/page-layout-problem.cc » ('j') | no next file with comments »

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b