Commit 077dfcae authored by Iulian Grindeanu's avatar Iulian Grindeanu
Browse files

align tests with new tag interface


git-svn-id: https://svn.mcs.anl.gov/repos/ITAPS/MOAB/trunk@4575 6162379e-bd28-0410-9a7d-b7f4dcfcad3c
parent 5ec3ab87
...@@ -485,7 +485,7 @@ bool tag_get_set_test(iGeom_Instance geom) { ...@@ -485,7 +485,7 @@ bool tag_get_set_test(iGeom_Instance geom) {
SimpleArray<char> tag_vals; SimpleArray<char> tag_vals;
iGeom_getArrData( geom, ARRAY_IN( gentity_handles ), this_tag, 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" ); CHECK( "ERROR : can't get tag on entities" );
int* tag_ptr = (int*)(&tag_vals[0]); int* tag_ptr = (int*)(&tag_vals[0]);
...@@ -1395,7 +1395,7 @@ static int check_firmness(iGeom_Instance geom, const std::vector< ...@@ -1395,7 +1395,7 @@ static int check_firmness(iGeom_Instance geom, const std::vector<
char* byte_ptr = &firmness[0]; char* byte_ptr = &firmness[0];
int err, junk1 = firmness.size(), junk2 = entities.size() * firmness_size; int err, junk1 = firmness.size(), junk2 = entities.size() * firmness_size;
iGeom_getArrData(geom, &entities[0], entities.size(), firmness_tag, iGeom_getArrData(geom, &entities[0], entities.size(), firmness_tag,
&byte_ptr, &junk1, &junk2, &err); (void**)&byte_ptr, &junk1, &junk2, &err);
if (iBase_SUCCESS != err) if (iBase_SUCCESS != err)
return err; return err;
...@@ -1429,7 +1429,7 @@ static int count_num_with_tag(iGeom_Instance geom, const std::vector< ...@@ -1429,7 +1429,7 @@ static int count_num_with_tag(iGeom_Instance geom, const std::vector<
for (size_t i = 0; i < ents.size(); ++i) { for (size_t i = 0; i < ents.size(); ++i) {
char* ptr = &data[0]; char* ptr = &data[0];
int junk1 = bytes, junk2; 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) if (iBase_TAG_NOT_FOUND == err)
continue; continue;
if (iBase_SUCCESS != err) if (iBase_SUCCESS != err)
......
...@@ -456,7 +456,7 @@ bool tag_get_set_test(iGeom_Instance geom) ...@@ -456,7 +456,7 @@ bool tag_get_set_test(iGeom_Instance geom)
SimpleArray<char> tag_vals; SimpleArray<char> tag_vals;
iGeom_getArrData( geom, ARRAY_IN( gentity_handles ), this_tag, 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" ); CHECK( "ERROR : can't get tag on entities" );
int* tag_ptr = (int*)(&tag_vals[0]); int* tag_ptr = (int*)(&tag_vals[0]);
...@@ -1270,7 +1270,7 @@ static int check_firmness( iGeom_Instance geom, ...@@ -1270,7 +1270,7 @@ static int check_firmness( iGeom_Instance geom,
char* byte_ptr = &firmness[0]; char* byte_ptr = &firmness[0];
int err, junk1 = firmness.size(), junk2 = entities.size()*firmness_size; 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 );
if (iBase_SUCCESS != err) if (iBase_SUCCESS != err)
return err; return err;
...@@ -1306,7 +1306,7 @@ static int count_num_with_tag( iGeom_Instance geom, ...@@ -1306,7 +1306,7 @@ static int count_num_with_tag( iGeom_Instance geom,
for (size_t i = 0; i < ents.size(); ++i) { for (size_t i = 0; i < ents.size(); ++i) {
char* ptr = &data[0]; char* ptr = &data[0];
int junk1 = bytes, junk2; 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) if (iBase_TAG_NOT_FOUND == err)
continue; continue;
if (iBase_SUCCESS != err) if (iBase_SUCCESS != err)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment