[MOAB-dev] r4646 - MOAB/trunk/itaps/imesh

[jvporter at wisc.edu]

Author: jvporter
Date: 2011-03-25 11:04:47 -0500 (Fri, 25 Mar 2011)
New Revision: 4646

Modified:
   MOAB/trunk/itaps/imesh/iMesh.h
   MOAB/trunk/itaps/imesh/iMesh_MOAB.cpp
Log:
Update iMesh header to the latest (and greatest) version. This shouldn't
break anything that uses iMesh, but you should probably update to this
revision soon, or other things (e.g. MeshKit) may not compile!


Modified: MOAB/trunk/itaps/imesh/iMesh.h
===================================================================
--- MOAB/trunk/itaps/imesh/iMesh.h	2011-03-25 15:54:42 UTC (rev 4645)
+++ MOAB/trunk/itaps/imesh/iMesh.h	2011-03-25 16:04:47 UTC (rev 4646)
@@ -1577,7 +1577,7 @@
   void iMesh_getEntSetData(iMesh_Instance instance,
                            /*in*/ const iBase_EntitySetHandle entity_set_handle,
                            /*in*/ const iBase_TagHandle tag_handle,
-                           /*inout*/ void** tag_value,
+                           /*inout*/ void* tag_value,
                            /*inout*/ int* tag_value_allocated,
                            /*out*/ int* tag_value_size,
                            /*out*/ int *err);
@@ -1770,7 +1770,7 @@
                         /*in*/ const iBase_EntityHandle* entity_handles,
                         /*in*/ const int entity_handles_size,
                         /*in*/ const iBase_TagHandle tag_handle,
-                        /*inout*/ void** tag_values,
+                        /*inout*/ void* tag_values,
                         /*inout*/int* tag_values_allocated,
                         /*out*/ int* tag_values_size,
                         /*out*/ int *err);
@@ -2020,7 +2020,7 @@
   void iMesh_getData(iMesh_Instance instance,
                      /*in*/ const iBase_EntityHandle entity_handle,
                      /*in*/ const iBase_TagHandle tag_handle,
-                     /*inout*/ void** tag_value,
+                     /*inout*/ void* tag_value,
                      /*inout*/ int *tag_value_allocated,
                      /*out*/ int *tag_value_size,
                      /*out*/ int *err);

Modified: MOAB/trunk/itaps/imesh/iMesh_MOAB.cpp
===================================================================
--- MOAB/trunk/itaps/imesh/iMesh_MOAB.cpp	2011-03-25 15:54:42 UTC (rev 4645)
+++ MOAB/trunk/itaps/imesh/iMesh_MOAB.cpp	2011-03-25 16:04:47 UTC (rev 4646)
@@ -1860,7 +1860,7 @@
   void iMesh_getEntSetData (iMesh_Instance instance,
                             /*in*/ const iBase_EntitySetHandle entity_set_handle,
                             /*in*/ const iBase_TagHandle tag_handle,
-                            /*inout*/ void** tag_value,
+                            /*inout*/ void* tag_value,
                             /*inout*/ int* tag_value_allocated,
                             /*inout*/ int* tag_value_size, int *err)
   {
@@ -1874,9 +1874,11 @@
     ALLOC_CHECK_TAG_ARRAY(tag_value, tag_size);
 
     if (eh == 0)
-      result = MOABI->tag_get_data(tag, NULL, 0, *tag_value);
+      result = MOABI->tag_get_data(tag, NULL, 0,