* lily/general-scheme.cc: remove my_{isinf,isnan}.

* flower/include/real.hh: using std::{isnan,isinf}

* VERSION (PATCH_LEVEL): release 2.7.9

diff --git a/ChangeLog b/ChangeLog
index 29c6eee1365cf61cbfeaa7e3819afacc1a304866..65e5e4b9fed9be9b481d3de923b289ad319aa51c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-09-06  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * 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  <gpermus@gmail.com>
 
        * Documentation/user/ instrument-notation.itely,

diff --git a/VERSION b/VERSION
index 4ae52ba34917ca2e467fd1866d18c56057150a0f..ce8dc973f6ece76b759b4211c0190a6212a0878f 100644 (file)
--- 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 966406f60879fef206fbf1886df12c721f24ab84..e44094f072d8a710c6fee34d234320832fe59b56 100644 (file)
--- a/flower/include/real.hh
+++ b/flower/include/real.hh
@@ -11,10 +11,13 @@
 
 #include <algorithm>
 #include <climits>
+#include <cmath>
 
 typedef double Real;
 extern const Real infinity_f;
 using namespace std;
+using std::isnan;
+using std::isinf;
 
 template<class T> inline T abs (T x)
 {

diff --git a/flower/offset.cc b/flower/offset.cc
index f54772daa9c3747d791572b8ac205e159ee2f833..39e1e0b6da9a16713d63ce25e63a055e2c9a6aba 100644 (file)
--- a/flower/offset.cc
+++ b/flower/offset.cc
@@ -9,9 +9,6 @@
 #include "offset.hh"
 
 
-#include <math.h>
-// #include <cmath>  // 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 63e5f7934265565165abec73ace13f2da2e32af4..5eff0dfc45dc9a2741ed16b82612019e8384f037 100644 (file)
--- a/lily/accidental-placement.cc
+++ b/lily/accidental-placement.cc
@@ -9,7 +9,6 @@
 #include <math.h>
 
 #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 9778f3076b849be498ff439e15af107f33d4a640..211058779a4ae810d8b97fa9bd40e0424eecfdd6 100644 (file)
--- 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 6541ab8eaedeecd2bbc47e845309f682b9f00f96..2c1fb2bbc07b5665f28d60a62c6c99cf0b900d21 100644 (file)
--- 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 ec9f4ac35d65b986f450cf24982a1c736c222129..59027b3c3855f60f0a5bf9253e4eb1462b62c57e 100644 (file)
--- a/lily/simple-spacer-scheme.cc
+++ b/lily/simple-spacer-scheme.cc
@@ -9,7 +9,6 @@
 #include <cstdio>
 #include <math.h>
 
-#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 9b050baf9f22ba5897e9f0054d6cee642017eeda..b8bad87875afade6df082406940f629f33a23dce 100644 (file)
--- 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 985b05989b18709bf775c308527f606dd5a78f99..ab23ee70e5b6c4e76a92d3db84bffd20d95a08bf 100644 (file)
--- 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 ();