Changeset 2363

Timestamp:

Dec 5, 2010, 3:34:47 AM (13 years ago)

Author:

Peter

Message:

fixing some leftover errors. refs #640

Location:

trunk

Files:

• test/segment_test.cc (modified) (1 diff)
• yat/utility/SegmentTree.h (modified) (2 diffs)

trunk/test/segment_test.cc

@@ -241 +241 @@
   i = map.lower_bound(0.0);
   i = map.upper_bound(0.0);
-  
 }
 

trunk/yat/utility/SegmentTree.h

@@ -274 +274 @@
     iterator result = container_.upper_bound(segment);
     Compare comp;
-    if (result==end() || comp(element, result->begin()))
+    Value2Key value2key;
+    if (result==end() || comp(element, value2key(*result).begin()))
       return result;
     ++result;
     // result is larger than segment
-    YAT_ASSERT(result==end() || compare(segment, *result));
+    YAT_ASSERT(result==end() || compare(segment, value2key(*result)));
     return result;
   }
@@ -287 +288 @@
   SegmentTree<T, Compare,Value2Key>::upper_bound(const element_type& element) const
   {
-    Segment<T, Compare> segment(element, element);
+    Segment<element_type, Compare> segment(element, element);
     const_iterator result = container_.upper_bound(segment);
     Compare comp;
-    if (result==end() || comp(element, result->begin()))
+    Value2Key value2key;
+    if (result==end() || comp(element, value2key(*result).begin()))
       return result;
     ++result;
     // result is larger than segment
-    YAT_ASSERT(result==end() || compare(segment, *result));
+    YAT_ASSERT(result==end() || compare(segment, value2key(*result)));
     return result;
   }