[MOAB-dev] r5844 - MOAB/trunk/src/io

[tautges at mcs.anl.gov]

Author: tautges
Date: 2012-10-31 16:56:08 -0500 (Wed, 31 Oct 2012)
New Revision: 5844

Modified:
   MOAB/trunk/src/io/DamselUtil.hpp
   MOAB/trunk/src/io/ReadDamsel.cpp
   MOAB/trunk/src/io/WriteDamsel.cpp
Log:
Update the damsel stuff to account for recent changes to the Damsel implementation.



Modified: MOAB/trunk/src/io/DamselUtil.hpp
===================================================================
--- MOAB/trunk/src/io/DamselUtil.hpp	2012-10-31 16:13:51 UTC (rev 5843)
+++ MOAB/trunk/src/io/DamselUtil.hpp	2012-10-31 21:56:08 UTC (rev 5844)
@@ -86,11 +86,11 @@
   class tinfo
   {
     public:
-    tinfo(Tag mt, damsel_tag dt, TagType tt) : mTagh(mt), dTagh(dt), tagType(tt) {};
-    tinfo()  : mTagh(0), dTagh(DAMSEL_TAG_INVALID), tagType(MB_TAG_ANY) {};
+    tinfo(Tag mt, damsel_handle dt, TagType tt) : mTagh(mt), dTagh(dt), tagType(tt) {};
+    tinfo()  : mTagh(0), dTagh(0), tagType(MB_TAG_ANY) {};
           
     Tag mTagh;
-    damsel_tag dTagh;
+    damsel_handle dTagh;
     TagType tagType;
   };
   template<class T> struct MtagP : std::unary_function<T, bool> {
@@ -103,15 +103,9 @@
   template<class T> struct DtagP : std::unary_function<T, bool> {
     public:
     DtagP(const damsel_handle &th) {tH = th;};
-    bool operator() (const T &tclass) {return tclass.dTagh == (damsel_tag)tH;};
+    bool operator() (const T &tclass) {return tclass.dTagh == tH;};
     damsel_handle tH;
   };
-  
-      
-    
-      
-          
-    
 
 private:
     //! damsel library id

Modified: MOAB/trunk/src/io/ReadDamsel.cpp
===================================================================
--- MOAB/trunk/src/io/ReadDamsel.cpp	2012-10-31 16:13:51 UTC (rev 5843)
+++ MOAB/trunk/src/io/ReadDamsel.cpp	2012-10-31 21:56:08 UTC (rev 5844)
@@ -276,8 +276,7 @@
                                       tagh, MB_TAG_CREAT | MB_TAG_DENSE);
     if (MB_SUCCESS != tmp_rval) rval = tmp_rval;
     else {
-      dU.tagMap.push_back(DamselUtil::tinfo(tagh, *(reinterpret_cast<damsel_tag*>((*tit).tag_handle)), 
-                                            MB_TAG_DENSE));
+      dU.tagMap.push_back(DamselUtil::tinfo(tagh, 0, MB_TAG_DENSE));
         // also store predefined tags specially...
       if (!strncmp((*tit).name, "mbdmsl_", 7)) {
           // predefined tag name, store the handle