[MOAB-dev] r1185 - MOAB/trunk/tools/iMesh

[acaceres at mcs.anl.gov]

Author: acaceres
Date: 2007-07-06 11:31:53 -0500 (Fri, 06 Jul 2007)
New Revision: 1185

Modified:
   MOAB/trunk/tools/iMesh/iBase_f.h
   MOAB/trunk/tools/iMesh/iMesh_f.h
Log:
Moved #ifndefs so that parameter declarations DO get included everytime time the file is included. Necessary when two functions in one file want to use it.


Modified: MOAB/trunk/tools/iMesh/iBase_f.h
===================================================================
--- MOAB/trunk/tools/iMesh/iBase_f.h	2007-07-05 18:50:23 UTC (rev 1184)
+++ MOAB/trunk/tools/iMesh/iBase_f.h	2007-07-06 16:31:53 UTC (rev 1185)
@@ -5,6 +5,8 @@
 #define iBase_EntitySetHandle integer
 #define iBase_TagHandle integer
 
+#endif
+
       integer iBase_VERTEX
       integer iBase_EDGE
       integer iBase_FACE
@@ -112,4 +114,4 @@
       parameter (iBase_DOUBLE = 1)
       parameter (iBase_ENTITY_HANDLE = 2)
       parameter (iBase_BYTES = 3)
-#endif 
+

Modified: MOAB/trunk/tools/iMesh/iMesh_f.h
===================================================================
--- MOAB/trunk/tools/iMesh/iMesh_f.h	2007-07-05 18:50:23 UTC (rev 1184)
+++ MOAB/trunk/tools/iMesh/iMesh_f.h	2007-07-06 16:31:53 UTC (rev 1185)
@@ -1,12 +1,14 @@
 #ifndef IMESH_F_H
 #define IMESH_F_H
 
-#include "iBase_f.h"
-
 #define iMesh_Instance integer
 #define iMesh_EntityIterator integer
 #define iMesh_EntityArrIterator integer
 
+#endif 
+
+#include "iBase_f.h"
+
       integer iMesh_POINT
       integer iMesh_LINE_SEGMENT
       integer iMesh_POLYGON
@@ -44,4 +46,4 @@
       parameter (iMesh_LOCAL_TRAVERSAL = 2)
       parameter (iMesh_GLOBAL_TRAVERSAL = 3)
 
-#endif 
+