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

[jvporter at wisc.edu]

Author: jvporter
Date: 2012-01-13 14:01:21 -0600 (Fri, 13 Jan 2012)
New Revision: 5318

Modified:
   MOAB/trunk/src/FBEngine.cpp
   MOAB/trunk/src/ReorderTool.cpp
   MOAB/trunk/src/io/WriteNCDF.cpp
Log:
Fix more warnings


Modified: MOAB/trunk/src/FBEngine.cpp
===================================================================
--- MOAB/trunk/src/FBEngine.cpp	2012-01-13 17:51:08 UTC (rev 5317)
+++ MOAB/trunk/src/FBEngine.cpp	2012-01-13 20:01:21 UTC (rev 5318)
@@ -2346,14 +2346,12 @@
   // find the edge connected to the splitting node
   int num_mesh_edges = (int)ents.size();
   int index_edge;
-  EntityHandle firstNode;
+  EntityHandle firstNode = conn[0]; // will be used to decide vertex sets adjacencies
   for (index_edge = 0; index_edge<num_mesh_edges; index_edge++)
   {
     rval = MBI->get_connectivity(ents[index_edge], conn, len);
     if (MB_SUCCESS != rval)
       return rval;
-    if (index_edge == 0)
-      firstNode = conn[0];// will be used to decide vertex sets adjacencies
     if (conn[0] == node)
     {
       if (index_edge==0)

Modified: MOAB/trunk/src/ReorderTool.cpp
===================================================================
--- MOAB/trunk/src/ReorderTool.cpp	2012-01-13 17:51:08 UTC (rev 5317)
+++ MOAB/trunk/src/ReorderTool.cpp	2012-01-13 20:01:21 UTC (rev 5318)
@@ -551,6 +551,7 @@
       case MB_TYPE_HANDLE:  type_size = sizeof(EntityHandle); break;
       case MB_TYPE_BIT:     type_size = 1; break;
       case MB_TYPE_OPAQUE:  type_size = 1; break;
+      default:              return MB_TYPE_OUT_OF_RANGE;
     }
     buffer.resize( total*type_size );
     size_t off = 0;

Modified: MOAB/trunk/src/io/WriteNCDF.cpp
===================================================================
--- MOAB/trunk/src/io/WriteNCDF.cpp	2012-01-13 17:51:08 UTC (rev 5317)
+++ MOAB/trunk/src/io/WriteNCDF.cpp	2012-01-13 20:01:21 UTC (rev 5318)
@@ -533,7 +533,7 @@
     const void* ptr = 0;
    
     int has_dist_factors = 0; 
-    if(mdbImpl->tag_get_data(mDistFactorTag,&(*vector_iter), 1, &ptr, &dist_factor_size) == MB_SUCCESS &&
+    if(mdbImpl->tag_get_by_ptr(mDistFactorTag,&(*vector_iter), 1, &ptr, &dist_factor_size) == MB_SUCCESS &&
        dist_factor_size)
       has_dist_factors = 1;
     dist_factor_size /= sizeof(double);
@@ -626,8 +626,8 @@
   const double* dist_fac_iter = 0;
   const void* ptr = 0;
   bool has_dist_factors = false;