[MOAB-dev] r1786 - in MOAB/trunk/tools: iMesh/SIDL mbperf

[tautges at mcs.anl.gov]

Author: tautges
Date: 2008-04-30 10:42:51 -0500 (Wed, 30 Apr 2008)
New Revision: 1786

Modified:
   MOAB/trunk/tools/iMesh/SIDL/Makefile.in
   MOAB/trunk/tools/iMesh/SIDL/common.make.in
   MOAB/trunk/tools/iMesh/SIDL/testcxx.cpp
   MOAB/trunk/tools/mbperf/mbperf_SIDL.cpp
Log:
- fixing SIDL includes so it finds MBCN_FCDefs.h (third time's a charm!)
- fixing various compiler warnings shown by gcc 4.3

Passes make and make check for out of source build.


Modified: MOAB/trunk/tools/iMesh/SIDL/Makefile.in
===================================================================
--- MOAB/trunk/tools/iMesh/SIDL/Makefile.in	2008-04-29 21:11:30 UTC (rev 1785)
+++ MOAB/trunk/tools/iMesh/SIDL/Makefile.in	2008-04-30 15:42:51 UTC (rev 1786)
@@ -14,7 +14,7 @@
 SOURCE_FILES = $(SIDL_FILES) $(SERVER_FILES) iBase_SIDL_defs.h
 DIST_FILES = $(SOURCE_FILES) testcxx.cpp \
              mserver.make Cclient.make Fclient.make
-INCLUDES =  -I$(BABEL_DIR)/include -Imserver -I$(top_srcdir)
+INCLUDES =  -I$(BABEL_DIR)/include -Imserver
 
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)

Modified: MOAB/trunk/tools/iMesh/SIDL/common.make.in
===================================================================
--- MOAB/trunk/tools/iMesh/SIDL/common.make.in	2008-04-29 21:11:30 UTC (rev 1785)
+++ MOAB/trunk/tools/iMesh/SIDL/common.make.in	2008-04-30 15:42:51 UTC (rev 1786)
@@ -7,7 +7,8 @@
            -I$(imesh_srcdir) \
            -I$(imesh_builddir) \
            -I$(sidl_srcdir) \
-           -I$(top_srcdir)
+           -I$(top_srcdir) \
+           -I$(top_builddir)
 
 imesh_srcdir = $(sidl_srcdir)/..
 imesh_builddir = ../..

Modified: MOAB/trunk/tools/iMesh/SIDL/testcxx.cpp
===================================================================
--- MOAB/trunk/tools/iMesh/SIDL/testcxx.cpp	2008-04-29 21:11:30 UTC (rev 1785)
+++ MOAB/trunk/tools/iMesh/SIDL/testcxx.cpp	2008-04-30 15:42:51 UTC (rev 1786)
@@ -68,6 +68,7 @@
 
 
 #include <iostream>
+#include <algorithm>
 #include "iBase.hh"
 #include "iMesh.hh"
 

Modified: MOAB/trunk/tools/mbperf/mbperf_SIDL.cpp
===================================================================
--- MOAB/trunk/tools/mbperf/mbperf_SIDL.cpp	2008-04-29 21:11:30 UTC (rev 1785)
+++ MOAB/trunk/tools/mbperf/mbperf_SIDL.cpp	2008-04-30 15:42:51 UTC (rev 1786)
@@ -224,13 +224,12 @@
     // need some dimensions
   int numv = nelem + 1;
   int numv_sq = numv*numv;
-  int num_verts = numv*numv*numv;
+  int sidl_vertices_size = numv*numv*numv;
 #define VINDEX(i,j,k) (i + (j*numv) + (k*numv_sq))
 
     // array to hold vertices created individually
   sidl::array<Entity_Handle> sidl_vertices;
-  int sidl_vertices_size = num_verts;
-  CHECK_SIZE(sidl_vertices, num_verts);
+  CHECK_SIZE(sidl_vertices, sidl_vertices_size);
 
     // temporary array to hold vertex positions for single vertex
   sidl::array<double> tmp_coords;
@@ -241,7 +240,7 @@
     // get direct pointer to coordinate array
   double *coords_ptr = ARRAY_PTR(coords, double);
   
-  for (int i = 0; i < num_verts; i++) {
+  for (int i = 0; i < sidl_vertices_size; i++) {
 
       // temporary array to hold (single) vertices
     sidl::array<Entity_Handle> tmp_vertices;
@@ -249,8 +248,8 @@
 
       // create the vertex
     dum_coords[0] = coords_ptr[i]; 
-    dum_coords[1] = coords_ptr[num_verts+i]; 
-    dum_coords[2] = coords_ptr[2*num_verts+i];
+    dum_coords[1] = coords_ptr[sidl_vertices_size+i]; 
+    dum_coords[2] = coords_ptr[2*sidl_vertices_size+i];
     try {
       mesh_arrmod.createVtxArr(1, iBase::StorageOrder_BLOCKED,
                                tmp_coords, tmp_coords_size,