[Darwin2k-devel] Patch to compile with gcc 4.1

[Jose V. <che...@ya...>]

Hello,

Below is a small patch that allows building on Ubuntu 7.10 using gcc 4.1.

diff -ru darwin2k-0.91/src/d2k/disp/synGLDisp.cxx darwin2k/src/d2k/disp/synGLDisp.cxx
--- darwin2k-0.91/src/d2k/disp/synGLDisp.cxx    2002-02-04 21:05:23.000000000 -0500
+++ darwin2k/src/d2k/disp/synGLDisp.cxx    2007-11-19 04:33:33.000000000 -0500
@@ -138,7 +138,7 @@
   xform.m[11] = b->x(2);
   xform = xform*centerOffset;
   xform.invert();
-  xform = transpose(xform);
+  xform = transpose(matrix::matrix(xform));
   glMultMatrixd(&xform.m[0]);
 }
 
@@ -1023,7 +1023,7 @@
   xform.m[3] = b->x(0);
   xform.m[7] = b->x(1);
   xform.m[11] = b->x(2);
-  xform = transpose(xform);
+  xform = transpose(matrix::matrix(xform));
   glMultMatrixd(&xform.m[0]);
   glMultMatrixd(&centerOffset.m[0]);
   glCallList(listID);
@@ -1122,7 +1122,7 @@
   xform.m[3] = p->l->x(0);
   xform.m[7] = p->l->x(1);
   xform.m[11] = p->l->x(2);
-  xform = transpose(xform);
+  xform = transpose(matrix::matrix(xform));
   glMultMatrixd(&xform.m[0]);
   glMultMatrixd(&centerOffset.m[0]);
   glCallList(listID);
diff -ru darwin2k-0.91/src/d2k/disp/synGLForm.cxx darwin2k/src/d2k/disp/synGLForm.cxx
--- darwin2k-0.91/src/d2k/disp/synGLForm.cxx    2001-12-15 11:58:42.000000000 -0500
+++ darwin2k/src/d2k/disp/synGLForm.cxx    2007-11-18 08:47:19.000000000 -0500
@@ -32,6 +32,8 @@
 /* Form definition file generated with fdesign. */
 
 #define D2K_INTERNAL
+#include "GL/glx.h"
+#include "GL/gl.h"
 #include "forms.h"
 #include <stdlib.h>
 #include "synGLForm.h"
diff -ru darwin2k-0.91/src/d2k/terrain/terrainMaterial.h darwin2k/src/d2k/terrain/terrainMaterial.h
--- darwin2k-0.91/src/d2k/terrain/terrainMaterial.h    2003-02-12 17:41:50.000000000 -0500
+++ darwin2k/src/d2k/terrain/terrainMaterial.h    2007-11-18 08:15:06.000000000 -0500
@@ -95,7 +95,7 @@
   }
 
   /* reads parameters; called by terrainModel::init */
-  virtual int terrainMaterial::readParams(paramParser *p) {
+  virtual int readParams(paramParser *p) {
     return 1;
   }
 };
diff -ru darwin2k-0.91/src/dyno/dynoDisp/dynoGLDisp.cxx darwin2k/src/dyno/dynoDisp/dynoGLDisp.cxx
--- darwin2k-0.91/src/dyno/dynoDisp/dynoGLDisp.cxx    2001-12-15 11:58:48.000000000 -0500
+++ darwin2k/src/dyno/dynoDisp/dynoGLDisp.cxx    2007-11-19 04:31:27.000000000 -0500
@@ -614,7 +614,7 @@
   xform.m[3] = b->x(0);
   xform.m[7] = b->x(1);
   xform.m[11] = b->x(2);
-  xform = transpose(xform);
+  xform = transpose(matrix::matrix(xform));
   glMultMatrixd(&xform.m[0]);
   glMultMatrixd(&centerOffset.m[0]);
   glCallList(listID);
diff -ru darwin2k-0.91/src/dyno/dynoDisp/dynoGLForm.cxx darwin2k/src/dyno/dynoDisp/dynoGLForm.cxx
--- darwin2k-0.91/src/dyno/dynoDisp/dynoGLForm.cxx    2001-12-15 11:58:48.000000000 -0500
+++ darwin2k/src/dyno/dynoDisp/dynoGLForm.cxx    2007-11-18 08:47:04.000000000 -0500
@@ -32,6 +32,8 @@
 /* Form definition file generated with fdesign. */
 
 #define D2K_INTERNAL
+#include "GL/glx.h"
+#include "GL/gl.h"
 #include "forms.h"
 #include <stdlib.h>
 #include "dynoGLForm.h"
diff -ru darwin2k-0.91/src/dyno/mechanism/slices.cxx darwin2k/src/dyno/mechanism/slices.cxx
--- darwin2k-0.91/src/dyno/mechanism/slices.cxx    2002-03-17 00:12:15.000000000 -0500
+++ darwin2k/src/dyno/mechanism/slices.cxx    2007-11-18 08:06:33.000000000 -0500
@@ -113,7 +113,7 @@
   return slice;
 }
 
-inline void matrixSlice::operator delete(void *obj) {
+void matrixSlice::operator delete(void *obj) {
   matrixSlice *slice = (matrixSlice *)obj;
 
   if (slice->myMem) {
diff -ru darwin2k-0.91/src/dyno/mechanism/slices.h darwin2k/src/dyno/mechanism/slices.h
--- darwin2k-0.91/src/dyno/mechanism/slices.h    2003-03-01 13:09:56.000000000 -0500
+++ darwin2k/src/dyno/mechanism/slices.h    2007-11-18 08:06:26.000000000 -0500
@@ -89,7 +89,7 @@
   matrixSlice *prev;
   static int maxSlices;
   
-  inline void operator delete(void *obj);
+  void operator delete(void *obj);
 
   static ptrHash freeHash;
   static matrixSlice *newMatrixSlice(int n, int c0 = 0);





      ____________________________________________________________________________________
Be a better sports nut!  Let your teams follow you 
with Yahoo Mobile. Try it now.  http://mobile.yahoo.com/sports;_ylt=At9_qDKvtAbMuh1G1SQtBI7ntAcJ