Author: iulian Date: 2011-04-28 12:04:52 -0500 (Thu, 28 Apr 2011) New Revision: 4783 Modified: MOAB/trunk/itaps/igeom/iGeom.h MOAB/trunk/itaps/igeom/iGeom_MOAB.cpp MOAB/trunk/itaps/igeom/testSmooth.cc MOAB/trunk/itaps/igeom/testgeom.cc Log: align iGeom.h from MOAB with the one from CGM (r4778) (note: this is not built by default) Modified: MOAB/trunk/itaps/igeom/iGeom.h =================================================================== --- MOAB/trunk/itaps/igeom/iGeom.h 2011-04-28 16:53:43 UTC (rev 4782) +++ MOAB/trunk/itaps/igeom/iGeom.h 2011-04-28 17:04:52 UTC (rev 4783) @@ -75,12 +75,10 @@ * \param instance iGeom instance handle * \param descr Pointer to a character string to be filled with a * description of the error from the last iGeom function - * \param *err Pointer to error type returned from function * \param descr_len Length of the character string pointed to by descr */ void iGeom_getDescription( iGeom_Instance instance, char* descr, - int* err, int descr_len ); /**\brief Get the error type returned from the last iGeom function @@ -89,11 +87,9 @@ * returned is a member of the iBase_ErrorType enumeration. * \param instance iGeom instance handle * \param *error_type Error type returned from last iGeom function - * \param *err Pointer to error type returned from function */ void iGeom_getErrorType( iGeom_Instance instance, - /*out*/ int *error_type, - int *err ); + /*out*/ int *error_type ); /**\brief Construct a new iGeom instance * Modified: MOAB/trunk/itaps/igeom/iGeom_MOAB.cpp =================================================================== --- MOAB/trunk/itaps/igeom/iGeom_MOAB.cpp 2011-04-28 16:53:43 UTC (rev 4782) +++ MOAB/trunk/itaps/igeom/iGeom_MOAB.cpp 2011-04-28 17:04:52 UTC (rev 4783) @@ -226,20 +226,20 @@ return true; } -void iGeom_getDescription(iGeom_Instance instance, char* descr, int* err, +void iGeom_getDescription(iGeom_Instance instance, char* descr, int descr_len) { unsigned int len = MIN(strlen(iGeom_LAST_ERROR.description), ((unsigned int) descr_len)); strncpy(descr, iGeom_LAST_ERROR.description, len); descr[len] = '\0'; - RETURN(iBase_SUCCESS); + return; }