[MOAB-dev] r3679 - in MOAB/trunk/src/parallel: . moab

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2010-03-19 14:38:30 -0500 (Fri, 19 Mar 2010)
New Revision: 3679

Modified:
   MOAB/trunk/src/parallel/ParallelComm.cpp
   MOAB/trunk/src/parallel/moab/ParallelComm.hpp
Log:
fix compile error when sizeof(EntityHandle)==sizeof(int)

Modified: MOAB/trunk/src/parallel/ParallelComm.cpp
===================================================================
--- MOAB/trunk/src/parallel/ParallelComm.cpp	2010-03-19 18:17:53 UTC (rev 3678)
+++ MOAB/trunk/src/parallel/ParallelComm.cpp	2010-03-19 19:38:30 UTC (rev 3679)
@@ -5815,12 +5815,13 @@
     // build up send buffers
   int ent_procs[MAX_SHARING_PROCS];
   EntityHandle handles[MAX_SHARING_PROCS];
-  int num_sharing;
+  int num_sharing, tmp_int;
   SharedEntityData tmp;
   send_data.resize(buffProcs.size());
   for (Range::iterator i = all_shared.begin(); i != all_shared.end(); ++i) {
     tmp.remote = *i; // swap local/remote so they're correct on the remote proc.
-    rval = get_owner( *i, tmp.owner );
+    rval = get_owner( *i, tmp_int );
+    tmp.owner = tmp_int;
     if (MB_SUCCESS != rval)
       return rval;
 

Modified: MOAB/trunk/src/parallel/moab/ParallelComm.hpp
===================================================================
--- MOAB/trunk/src/parallel/moab/ParallelComm.hpp	2010-03-19 18:17:53 UTC (rev 3678)
+++ MOAB/trunk/src/parallel/moab/ParallelComm.hpp	2010-03-19 19:38:30 UTC (rev 3679)
@@ -285,7 +285,6 @@
     /** \brief Return the rank of the entity owner
      */
   ErrorCode get_owner(EntityHandle entity, int &owner);
-  ErrorCode get_owner(EntityHandle entity, EntityID &owner);
   
     /** \brief Return the owner processor and handle of a given entity
      */
@@ -1208,16 +1207,6 @@
   return get_owner_handle(entity, owner, tmp_handle);
 }
 
-inline ErrorCode ParallelComm::get_owner(EntityHandle entity,
-                                         EntityID &owner) 
-{
-  EntityHandle tmp_handle;
-  int tmp_owner;
-  ErrorCode result = get_owner_handle(entity, tmp_owner, tmp_handle);
-  owner = tmp_owner;
-  return result;
-}
-
     /* \brief Unpack message with remote handles (const pointer to buffer)
      */
 inline ErrorCode ParallelComm::unpack_remote_handles(unsigned int from_proc,