* flower/include/real.hh: using std::{isnan,isinf}
* VERSION (PATCH_LEVEL): release 2.7.9
+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,
2005-09-05 Graham Percival <gpermus@gmail.com>
* Documentation/user/ instrument-notation.itely,
PACKAGE_NAME=LilyPond
MAJOR_VERSION=2
MINOR_VERSION=7
PACKAGE_NAME=LilyPond
MAJOR_VERSION=2
MINOR_VERSION=7
#include <algorithm>
#include <climits>
#include <algorithm>
#include <climits>
typedef double Real;
extern const Real infinity_f;
using namespace std;
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)
{
template<class T> inline T abs (T x)
{
-#include <math.h>
-// #include <cmath> // undefines isnan on MacOS X.
-
#ifndef STANDALONE
String
Offset::to_string () const
#ifndef STANDALONE
String
Offset::to_string () const
#include <math.h>
#include "accidental-placement.hh"
#include <math.h>
#include "accidental-placement.hh"
-#include "libc-extension.hh" // isinf
#include "skyline.hh"
#include "music.hh"
#include "pitch.hh"
#include "skyline.hh"
#include "music.hh"
#include "pitch.hh"
#include "break-align-interface.hh"
#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"
#include "pointer-group-interface.hh"
#include "self-alignment-interface.hh"
#include "side-position-interface.hh"
#include "main.hh"
#include "file-path.hh"
#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}, "
LY_DEFINE (ly_find_file, "ly:find-file",
1, 0, 0, (SCM name),
"Return the absolute file name of @var{name}, "
if (scm_exact_p (s) == SCM_BOOL_F)
{
Real r (scm_to_double (s));
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))
if (isinf (r) || isnan (r))
{
programming_error (_ ("infinity or NaN encountered while converting Real number"));
programming_error (_ ("setting to zero"));
{
programming_error (_ ("infinity or NaN encountered while converting Real number"));
programming_error (_ ("setting to zero"));
#include <cstdio>
#include <math.h>
#include <cstdio>
#include <math.h>
-#include "libc-extension.hh" // isinf
#include "paper-column.hh"
#include "spring.hh"
#include "warn.hh"
#include "paper-column.hh"
#include "spring.hh"
#include "warn.hh"
#include "dimensions.hh"
#include "font-metric.hh"
#include "input-smob.hh"
#include "dimensions.hh"
#include "font-metric.hh"
#include "input-smob.hh"
-#include "libc-extension.hh" // isinf
#include "string-convert.hh"
#include "warn.hh"
#include "string-convert.hh"
#include "warn.hh"
{
programming_error ("not a markup: ");
scm_display (markup, scm_current_error_port ());
{
programming_error ("not a markup: ");
scm_display (markup, scm_current_error_port ());
Box b;
b[X_AXIS].set_empty ();
b[Y_AXIS].set_empty ();
Box b;
b[X_AXIS].set_empty ();
b[Y_AXIS].set_empty ();