Changeset 4028 for branches/0.18-stable

Timestamp:

Jan 18, 2021, 1:46:27 PM (2 years ago)

Author:

Peter

Message:

fixes #970

Location:

branches/0.18-stable

Files:

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

branches/0.18-stable/NEWS

@@ -6 +6 @@
 
 version 0.18.1 (released NOT YET)
+  - SegmentTree::key_comp() and ::value_comp() now compile (bug #970).
 
   A complete list of closed tickets can be found here [[br]]

branches/0.18-stable/test/segment.cc

@@ -30 +30 @@
 using namespace theplu::yat;
 using namespace utility;
+void test_comp(test::Suite& suite);
 void test_compare(test::Suite& suite);
 void test_count(test::Suite&);
@@ -51 +52 @@
   test::Suite suite(argc, argv);
 
+  test_comp(suite);
   test_compare(suite);
   test_count(suite);
@@ -66 +68 @@
 
   return suite.return_value();
+}
+
+
+void test_comp(test::Suite& suite)
+{
+  {
+    SegmentSet<double> set;
+    SegmentSet<double>::key_compare kcompare = set.key_comp();
+    test::avoid_compiler_warning(kcompare);
+    SegmentSet<double>::value_compare vcompare = set.value_comp();
+    test::avoid_compiler_warning(vcompare);
+  }
+
+  {
+    SegmentMap<double, std::string> map;
+    SegmentMap<double, std::string>::key_compare kcompare = map.key_comp();
+    test::avoid_compiler_warning(kcompare);
+    SegmentMap<double, std::string>::value_compare vcompare = map.value_comp();
+    test::avoid_compiler_warning(vcompare);
+  }
 }
 

branches/0.18-stable/yat/utility/SegmentTree.h

@@ -184 +184 @@
     key_compare key_comp(void) const
     {
-      return key_compare(compare);
+      return container_.key_comp();
     }
 
@@ -226 +226 @@
        \c values
      */
-    value_compare value_comp(void) const { return key_comp(); }
+    value_compare value_comp(void) const { return container_.value_comp(); }
 
   protected: