[MOAB-dev] r3332 - MOAB/trunk

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2009-11-12 12:59:25 -0600 (Thu, 12 Nov 2009)
New Revision: 3332

Modified:
   MOAB/trunk/MBInternals.hpp
Log:
minor cleanup

Modified: MOAB/trunk/MBInternals.hpp
===================================================================
--- MOAB/trunk/MBInternals.hpp	2009-11-11 23:51:06 UTC (rev 3331)
+++ MOAB/trunk/MBInternals.hpp	2009-11-12 18:59:25 UTC (rev 3332)
@@ -65,15 +65,8 @@
 
 inline MBEntityHandle CREATE_HANDLE( const unsigned type, const MBEntityID id )
 {
-  // if compiling without asserts, simplify things a bit
-#ifdef NDEBUG
+  assert( id <= MB_END_ID && type <= MBMAXTYPE );
   return (((MBEntityHandle)type) << MB_ID_WIDTH)|id;
-#else
-  int err;
-  MBEntityHandle result = CREATE_HANDLE( type, id, err );
-  assert(!err);
-  return result;
-#endif
 }
 
 inline MBEntityHandle FIRST_HANDLE( unsigned type )