[MOAB-dev] r3569 - MOAB/trunk/tools/iMesh

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2010-03-05 19:10:21 -0600 (Fri, 05 Mar 2010)
New Revision: 3569

Modified:
   MOAB/trunk/tools/iMesh/iMesh_MOAB.cpp
   MOAB/trunk/tools/iMesh/iMesh_MOAB.hpp
Log:
fix errors in previous checkin

Modified: MOAB/trunk/tools/iMesh/iMesh_MOAB.cpp
===================================================================
--- MOAB/trunk/tools/iMesh/iMesh_MOAB.cpp	2010-03-06 00:29:10 UTC (rev 3568)
+++ MOAB/trunk/tools/iMesh/iMesh_MOAB.cpp	2010-03-06 01:10:21 UTC (rev 3569)
@@ -281,6 +281,7 @@
     *instance = reinterpret_cast<iMesh_Instance>(core);
     if (0 == *instance) {
       IBASE_ERROR(iBase_FAILURE, "Failed to instantiate mesh instance.");
+      return;
     }
   
     RETURN(iBase_SUCCESS);

Modified: MOAB/trunk/tools/iMesh/iMesh_MOAB.hpp
===================================================================
--- MOAB/trunk/tools/iMesh/iMesh_MOAB.hpp	2010-03-06 00:29:10 UTC (rev 3568)
+++ MOAB/trunk/tools/iMesh/iMesh_MOAB.hpp	2010-03-06 01:10:21 UTC (rev 3569)
@@ -74,7 +74,7 @@
 }
 
 #define ERROR(CODE,MSG) do { iMesh_setLastError( MBI, (CODE), (MSG) ); RETURN((CODE)); } while(false)
-#define IBASE_ERROR(CODE,MSG) iMesh_processError( (CODE), (MSG) )
+#define IBASE_ERROR(CODE,MSG) iMesh_processError( *err = (CODE), (MSG) )
 
 static inline void iMesh_setLastError( MBInterface*, int code, const char* msg )
   { iMesh_processError( code, msg ); }