* flower/include/real.hh: include <math.h> iso. <cmath>

* flower/include/offset.hh: include real.hh

diff --git a/ChangeLog b/ChangeLog
index c92892f0f4ea301302766c73bfdcb60076e4b1cb..94c266c6f2aaa8890fed964fa80de073511a7e43 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-26  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * flower/include/real.hh: include <math.h> iso. <cmath>
+
+       * flower/include/offset.hh: include real.hh
+
 2005-09-20  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
        * Documentation/user/changing-defaults.itely (Difficult tweaks):

diff --git a/flower/include/interval.hh b/flower/include/interval.hh
index 08a48a9898e92658a79e223be05eaa70f2ab965e..5b6e59d06dfc2596842d94b32785270c2a6d0178 100644 (file)
--- a/flower/include/interval.hh
+++ b/flower/include/interval.hh
@@ -7,6 +7,8 @@
 #ifndef INTERVAL_HH
 #define INTERVAL_HH
 
+#include <math.h>
+
 #include "flower-proto.hh"
 #include "drul-array.hh"
 

diff --git a/flower/include/interval.tcc b/flower/include/interval.tcc
index 0ac8de264fba7a8a9353652405b248a4e33fc7d8..94186ada15d63a388849266f19335f54b410a963 100644 (file)
--- a/flower/include/interval.tcc
+++ b/flower/include/interval.tcc
@@ -10,7 +10,9 @@
 #define INTERVAL_TCC
 
 #include <cassert>
-#include <cmath>
+
+// MacOS 10.3 problems:
+// #include <cmath>
 using namespace std;
 
 #include "interval.hh"

diff --git a/flower/include/offset.hh b/flower/include/offset.hh
index 7929573ee7af082b87ac5c256304e1e88207ad83..eaefeb26bb5a8a8b19a39df680c2063c929986c7 100644 (file)
--- a/flower/include/offset.hh
+++ b/flower/include/offset.hh
@@ -9,6 +9,7 @@
 
 #include "axis.hh"
 #include "string.hh"
+#include "real.hh"
 
 Offset complex_multiply (Offset, Offset);
 Offset complex_divide (Offset, Offset);

diff --git a/flower/include/real.hh b/flower/include/real.hh
index 598c35199a5c095824dcc3fd399bd82f91211d90..657c0cb677aef8e4d3e79f1d435f1cca4d6f6623 100644 (file)
--- a/flower/include/real.hh
+++ b/flower/include/real.hh
@@ -11,7 +11,12 @@
 
 #include <algorithm>
 #include <climits>
-#include <cmath>
+
+/*
+  MacOS 10.3 uses g++ 3.3 which doesn't have std::isinf()
+ */
+// #include <cmath>
+#include <math.h>
 using namespace std;