diff options
author | Chris Want <cwant@ualberta.ca> | 2004-11-24 02:04:30 +0300 |
---|---|---|
committer | Chris Want <cwant@ualberta.ca> | 2004-11-24 02:04:30 +0300 |
commit | 12307b358dfc4ee9470418f0a87da34a45623fc9 (patch) | |
tree | 292f857231d8b0895216f1b067556d6ac5b9c923 /extern | |
parent | 0883f682639e0a2043258a2222fc3bdd3a8aa0eb (diff) |
Making the C++ stuff work for the MipsPro 7.3 compiler.
Kester might want to check this for correctness
Kent might want to test if this breaks the Sun compile.
Diffstat (limited to 'extern')
-rwxr-xr-x | extern/solid/include/MT/Interval.h | 5 | ||||
-rwxr-xr-x | extern/solid/include/MT/Matrix3x3.h | 4 | ||||
-rwxr-xr-x | extern/solid/include/MT/Quaternion.h | 4 | ||||
-rwxr-xr-x | extern/solid/include/MT/Tuple3.h | 5 | ||||
-rwxr-xr-x | extern/solid/include/MT/Tuple4.h | 5 | ||||
-rwxr-xr-x | extern/solid/include/MT/Vector3.h | 4 | ||||
-rwxr-xr-x | extern/solid/include/MT_Scalar.h | 10 | ||||
-rwxr-xr-x | extern/solid/src/convex/DT_Array.h | 4 |
8 files changed, 37 insertions, 4 deletions
diff --git a/extern/solid/include/MT/Interval.h b/extern/solid/include/MT/Interval.h index b7397971700..c6ba2fc1681 100755 --- a/extern/solid/include/MT/Interval.h +++ b/extern/solid/include/MT/Interval.h @@ -24,7 +24,12 @@ #ifndef INTERVAL_H #define INTERVAL_H +#if defined (__sgi) +#include <assert.h> +#else #include <cassert> +#endif + #include <iostream> #include <algorithm> diff --git a/extern/solid/include/MT/Matrix3x3.h b/extern/solid/include/MT/Matrix3x3.h index 73c5d838d6a..85e0d4cac84 100755 --- a/extern/solid/include/MT/Matrix3x3.h +++ b/extern/solid/include/MT/Matrix3x3.h @@ -24,7 +24,11 @@ #ifndef MATRIX3X3_H #define MATRIX3X3_H +#if defined (__sgi) +#include <assert.h> +#else #include <cassert> +#endif #include "Vector3.h" #include "Quaternion.h" diff --git a/extern/solid/include/MT/Quaternion.h b/extern/solid/include/MT/Quaternion.h index 3726b4f0c5b..a925f21cd5d 100755 --- a/extern/solid/include/MT/Quaternion.h +++ b/extern/solid/include/MT/Quaternion.h @@ -24,7 +24,11 @@ #ifndef QUATERNION_H #define QUATERNION_H +#if defined (__sgi) +#include <assert.h> +#else #include <cassert> +#endif #include "Tuple4.h" #include "Vector3.h" diff --git a/extern/solid/include/MT/Tuple3.h b/extern/solid/include/MT/Tuple3.h index bdc046a0317..52ea33b7f58 100755 --- a/extern/solid/include/MT/Tuple3.h +++ b/extern/solid/include/MT/Tuple3.h @@ -24,7 +24,12 @@ #ifndef TUPLE3_H #define TUPLE3_H +#if defined (__sgi) +#include <assert.h> +#else #include <cassert> +#endif + #include <iostream> namespace MT { diff --git a/extern/solid/include/MT/Tuple4.h b/extern/solid/include/MT/Tuple4.h index f88e5e3a29a..6930541271e 100755 --- a/extern/solid/include/MT/Tuple4.h +++ b/extern/solid/include/MT/Tuple4.h @@ -24,7 +24,12 @@ #ifndef TUPLE4_H #define TUPLE4_H +#if defined (__sgi) +#include <assert.h> +#else #include <cassert> +#endif + #include <iostream> namespace MT { diff --git a/extern/solid/include/MT/Vector3.h b/extern/solid/include/MT/Vector3.h index 98c99068407..b569c003f59 100755 --- a/extern/solid/include/MT/Vector3.h +++ b/extern/solid/include/MT/Vector3.h @@ -24,7 +24,11 @@ #ifndef VECTOR3_H #define VECTOR3_H +#if defined (__sgi) +#include <assert.h> +#else #include <cassert> +#endif #include "Tuple3.h" diff --git a/extern/solid/include/MT_Scalar.h b/extern/solid/include/MT_Scalar.h index 8cc06aebf2c..663a1f1839c 100755 --- a/extern/solid/include/MT_Scalar.h +++ b/extern/solid/include/MT_Scalar.h @@ -24,15 +24,17 @@ #ifndef MT_SCALAR_H #define MT_SCALAR_H -#include <cmath> -#if defined (__sun__) || defined ( __sun ) || defined (__sparc) || defined (__sparc__) +#if defined (__sun__) || defined ( __sun ) || defined (__sparc) || defined (__sparc__) || defined (__sgi) #include <math.h> +#include <float.h> +#else +#include <cmath> +#include <cstdlib> +#include <cfloat> #endif #undef max -#include <cstdlib> -#include <cfloat> #include "SOLID_types.h" #include "GEN_MinMax.h" diff --git a/extern/solid/src/convex/DT_Array.h b/extern/solid/src/convex/DT_Array.h index 603ebe978f1..1694f884e53 100755 --- a/extern/solid/src/convex/DT_Array.h +++ b/extern/solid/src/convex/DT_Array.h @@ -24,7 +24,11 @@ #ifndef DT_ARRAY_H #define DT_ARRAY_H +#if defined (__sgi) +#include <assert.h> +#else #include <cassert> +#endif template <typename Data, typename Size = size_t> class DT_Array { |