[MOAB-dev] r4285 - in MOAB/trunk: itaps/imesh src/io src/moab test/h5file test/io

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2010-11-18 16:57:34 -0600 (Thu, 18 Nov 2010)
New Revision: 4285

Modified:
   MOAB/trunk/itaps/imesh/testc_cbind.c
   MOAB/trunk/src/io/ReadNC.cpp
   MOAB/trunk/src/moab/Types.hpp
   MOAB/trunk/test/h5file/h5portable.cpp
   MOAB/trunk/test/io/VtkTest.cpp
Log:
fix warnings

Modified: MOAB/trunk/itaps/imesh/testc_cbind.c
===================================================================
--- MOAB/trunk/itaps/imesh/testc_cbind.c	2010-11-18 22:47:18 UTC (rev 4284)
+++ MOAB/trunk/itaps/imesh/testc_cbind.c	2010-11-18 22:57:34 UTC (rev 4285)
@@ -2212,6 +2212,9 @@
   iBase_EntityHandle *verts = NULL;
   int verts_alloc = 0,verts_size;
 
+  iBase_EntityHandle *ents;
+  int ents_alloc, ents_size;
+
   iMesh_newMesh("",&mesh,&err,0);
   if (iBase_SUCCESS != err) return 0;
 
@@ -2226,10 +2229,7 @@
   if (iBase_SUCCESS != err) return 0;
   free(verts);
 
-  iBase_EntityHandle *ents;
-  int ents_alloc, ents_size;
-
-    // test for proper allocation when array pointer passed in null but alloc'd size not
+    /* test for proper allocation when array pointer passed in null but alloc'd size not */
   ents_alloc = 3;
   ents = NULL;
   iMesh_getEntities(mesh, root_set, iBase_ALL_TYPES, iMesh_ALL_TOPOLOGIES, 
@@ -2238,7 +2238,7 @@
     
   free(ents);
     
-    // test for proper allocation when array pointer passed in non-null but alloc'd size 0
+    /* test for proper allocation when array pointer passed in non-null but alloc'd size 0 */
   ents_alloc = 0;
   iMesh_getEntities(mesh, root_set, iBase_ALL_TYPES, iMesh_ALL_TOPOLOGIES, 
                     &ents, &ents_alloc, &ents_size, &err);
@@ -2246,7 +2246,7 @@
     
   free(ents);
 
-    // test for failure when passed in alloc'd size is smaller than it should be
+    /* test for failure when passed in alloc'd size is smaller than it should be */
   ents_alloc -= 1;
   iMesh_getEntities(mesh, root_set, iBase_ALL_TYPES, iMesh_ALL_TOPOLOGIES, 
                     &ents, &ents_alloc, &ents_size, &err);

Modified: MOAB/trunk/src/io/ReadNC.cpp
===================================================================
--- MOAB/trunk/src/io/ReadNC.cpp	2010-11-18 22:47:18 UTC (rev 4284)
+++ MOAB/trunk/src/io/ReadNC.cpp	2010-11-18 22:57:34 UTC (rev 4285)
@@ -77,7 +77,7 @@
   std::vector<std::string> var_names;