[MOAB-dev] r4411 - MOAB/trunk/src

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2010-12-22 15:52:09 -0600 (Wed, 22 Dec 2010)
New Revision: 4411

Modified:
   MOAB/trunk/src/DenseTag.cpp
   MOAB/trunk/src/VarLenDenseTag.cpp
Log:
fix build error when configured with 32-bit handles on 64-bit platform

Modified: MOAB/trunk/src/DenseTag.cpp
===================================================================
--- MOAB/trunk/src/DenseTag.cpp	2010-12-22 21:39:56 UTC (rev 4410)
+++ MOAB/trunk/src/DenseTag.cpp	2010-12-22 21:52:09 UTC (rev 4411)
@@ -361,7 +361,7 @@
       if (MB_SUCCESS != rval)
         return rval;
       
-      const EntityHandle end = std::min(p->second + 1, start + avail );
+      const EntityHandle end = std::min<EntityHandle>(p->second + 1, start + avail );
       while (start != end) {
         memcpy( array, *pointers, get_size() );
         ++start;

Modified: MOAB/trunk/src/VarLenDenseTag.cpp
===================================================================
--- MOAB/trunk/src/VarLenDenseTag.cpp	2010-12-22 21:39:56 UTC (rev 4410)
+++ MOAB/trunk/src/VarLenDenseTag.cpp	2010-12-22 21:52:09 UTC (rev 4411)
@@ -310,7 +310,7 @@
       if (MB_SUCCESS != rval)
         return rval;
       
-      const EntityHandle end = std::min(p->second + 1, start + avail );
+      const EntityHandle end = std::min<EntityHandle>(p->second + 1, start + avail );
       while (start != end) {
         array->set( *pointers, *lengths );
         ++start;
@@ -402,7 +402,7 @@
       if (MB_SUCCESS != rval)
         return rval;
       
-      const EntityHandle end = std::min(p->second + 1, start + avail );
+      const EntityHandle end = std::min<EntityHandle>(p->second + 1, start + avail );
       if (array) {
         while (start != end) {
           array->clear();