[cig-commits] r4543 - short/3D/PyLith/trunk/modulesrc/meshio

[baagaard at geodynamics.org]

Author: baagaard
Date: 2006-09-14 18:55:10 -0700 (Thu, 14 Sep 2006)
New Revision: 4543

Modified:
   short/3D/PyLith/trunk/modulesrc/meshio/Makefile.am
   short/3D/PyLith/trunk/modulesrc/meshio/meshio.pyxe
Log:
Fixed compilation bugs.

Modified: short/3D/PyLith/trunk/modulesrc/meshio/Makefile.am
===================================================================
--- short/3D/PyLith/trunk/modulesrc/meshio/Makefile.am	2006-09-15 01:45:20 UTC (rev 4542)
+++ short/3D/PyLith/trunk/modulesrc/meshio/Makefile.am	2006-09-15 01:55:10 UTC (rev 4543)
@@ -25,7 +25,7 @@
 meshiomodule_la_LIBADD = \
 	$(top_builddir)/libsrc/meshio/libpylithmeshio.la
 
-INCLUDES += -I$(PYTHON_INCDIR)
+INCLUDES += -I$(PYTHON_INCDIR) $(PETSC_INCLUDE)
 
 meshio.pyx meshio_embed.cpp  meshio_embed.h: meshio.pyxe
 	cp $< . && pyrexembed.py meshio.pyxe && rm -f meshio.pyxe

Modified: short/3D/PyLith/trunk/modulesrc/meshio/meshio.pyxe
===================================================================
--- short/3D/PyLith/trunk/modulesrc/meshio/meshio.pyxe	2006-09-15 01:45:20 UTC (rev 4542)
+++ short/3D/PyLith/trunk/modulesrc/meshio/meshio.pyxe	2006-09-15 01:55:10 UTC (rev 4543)
@@ -90,8 +90,7 @@
     """Wrap pointer to C++ object in PyCObject."""
     # create shim for destructor
     #embed{ void MeshIO_destructor(void* pObj)
-    spatialdata::geocoords::MeshIO* pMesh =
-      (spatialdata::geocoords::MeshIO*) pObj;
+    pylith::meshio::MeshIO* pMesh = (pylith::meshio::MeshIO*) pObj;
     delete pMesh;
     #}embed
     return PyCObject_FromVoidPtr(self.thisptr, MeshIO_destructor)