[cgma-dev] r4778 - cgm/trunk/itaps

[jvporter at wisc.edu]

Author: jvporter
Date: 2011-04-26 17:44:30 -0500 (Tue, 26 Apr 2011)
New Revision: 4778

Modified:
   cgm/trunk/itaps/iGeom.h
   cgm/trunk/itaps/iGeomError.cc
   cgm/trunk/itaps/iGeomError.h
   cgm/trunk/itaps/iGeom_CGMA.cc
   cgm/trunk/itaps/testgeom.cc
Log:
Update iGeom.h to use new getDescription/getErrorType API


Modified: cgm/trunk/itaps/iGeom.h
===================================================================
--- cgm/trunk/itaps/iGeom.h	2011-04-26 22:43:09 UTC (rev 4777)
+++ cgm/trunk/itaps/iGeom.h	2011-04-26 22:44:30 UTC (rev 4778)
@@ -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: cgm/trunk/itaps/iGeomError.cc
===================================================================
--- cgm/trunk/itaps/iGeomError.cc	2011-04-26 22:43:09 UTC (rev 4777)
+++ cgm/trunk/itaps/iGeomError.cc	2011-04-26 22:44:30 UTC (rev 4778)
@@ -1,5 +1,6 @@
 #include "iGeomError.h"
 #include "iBase.h"
+#include "iGeom.h"
 #include <string>
 #include <assert.h>
 
@@ -65,11 +66,16 @@
   }
 }
 
-void iGeom_getLastError( int& error_type_out, 
-                         char* description_buffer,
-                         int description_buffer_length )
+void iGeom_getErrorType( iGeom_Instance geom,
+                         int *error_type )