Changeset 14776

Timestamp:

04/26/13 16:38:33 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: include binding.h first to include Python.h first to avoid compilation warnings (​http://realmike.org/blog/2012/07/08/embedding-python-tutorial-part-1/)

Location:

issm/trunk-jpl/src/wrappers

Files:

• AverageFilter/AverageFilter.h (modified) (1 diff)
• BamgConvertMesh/BamgConvertMesh.h (modified) (1 diff)
• BamgMesher/BamgMesher.h (modified) (1 diff)
• BamgTriangulate/BamgTriangulate.h (modified) (1 diff)
• Chaco/Chaco.h (modified) (2 diffs)
• ContourToMesh/ContourToMesh.h (modified) (2 diffs)
• ContourToNodes/ContourToNodes.h (modified) (1 diff)
• EdgeDetection/EdgeDetection.h (modified) (2 diffs)
• ElementConnectivity/ElementConnectivity.h (modified) (2 diffs)
• EnumToString/EnumToString.h (modified) (1 diff)
• Exp2Kml/Exp2Kml.h (modified) (1 diff)
• ExpSimplify/ExpSimplify.h (modified) (1 diff)
• HoleFiller/HoleFiller.h (modified) (1 diff)
• InternalFront/InternalFront.h (modified) (1 diff)
• InterpFromGridToMesh/InterpFromGridToMesh.h (modified) (1 diff)
• InterpFromMesh2d/InterpFromMesh2d.h (modified) (1 diff)
• InterpFromMeshToGrid/InterpFromMeshToGrid.h (modified) (1 diff)
• InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.h (modified) (2 diffs)
• InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.h (modified) (1 diff)
• KMLFileRead/KMLFileRead.h (modified) (1 diff)
• KMLMeshWrite/KMLMeshWrite.h (modified) (1 diff)
• KMLOverlay/KMLOverlay.h (modified) (1 diff)
• Kml2Exp/Kml2Exp.h (modified) (1 diff)
• Kriging/Kriging.h (modified) (1 diff)
• Ll2xy/Ll2xy.h (modified) (1 diff)
• MeshPartition/MeshPartition.h (modified) (1 diff)
• MeshProfileIntersection/MeshProfileIntersection.h (modified) (1 diff)
• NodeConnectivity/NodeConnectivity.h (modified) (2 diffs)
• PointCloudFindNeighbors/PointCloudFindNeighbors.h (modified) (1 diff)
• PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.h (modified) (1 diff)
• Scotch/Scotch.h (modified) (2 diffs)
• Shp2Exp/Shp2Exp.h (modified) (1 diff)
• Shp2Kml/Shp2Kml.h (modified) (1 diff)
• StringToEnum/StringToEnum.h (modified) (1 diff)
• TriMesh/TriMesh.h (modified) (2 diffs)
• TriMeshProcessRifts/TriMeshProcessRifts.h (modified) (1 diff)
• TriaSearch/TriaSearch.h (modified) (1 diff)
• Xy2ll/Xy2ll.h (modified) (1 diff)
• bindings.h (modified) (2 diffs)

issm/trunk-jpl/src/wrappers/AverageFilter/AverageFilter.h

@@ -17 +17 @@
 #endif
 
+#include "../bindings.h"
 #include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
-#include "../bindings.h"
 
 #undef __FUNCT__ 

issm/trunk-jpl/src/wrappers/BamgConvertMesh/BamgConvertMesh.h

@@ -17 +17 @@
 #endif
 
+#include "../bindings.h"
 #include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
-#include "../bindings.h"
 #include "../../c/io/io.h"
 

issm/trunk-jpl/src/wrappers/BamgMesher/BamgMesher.h

@@ -17 +17 @@
 #endif
 
+#include "../bindings.h"
 #include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
-#include "../bindings.h"
 
 #undef __FUNCT__ 

issm/trunk-jpl/src/wrappers/BamgTriangulate/BamgTriangulate.h

@@ -17 +17 @@
 #endif
 
+#include "../bindings.h"
 #include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
-#include "../bindings.h"
 
 #undef __FUNCT__ 

issm/trunk-jpl/src/wrappers/Chaco/Chaco.h

@@ -18 +18 @@
 
 /*headers*/
+#include "../bindings.h" /*Should always come first to avoid python's warnings*/
 #include <stdio.h>
 #include <string.h>    /*  strcasecmp  */
@@ -25 +26 @@
 #include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
-#include "../bindings.h"
 
 #undef __FUNCT__ 

issm/trunk-jpl/src/wrappers/ContourToMesh/ContourToMesh.h

@@ -18 +18 @@
 
 /*Header files: */
+#include "../bindings.h"
 #include "../../c/include/globals.h"
 #include "../../c/toolkits/toolkits.h"
@@ -24 +25 @@
 #include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
-#include "../bindings.h"
 #include "../../c/io/io.h"
 #include "../../c/EnumDefinitions/EnumDefinitions.h"

issm/trunk-jpl/src/wrappers/ContourToNodes/ContourToNodes.h

@@ -17 +17 @@
 #endif
 
+#include "../bindings.h"
 #include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
-#include "../bindings.h"
 
 #undef __FUNCT__

issm/trunk-jpl/src/wrappers/EdgeDetection/EdgeDetection.h

@@ -18 +18 @@
 
 /*Header files: */
+#include "../bindings.h"
 #include "../../c/include/globals.h"
 #include "../../c/toolkits/toolkits.h"
@@ -24 +25 @@
 #include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
-#include "../bindings.h"
 #include "../../c/io/io.h"
 #include "../../c/EnumDefinitions/EnumDefinitions.h"

issm/trunk-jpl/src/wrappers/ElementConnectivity/ElementConnectivity.h

@@ -18 +18 @@
 
 /*Header files: */
+#include "../bindings.h"
 #include "../../c/include/globals.h"
 #include "../../c/toolkits/toolkits.h"
@@ -24 +25 @@
 #include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
-#include "../bindings.h"
 #include "../../c/io/io.h"
 #include "../../c/EnumDefinitions/EnumDefinitions.h"

issm/trunk-jpl/src/wrappers/EnumToString/EnumToString.h

@@ -18 +18 @@
 
 /*Header files: */
+#include "../bindings.h"
 #include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
-#include "../bindings.h"
 
 #undef __FUNCT__ 

issm/trunk-jpl/src/wrappers/Exp2Kml/Exp2Kml.h

@@ -17 +17 @@
 #endif
 
+#include "../bindings.h"
 #include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
-#include "../bindings.h"
 
 #undef __FUNCT__ 

issm/trunk-jpl/src/wrappers/ExpSimplify/ExpSimplify.h

@@ -17 +17 @@
 #endif
 
+#include "../bindings.h"
 #include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
-#include "../bindings.h"
 
 #undef __FUNCT__ 

issm/trunk-jpl/src/wrappers/HoleFiller/HoleFiller.h

@@ -17 +17 @@
 #endif
 
+#include "../bindings.h"
 #include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
-#include "../bindings.h"
 
 #undef __FUNCT__ 

issm/trunk-jpl/src/wrappers/InternalFront/InternalFront.h

@@ -17 +17 @@
 #endif
 
+#include "../bindings.h"
 #include "../../c/include/globals.h"
 #include "../../c/shared/shared.h"
-#include "../bindings.h"
 #include "../../c/io/io.h"
 

issm/trunk-jpl/src/wrappers/InterpFromGridToMesh/InterpFromGridToMesh.h

@@ -17 +17 @@
 #endif
 
+#include "../bindings.h"
 #include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
-#include "../bindings.h"
 
 #undef __FUNCT__ 

issm/trunk-jpl/src/wrappers/InterpFromMesh2d/InterpFromMesh2d.h

@@ -17 +17 @@
 #endif
 
+#include "../bindings.h"
 #include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
-#include "../bindings.h"
 
 #undef __FUNCT__ 

issm/trunk-jpl/src/wrappers/InterpFromMeshToGrid/InterpFromMeshToGrid.h

@@ -17 +17 @@
 #endif
 
+#include "../bindings.h"
 #include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
-#include "../bindings.h"
 
 #undef __FUNCT__ 

issm/trunk-jpl/src/wrappers/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.h

@@ -18 +18 @@
 
 /*Header files: */
+#include "../bindings.h"
 #include "../../c/include/globals.h"
 #include "../../c/toolkits/toolkits.h"
@@ -24 +25 @@
 #include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
-#include "../bindings.h"
 #include "../../c/io/io.h"
 #include "../../c/EnumDefinitions/EnumDefinitions.h"

issm/trunk-jpl/src/wrappers/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.h

@@ -17 +17 @@
 #endif
 
+#include "../bindings.h"
 #include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
-#include "../bindings.h"
 
 #undef __FUNCT__ 

issm/trunk-jpl/src/wrappers/KMLFileRead/KMLFileRead.h

@@ -17 +17 @@
 #endif
 
+#include "../bindings.h"
 #include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
-#include "../bindings.h"
 
 #undef __FUNCT__ 

issm/trunk-jpl/src/wrappers/KMLMeshWrite/KMLMeshWrite.h

@@ -17 +17 @@
 #endif
 
+#include "../bindings.h"
 #include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
-#include "../bindings.h"
 
 #undef __FUNCT__ 

issm/trunk-jpl/src/wrappers/KMLOverlay/KMLOverlay.h

@@ -17 +17 @@
 #endif
 
+#include "../bindings.h"
 #include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
-#include "../bindings.h"
 
 #undef __FUNCT__ 

issm/trunk-jpl/src/wrappers/Kml2Exp/Kml2Exp.h

@@ -17 +17 @@
 #endif
 
+#include "../bindings.h"
 #include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
-#include "../bindings.h"
 
 #undef __FUNCT__ 

issm/trunk-jpl/src/wrappers/Kriging/Kriging.h

@@ -17 +17 @@
 #endif
 
+#include "../bindings.h"
 #include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/shared/shared.h"
-#include "../bindings.h"
 
 #undef __FUNCT__ 

issm/trunk-jpl/src/wrappers/Ll2xy/Ll2xy.h

@@ -17 +17 @@
 #endif
 
+#include "../bindings.h"
 #include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
-#include "../bindings.h"
 
 #undef __FUNCT__ 

issm/trunk-jpl/src/wrappers/MeshPartition/MeshPartition.h

@@ -17 +17 @@
 #endif
 
+#include "../bindings.h"
 #include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
-#include "../bindings.h"
 
 #undef __FUNCT__ 

issm/trunk-jpl/src/wrappers/MeshProfileIntersection/MeshProfileIntersection.h

@@ -17 +17 @@
 #endif
 
+#include "../bindings.h"
 #include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
-#include "../bindings.h"
 
 #undef __FUNCT__

issm/trunk-jpl/src/wrappers/NodeConnectivity/NodeConnectivity.h

@@ -21 +21 @@
 
 /*Header files: */
+#include "../bindings.h"
 #include "../../c/include/globals.h"
 #include "../../c/toolkits/toolkits.h"
@@ -27 +28 @@
 #include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
-#include "../bindings.h"
 #include "../../c/io/io.h"
 #include "../../c/EnumDefinitions/EnumDefinitions.h"

issm/trunk-jpl/src/wrappers/PointCloudFindNeighbors/PointCloudFindNeighbors.h

@@ -17 +17 @@
 #endif
 
+#include "../bindings.h"
 #include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
-#include "../bindings.h"
 
 #undef __FUNCT__

issm/trunk-jpl/src/wrappers/PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.h

@@ -17 +17 @@
 #endif
 
+#include "../bindings.h"
 #include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
-#include "../bindings.h"
 
 #undef __FUNCT__ 

issm/trunk-jpl/src/wrappers/Scotch/Scotch.h

@@ -6 +6 @@
 #define _SCOTCH_H
 
+#include "../bindings.h" /*Should always come first to avoid python's warnings*/
 #include <stdio.h>
 #include <string.h>    /*  strcasecmp  */
@@ -13 +14 @@
 #include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
-#include "../bindings.h"
     
 #undef __FUNCT__ 

issm/trunk-jpl/src/wrappers/Shp2Exp/Shp2Exp.h

@@ -17 +17 @@
 #endif
 
+#include "../bindings.h"
 #include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
-#include "../bindings.h"
 
 #undef __FUNCT__ 

issm/trunk-jpl/src/wrappers/Shp2Kml/Shp2Kml.h

@@ -17 +17 @@
 #endif
 
+#include "../bindings.h"
 #include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
-#include "../bindings.h"
 
 #undef __FUNCT__ 

issm/trunk-jpl/src/wrappers/StringToEnum/StringToEnum.h

@@ -18 +18 @@
 
 /*Header files: */
+#include "../bindings.h"
 #include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
-#include "../bindings.h"
 
 #undef __FUNCT__ 

issm/trunk-jpl/src/wrappers/TriMesh/TriMesh.h

@@ -18 +18 @@
 
 /*Header files: */
+#include "../bindings.h"
 #include "../../c/include/globals.h"
 #include "../../c/toolkits/toolkits.h"
@@ -24 +25 @@
 #include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
-#include "../bindings.h"
 #include "../../c/io/io.h"
 #include "../../c/EnumDefinitions/EnumDefinitions.h"

issm/trunk-jpl/src/wrappers/TriMeshProcessRifts/TriMeshProcessRifts.h

@@ -17 +17 @@
 #endif
 
+#include "../bindings.h"
 #include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
-#include "../bindings.h"
 
 #undef __FUNCT__ 

issm/trunk-jpl/src/wrappers/TriaSearch/TriaSearch.h

@@ -16 +16 @@
 #endif
 
+#include "../bindings.h"
 #include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
-#include "../bindings.h"
 
 #undef __FUNCT__ 

issm/trunk-jpl/src/wrappers/Xy2ll/Xy2ll.h

@@ -17 +17 @@
 #endif
 
+#include "../bindings.h"
 #include "../../c/include/globals.h"
 #include "../../c/modules/modules.h"
 #include "../../c/Container/Container.h"
 #include "../../c/shared/shared.h"
-#include "../bindings.h"
 
 #undef __FUNCT__ 

issm/trunk-jpl/src/wrappers/bindings.h

@@ -8 +8 @@
 #endif
 
+#ifdef  _HAVE_PYTHON_MODULES_
+#include "./python/include/pythonincludes.h"
+#include "./python/include/wrapper_macros.h"
+#include "./python/io/pythonio.h"
+#endif
+
 #ifdef  _HAVE_MATLAB_MODULES_
 #include "./matlab/include/matlabincludes.h"
@@ -14 +20 @@
 #endif
 
-#ifdef  _HAVE_PYTHON_MODULES_
-#include "./python/include/pythonincludes.h"
-#include "./python/include/wrapper_macros.h"
-#include "./python/io/pythonio.h"
 #endif
-
-#endif