[MOAB-dev] r1742 - MOAB/trunk

[kraftche at mcs.anl.gov]

Author: kraftche
Date: 2008-04-04 10:05:29 -0500 (Fri, 04 Apr 2008)
New Revision: 1742

Modified:
   MOAB/trunk/WriteHDF5.cpp
Log:
fix bug I checked in yesterday (broke writing fixed-length handle tags when I fixed variable-length) and eliminate compiler warning

Modified: MOAB/trunk/WriteHDF5.cpp
===================================================================
--- MOAB/trunk/WriteHDF5.cpp	2008-04-03 20:29:19 UTC (rev 1741)
+++ MOAB/trunk/WriteHDF5.cpp	2008-04-04 15:05:29 UTC (rev 1742)
@@ -1652,6 +1652,8 @@
     return MB_FAILURE;
   if (mb_size != MB_VARIABLE_LENGTH)
     return MB_FAILURE;
+  if (mb_data_type == MB_TYPE_HANDLE && hdf_type == 0)
+    hdf_type = id_type;
 
 DEBUGOUT((std::string("Var Len Tag: ") + name + "\n").c_str());
   
@@ -1760,7 +1762,7 @@
     CHK_MHDF_ERR_2(status, tables + 1);
     offset_offset += count;
   }
-  assert( offset_offset == tag_data.offset + tag_data.range.size() );
+  assert( (unsigned long)offset_offset == tag_data.offset + tag_data.range.size() );
   
     // flush data buffer
   if (bytes) {
@@ -2306,7 +2308,6 @@
   case MB_TYPE_HANDLE:
     elem_size = sizeof(MBEntityHandle);
     file_type = mhdf_ENTITY_ID;
-    hdf_type = id_type;
     break;
   case MB_TYPE_OPAQUE:
   default: