Making the C++ stuff work for the MipsPro 7.3 compiler.
authorChris Want <cwant@ualberta.ca>
Tue, 23 Nov 2004 23:04:30 +0000 (23:04 +0000)
committerChris Want <cwant@ualberta.ca>
Tue, 23 Nov 2004 23:04:30 +0000 (23:04 +0000)
Kester might want to check this for correctness
Kent might want to test if this breaks the Sun compile.

extern/solid/include/MT/Interval.h
extern/solid/include/MT/Matrix3x3.h
extern/solid/include/MT/Quaternion.h
extern/solid/include/MT/Tuple3.h
extern/solid/include/MT/Tuple4.h
extern/solid/include/MT/Vector3.h
extern/solid/include/MT_Scalar.h
extern/solid/src/convex/DT_Array.h
source/gameengine/Converter/BL_ActionActuator.cpp
source/gameengine/Ketsji/KX_IpoActuator.cpp

index b739797170018abccbdd36b86807eaa3c1c3682e..c6ba2fc1681c8d69997282d92844d1ca3f4f2780 100755 (executable)
 #ifndef INTERVAL_H
 #define INTERVAL_H
 
+#if defined (__sgi)
+#include <assert.h>
+#else
 #include <cassert>
+#endif
+
 #include <iostream>
 #include <algorithm>
 
index 73c5d838d6afde997ecd7f86bec1067869ab47be..85e0d4cac84c32daba809636f3975e1b32058983 100755 (executable)
 #ifndef MATRIX3X3_H
 #define MATRIX3X3_H
 
+#if defined (__sgi)
+#include <assert.h>
+#else
 #include <cassert>
+#endif
 
 #include "Vector3.h"
 #include "Quaternion.h"
index 3726b4f0c5b299582549ea000f802bed096acfee..a925f21cd5d47270307fb28e273c5d8648c1a7bf 100755 (executable)
 #ifndef QUATERNION_H
 #define QUATERNION_H
 
+#if defined (__sgi)
+#include <assert.h>
+#else
 #include <cassert>
+#endif
 
 #include "Tuple4.h"
 #include "Vector3.h"
index bdc046a0317deaa6c501501dd8b33c54bc94edb7..52ea33b7f580e14cad3e903a7d766c32e05ec1fa 100755 (executable)
 #ifndef TUPLE3_H
 #define TUPLE3_H
 
+#if defined (__sgi)
+#include <assert.h>
+#else
 #include <cassert>
+#endif
+
 #include <iostream>
 
 namespace MT {
index f88e5e3a29a9f15011061588b42da0fbbf5ba0b2..6930541271e8fd1f3c49559168673a309da972d3 100755 (executable)
 #ifndef TUPLE4_H
 #define TUPLE4_H
 
+#if defined (__sgi)
+#include <assert.h>
+#else
 #include <cassert>
+#endif
+
 #include <iostream>
 
 namespace MT {
index 98c990684074ea6cb74b7ad2c4c476795bd319b6..b569c003f59623611ae7d04e929f437ef47ce190 100755 (executable)
 #ifndef VECTOR3_H
 #define VECTOR3_H
 
+#if defined (__sgi)
+#include <assert.h>
+#else
 #include <cassert>
+#endif
 
 #include "Tuple3.h"
 
index 8cc06aebf2cb440fd6cc768c50f1bffcdf9afc0c..663a1f1839cc1becdc6c8a94a6bc7b24fbeac5db 100755 (executable)
 #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"
index 603ebe978f1960a79507be41a05f9fa7fcfe6a3d..1694f884e5320f5b55bff1ff21615c2f2de34d44 100755 (executable)
 #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 {
index d5ae1afd023cc01f0a916e74c94d963adcc10235..0289ec42d748ad0e56409043cae02af302d12ddb 100644 (file)
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
 */
 
+#if defined (__sgi)
+#include <math.h>
+#else
 #include <cmath>
+#endif
 
 #include "SCA_LogicManager.h"
 #include "BL_ActionActuator.h"
index 08464fc88de4e77ca7cd8045a3d0d46df0179c0c..66850b2f60b2ab65ff1fe2b09e13cb28ba36f427 100644 (file)
  * ***** END GPL/BL DUAL LICENSE BLOCK *****
  */
 
+#if defined (__sgi)
+#include <math.h>
+#else
 #include <cmath>
+#endif
  
 #include "KX_IpoActuator.h"
 #include "KX_GameObject.h"