[MOAB-dev] r4575 - MOAB/trunk/itaps/igeom

[iulian at mcs.anl.gov]

Author: iulian
Date: 2011-03-10 16:12:09 -0600 (Thu, 10 Mar 2011)
New Revision: 4575

Modified:
   MOAB/trunk/itaps/igeom/testSmooth.cc
   MOAB/trunk/itaps/igeom/testgeom.cc
Log:
align tests with new tag interface


Modified: MOAB/trunk/itaps/igeom/testSmooth.cc
===================================================================
--- MOAB/trunk/itaps/igeom/testSmooth.cc	2011-03-10 22:11:34 UTC (rev 4574)
+++ MOAB/trunk/itaps/igeom/testSmooth.cc	2011-03-10 22:12:09 UTC (rev 4575)
@@ -485,7 +485,7 @@
 
       SimpleArray<char> tag_vals;
       iGeom_getArrData( geom, ARRAY_IN( gentity_handles ), this_tag,
-            ARRAY_INOUT( tag_vals ), &err );
+          (void**)tag_vals.ptr(), &tag_vals.capacity(), &tag_vals.size(), &err );
       CHECK( "ERROR : can't get tag on entities" );
 
       int* tag_ptr = (int*)(&tag_vals[0]);
@@ -1395,7 +1395,7 @@
    char* byte_ptr = &firmness[0];
    int err, junk1 = firmness.size(), junk2 = entities.size() * firmness_size;
    iGeom_getArrData(geom, &entities[0], entities.size(), firmness_tag,
-         &byte_ptr, &junk1, &junk2, &err);
+         (void**)&byte_ptr, &junk1, &junk2, &err);
    if (iBase_SUCCESS != err)
       return err;
 
@@ -1429,7 +1429,7 @@
    for (size_t i = 0; i < ents.size(); ++i) {
       char* ptr = &data[0];
       int junk1 = bytes, junk2;
-      iGeom_getData(geom, ents[i], tag, &ptr, &junk1, &junk2, &err);
+      iGeom_getData(geom, ents[i], tag, (void**)&ptr, &junk1, &junk2, &err);
       if (iBase_TAG_NOT_FOUND == err)
          continue;
       if (iBase_SUCCESS != err)

Modified: MOAB/trunk/itaps/igeom/testgeom.cc
===================================================================
--- MOAB/trunk/itaps/igeom/testgeom.cc	2011-03-10 22:11:34 UTC (rev 4574)
+++ MOAB/trunk/itaps/igeom/testgeom.cc	2011-03-10 22:12:09 UTC (rev 4575)
@@ -456,7 +456,7 @@
     
     SimpleArray<char> tag_vals;
     iGeom_getArrData( geom, ARRAY_IN( gentity_handles ), this_tag, 
-                      ARRAY_INOUT( tag_vals ), &err );
+        (void**)tag_vals.ptr(), &tag_vals.capacity(), &tag_vals.size(), &err );
     CHECK( "ERROR : can't get tag on entities" );
     
     int* tag_ptr = (int*)(&tag_vals[0]);
@@ -1270,7 +1270,7 @@
 
   char* byte_ptr = &firmness[0];
   int err, junk1 = firmness.size(), junk2 = entities.size()*firmness_size;
-  iGeom_getArrData( geom, &entities[0], entities.size(), firmness_tag, &byte_ptr, &junk1, &junk2, &err ); 
+  iGeom_getArrData( geom, &entities[0], entities.size(), firmness_tag, (void**)&byte_ptr, &junk1, &junk2, &err );