[MOAB-dev] r5927 - MOAB/trunk/src/io

[iulian at mcs.anl.gov]

Author: iulian
Date: 2012-12-18 13:23:22 -0600 (Tue, 18 Dec 2012)
New Revision: 5927

Modified:
   MOAB/trunk/src/io/ReadHDF5.cpp
   MOAB/trunk/src/io/ReadNCDF.cpp
Log:
more warnings


Modified: MOAB/trunk/src/io/ReadHDF5.cpp
===================================================================
--- MOAB/trunk/src/io/ReadHDF5.cpp	2012-12-18 18:13:29 UTC (rev 5926)
+++ MOAB/trunk/src/io/ReadHDF5.cpp	2012-12-18 19:23:22 UTC (rev 5927)
@@ -3352,22 +3352,22 @@
     public:
       ErrorCode store_data( EntityHandle file_id, void* data, long count, bool )
       {
-        ErrorCode rval;
+        ErrorCode rval1;
         if (isHandle) {
           assert(readSize == sizeof(EntityHandle));
-          rval = readHDF5->convert_id_to_handle( (EntityHandle*)data, count );
-          if (MB_SUCCESS != rval)
-            return error(rval);
+          rval1 = readHDF5->convert_id_to_handle( (EntityHandle*)data, count );
+          if (MB_SUCCESS != rval1)
+            return error(rval1);
         }
         int n = count;
         return readHDF5->moab()->tag_set_by_ptr( tagHandle, &file_id, 1, &data, &n );
       }
       VTReader( DebugOutput& debug_output, void* buffer, size_t buffer_size,
-                Tag tag, bool is_handle_tag, size_t read_size, ReadHDF5* owner )
+                Tag tag, bool is_handle_tag, size_t read_size1, ReadHDF5* owner )
         : ReadHDF5VarLen( debug_output, buffer, buffer_size ),
           tagHandle(tag),
           isHandle(is_handle_tag),
-          readSize(read_size),
+          readSize(read_size1),
           readHDF5(owner)
       {}
   };

Modified: MOAB/trunk/src/io/ReadNCDF.cpp
===================================================================
--- MOAB/trunk/src/io/ReadNCDF.cpp	2012-12-18 18:13:29 UTC (rev 5926)
+++ MOAB/trunk/src/io/ReadNCDF.cpp	2012-12-18 19:23:22 UTC (rev 5927)
@@ -146,7 +146,7 @@
                                 mGlobalIdTag, MB_TAG_SPARSE|MB_TAG_CREAT, &zero);
   assert(MB_SUCCESS == result);
 #ifdef NDEBUG
-  if (MB_SUCCESS == result); // line to avoid compiler warning about unused variable
+  if (MB_SUCCESS == result) {}; // line to avoid compiler warning about unused variable
 #endif
   ncFile = 0;
 }