[MOAB-dev] r4401 - MOAB/trunk/src

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2010-12-21 16:37:07 -0600 (Tue, 21 Dec 2010)
New Revision: 4401

Modified:
   MOAB/trunk/src/SparseTag.cpp
   MOAB/trunk/src/VarLenSparseTag.cpp
Log:
fix sparse tags if tr1::unordered_map is not found

Modified: MOAB/trunk/src/SparseTag.cpp
===================================================================
--- MOAB/trunk/src/SparseTag.cpp	2010-12-21 22:27:04 UTC (rev 4400)
+++ MOAB/trunk/src/SparseTag.cpp	2010-12-21 22:37:07 UTC (rev 4401)
@@ -355,7 +355,7 @@
         hint = output_range.insert( hint, iter->first );    
 #else
     iter = mData.lower_bound( FIRST_HANDLE(type) );
-    myMapType::const_iterator end = mData.lower_bound( LAST_HANDLE(type)+1 );
+    SparseTag::myMapType::const_iterator end = mData.lower_bound( LAST_HANDLE(type)+1 );
     for (; iter != end; ++iter)
       hint = output_range.insert( hint, iter->first );
 #endif
@@ -425,7 +425,7 @@
   if (value_bytes && value_bytes != get_size())
     return MB_INVALID_SIZE;
   
-  myMapType::iterator iter, end;
+  myMapType::const_iterator iter, end;
 #ifdef HAVE_UNORDERED_MAP
   if (intersect_entities) {
     std::pair<Range::iterator,Range::iterator> r;
@@ -457,10 +457,10 @@
 #else
   if (intersect_entities) {
     for (Range::const_pair_iterator p = intersect_entities->begin();
-         p != intersect_entities.end(); ++p) {
-      iter = mData.lower_bound( p->first);
+         p != intersect_entities->end(); ++p) {
+      iter = mData.lower_bound( p->first );
       end = mData.upper_bound( p->second );
-      find_tag_values_equal( *this, tag_value, get_size(), iter, end, 
+      find_tag_values_equal( *this, value, get_size(), iter, end, 
                              output_entities);
     }
   }
@@ -473,7 +473,7 @@
       iter = mData.lower_bound( CREATE_HANDLE( type, MB_START_ID ) );
       end = mData.upper_bound( CREATE_HANDLE( type, MB_END_ID ) );
     }
-    find_tag_values_equal( *this, tag_value, get_size(), iter, end, 
+    find_tag_values_equal( *this, value, get_size(), iter, end, 
                            output_entities);
   }
 #endif

Modified: MOAB/trunk/src/VarLenSparseTag.cpp
===================================================================
--- MOAB/trunk/src/VarLenSparseTag.cpp	2010-12-21 22:27:04 UTC (rev 4400)
+++ MOAB/trunk/src/VarLenSparseTag.cpp	2010-12-21 22:37:07 UTC (rev 4401)
@@ -289,7 +289,7 @@