From 7c3b9b26098a865897e417d007857fdaeb19b0ed Mon Sep 17 00:00:00 2001 From: hanwen Date: Tue, 6 Sep 2005 15:48:23 +0000 Subject: [PATCH] * lily/general-scheme.cc: remove my_{isinf,isnan}. * flower/include/real.hh: using std::{isnan,isinf} * VERSION (PATCH_LEVEL): release 2.7.9 --- ChangeLog | 8 ++++++++ VERSION | 2 +- flower/include/real.hh | 3 +++ flower/offset.cc | 3 --- lily/accidental-placement.cc | 1 - lily/break-align-interface.cc | 1 - lily/general-scheme.cc | 12 ------------ lily/simple-spacer-scheme.cc | 1 - lily/stencil.cc | 1 - lily/text-interface.cc | 2 +- 10 files changed, 13 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index 29c6eee136..65e5e4b9fe 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-09-06 Han-Wen Nienhuys + + * lily/general-scheme.cc: remove my_{isinf,isnan}. + + * flower/include/real.hh: using std::{isnan,isinf} + + * VERSION (PATCH_LEVEL): release 2.7.9 + 2005-09-05 Graham Percival * Documentation/user/ instrument-notation.itely, diff --git a/VERSION b/VERSION index 4ae52ba349..ce8dc973f6 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,6 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=2 MINOR_VERSION=7 -PATCH_LEVEL=9 +PATCH_LEVEL=10 MY_PATCH_LEVEL= diff --git a/flower/include/real.hh b/flower/include/real.hh index 966406f608..e44094f072 100644 --- a/flower/include/real.hh +++ b/flower/include/real.hh @@ -11,10 +11,13 @@ #include #include +#include typedef double Real; extern const Real infinity_f; using namespace std; +using std::isnan; +using std::isinf; template inline T abs (T x) { diff --git a/flower/offset.cc b/flower/offset.cc index f54772daa9..39e1e0b6da 100644 --- a/flower/offset.cc +++ b/flower/offset.cc @@ -9,9 +9,6 @@ #include "offset.hh" -#include -// #include // undefines isnan on MacOS X. - #ifndef STANDALONE String Offset::to_string () const diff --git a/lily/accidental-placement.cc b/lily/accidental-placement.cc index 63e5f79342..5eff0dfc45 100644 --- a/lily/accidental-placement.cc +++ b/lily/accidental-placement.cc @@ -9,7 +9,6 @@ #include #include "accidental-placement.hh" -#include "libc-extension.hh" // isinf #include "skyline.hh" #include "music.hh" #include "pitch.hh" diff --git a/lily/break-align-interface.cc b/lily/break-align-interface.cc index 9778f3076b..211058779a 100644 --- a/lily/break-align-interface.cc +++ b/lily/break-align-interface.cc @@ -10,7 +10,6 @@ #include "break-align-interface.hh" -#include "libc-extension.hh" // isinf #include "pointer-group-interface.hh" #include "self-alignment-interface.hh" #include "side-position-interface.hh" diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc index 6541ab8eae..2c1fb2bbc0 100644 --- a/lily/general-scheme.cc +++ b/lily/general-scheme.cc @@ -24,14 +24,6 @@ #include "main.hh" #include "file-path.hh" -/* MacOS S fix: - source-file.hh includes cmath which undefines isinf and isnan -*/ -#ifdef __APPLE__ -inline int my_isinf (Real r) { return isinf (r); } -inline int my_isnan (Real r) { return isnan (r); } -#endif - LY_DEFINE (ly_find_file, "ly:find-file", 1, 0, 0, (SCM name), "Return the absolute file name of @var{name}, " @@ -164,11 +156,7 @@ LY_DEFINE (ly_number2string, "ly:number->string", if (scm_exact_p (s) == SCM_BOOL_F) { Real r (scm_to_double (s)); -#ifdef __APPLE__ - if (my_isinf (r) || my_isnan (r)) -#else if (isinf (r) || isnan (r)) -#endif { programming_error (_ ("infinity or NaN encountered while converting Real number")); programming_error (_ ("setting to zero")); diff --git a/lily/simple-spacer-scheme.cc b/lily/simple-spacer-scheme.cc index ec9f4ac35d..59027b3c38 100644 --- a/lily/simple-spacer-scheme.cc +++ b/lily/simple-spacer-scheme.cc @@ -9,7 +9,6 @@ #include #include -#include "libc-extension.hh" // isinf #include "paper-column.hh" #include "spring.hh" #include "warn.hh" diff --git a/lily/stencil.cc b/lily/stencil.cc index 9b050baf9f..b8bad87875 100644 --- a/lily/stencil.cc +++ b/lily/stencil.cc @@ -13,7 +13,6 @@ #include "dimensions.hh" #include "font-metric.hh" #include "input-smob.hh" -#include "libc-extension.hh" // isinf #include "string-convert.hh" #include "warn.hh" diff --git a/lily/text-interface.cc b/lily/text-interface.cc index 985b05989b..ab23ee70e5 100644 --- a/lily/text-interface.cc +++ b/lily/text-interface.cc @@ -58,7 +58,7 @@ Text_interface::interpret_markup (SCM layout_smob, SCM props, SCM markup) { programming_error ("not a markup: "); scm_display (markup, scm_current_error_port ()); - abort(); + Box b; b[X_AXIS].set_empty (); b[Y_AXIS].set_empty (); -- 2.39.5