[MOAB-dev] r4443 - in MOAB/trunk/src: . io

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2011-01-14 14:06:12 -0600 (Fri, 14 Jan 2011)
New Revision: 4443

Modified:
   MOAB/trunk/src/GeomTopoTool.cpp
   MOAB/trunk/src/ReadUtil.cpp
   MOAB/trunk/src/io/ReadHDF5.cpp
   MOAB/trunk/src/io/ReadMCNP5.cpp
   MOAB/trunk/src/io/ReadNASTRAN.cpp
   MOAB/trunk/src/io/ReadTetGen.cpp
   MOAB/trunk/src/io/WriteHDF5.cpp
Log:
fix warnings from g++ 3.3

Modified: MOAB/trunk/src/GeomTopoTool.cpp
===================================================================
--- MOAB/trunk/src/GeomTopoTool.cpp	2011-01-14 20:05:57 UTC (rev 4442)
+++ MOAB/trunk/src/GeomTopoTool.cpp	2011-01-14 20:06:12 UTC (rev 4443)
@@ -43,7 +43,7 @@
    senseNSensesTag(0), 
    obbTree(impl), 
    contiguous(true),
-   oneVolRootSet(NULL)
+   oneVolRootSet(0)
 {
    ErrorCode result = mdbImpl->tag_create(GEOM_DIMENSION_TAG_NAME, 4,
          MB_TAG_SPARSE, geomTag, NULL);

Modified: MOAB/trunk/src/ReadUtil.cpp
===================================================================
--- MOAB/trunk/src/ReadUtil.cpp	2011-01-14 20:05:57 UTC (rev 4442)
+++ MOAB/trunk/src/ReadUtil.cpp	2011-01-14 20:06:12 UTC (rev 4443)
@@ -388,7 +388,7 @@
   const EntityHandle* const end = ents + num_ents;
   const EntityHandle* i = ents;
   while (i != end) {
-    const EntityHandle* next = std::find( i, end, 0 );
+    const EntityHandle* next = std::find( i, end, 0u );
     size_t size = next - i;
     if (!size) {
       ++i;

Modified: MOAB/trunk/src/io/ReadHDF5.cpp
===================================================================
--- MOAB/trunk/src/io/ReadHDF5.cpp	2011-01-14 20:05:57 UTC (rev 4442)
+++ MOAB/trunk/src/io/ReadHDF5.cpp	2011-01-14 20:06:12 UTC (rev 4443)
@@ -1105,7 +1105,7 @@
   
   if (sets_only) {
     iter = std::lower_bound( indices.begin(), indices.end(), 
-                             fileInfo->sets.start_id + fileInfo->sets.count );
+              (EntityHandle)(fileInfo->sets.start_id + fileInfo->sets.count) );
     indices.erase( iter, indices.end() );
     iter = std::lower_bound( indices.begin(), indices.end(), 
                              fileInfo->sets.start_id );
@@ -1208,7 +1208,7 @@
     
       // search tag values
     for (size_t i = 0; i < count; ++i)
-      if (std::binary_search( sorted_values.begin(), sorted_values.end(), buffer[i] ))
+      if (std::binary_search( sorted_values.begin(), sorted_values.end(), (int)buffer[i] ))
         value_indices.push_back( i + offset );
     
     offset += count;